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

Merge branch 'feature_rene_15_wohneinheit' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	.gitignore
#	BeWo/BeWoApp.xaml.cs
#	Data/Data.csproj
#	Service/ServiceImplementations/AccountingServiceImp.cs
#	Shared/BeWoEntityEnums.cs
This commit is contained in:
Rene Evertz
2024-09-11 14:18:10 +02:00
parent c22d20e763 1d74bbce52
commit 14ca310980
152 changed files with 23502 additions and 8303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Data/Data.csproj
View File

@@ -210,6 +210,7 @@
<Compile Include="Entities\AbwesenheitsInformationPrint.cs" />
<Compile Include="Entities\AddressHistory.cs" />
<Compile Include="Entities\Bargeldtransaktionshistory.cs" />
<Compile Include="Entities\CustomerFalldaten.cs" />
<Compile Include="Entities\ErrorMessage.cs" />
<Compile Include="Entities\AddressRoute.cs" />
<Compile Include="Entities\ConfirmationReceiptSignature.cs" />
@@ -302,6 +303,8 @@
<Compile Include="Entities\NewestChatMessage.cs" />
<Compile Include="Entities\SupportConceptApprovalPeriod2Employee.cs" />
<Compile Include="Entities\Vorlagentabelle.cs" />
<Compile Include="Entities\Wohneinheit.cs" />
<Compile Include="Entities\WohneinheitBelegung.cs" />
<Compile Include="Entities\Wohnheimbuchung2Employee.cs" />
<Compile Include="Entities\FamilyData.cs" />
<Compile Include="Entities\FileAttachmentInfo.cs" />
@@ -697,6 +700,12 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
<EmbeddedResource Include="Mappings\WohneinheitBelegung.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Wohneinheit.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\GkvAbrechnung.hbm.xml" />
<EmbeddedResource Include="Mappings\AdditionalServiceNotice.hbm.xml" />
<EmbeddedResource Include="Mappings\ValidationMessage.hbm.xml" />
@@ -760,6 +769,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\GkvTransferProtokoll.hbm.xml" />
<EmbeddedResource Include="Mappings\CustomerFalldaten.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\TwoFactorCode.hbm.xml" />
<Content Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
@@ -919,6 +931,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Mappings\Mapping.xsd">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>