ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_rene_13_dakota

Browse Source 
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/ServiceProxy/Generated.cs
#	BeWo/ServiceProxy/ServiceFacade.cs
#	Data/Access/GenericDAO.cs
#	Data/Access/SearchDAO.cs
#	Data/Data.csproj
#	Service/DCEntityMapper/Compact/CompactCustomerDC_Customer.cs
#	Service/DCEntityMapper/Compact/CompactEmployeeDC_Employee.cs
#	Service/DCEntityMapper/Compact/CompactOrganisationDC_Organisation.cs
#	Service/DCEntityMapper/Compact/CompactPersonDC_Person.cs
#	Service/DCEntityMapper/Compact/CompactSupportConceptDC_SupportConcept.cs
#	Shared/Shared.csproj
This commit is contained in:
Rene Evertz
2025-05-12 12:21:33 +02:00
parent f2060b1972 e5b053b34d
commit dcc9ed782d
1350 changed files with 240283 additions and 81153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Data/Data.csproj
View File

@@ -219,9 +219,18 @@
<Compile Include="Access\UserDAO.cs" />
<Compile Include="ASPHibernateSessionManager.cs" />
<Compile Include="DefaultHibernateSessionManager.cs" />
<Compile Include="Entities\AiConversation.cs" />
<Compile Include="Entities\AiConversationMessage.cs" />
<Compile Include="Entities\AiConfig.cs" />
<Compile Include="Entities\AiModel.cs" />
<Compile Include="Entities\AiSetting.cs" />
<Compile Include="Entities\AbsenceTimeHistory.cs" />
<Compile Include="Entities\AiSettings.cs" />
<Compile Include="Entities\BeWoEntityReference.cs" />
<Compile Include="Entities\CustomerVermittlungArbeit.cs" />
<Compile Include="Entities\CustomerWohnhilfe.cs" />
<Compile Include="Entities\IServiceRecord.cs" />
<Compile Include="Entities\SignatureHistory.cs" />
<Compile Include="Entities\Light\GkvAbrechnungLight.cs" />
<Compile Include="Entities\Light\GkvTransferProtokollLight.cs" />
<Compile Include="Entities\Light\InvoiceBaseLight.cs" />
@@ -423,6 +432,7 @@
<Compile Include="Entities\Person.cs" />
<Compile Include="UpdInsInterceptor.cs" />
<Compile Include="Utils\AppointmentSearchResult.cs" />
<Compile Include="Utils\ServiceRecord2SignatureStates.cs" />
<Compile Include="Utils\IntervalFinderHelper.cs" />
<Compile Include="Utils\SignatureStateInfoFromServiceRecordHistoryEntry.cs" />
<Compile Include="WCFHibernateSessionManager.cs" />
@@ -800,6 +810,16 @@
</EmbeddedResource>
<EmbeddedResource Include="Mappings\TwoFactorCode.hbm.xml" />
<EmbeddedResource Include="Mappings\AiSettings.hbm.xml" />
<EmbeddedResource Include="Mappings\SignatureHistory.hbm.xml" />
<EmbeddedResource Include="Mappings\AbsenceTimeHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\AiConversation.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\AiConversationMessage.hbm.xml" />
<EmbeddedResource Include="Mappings\AiModel.hbm.xml" />
<EmbeddedResource Include="Mappings\AiConfig.hbm.xml" />
<Content Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
<SubType>Designer</SubType>