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

Merge branch 'master' into feature_rene_17_xrechnung

Browse Source 
# Conflicts:
#	BeWo/ServiceProxy/Generated.cs
#	BeWo/Services/BeWoWindowService.cs
#	BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
#	BeWo/View/Windows/BeWoWindowBuilder.cs
#	Data/Data.csproj
#	Host/ServiceRecordPage.aspx.cs
#	Service/Core/ServiceHelper.cs
#	Service/Security/SecurityContextInitializer.cs
#	Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
This commit is contained in:
Rene Evertz
2025-06-17 13:07:41 +02:00
parent 15e038431a b96166c440
commit e2f72fbea0
226 changed files with 9678 additions and 33887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Dakota/Dakota.csproj
View File

@@ -145,16 +145,6 @@
<Compile Include="Models\Segmente\SLGA\SegmentSLGAUST.cs" />
<Compile Include="Models\Blocke\Nutzdatendatei.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
@@ -178,5 +168,15 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Data\Data.csproj">
<Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

4
Dakota/Logic/DakotaKTDReader.cs
View File

@@ -74,9 +74,9 @@ namespace Dakota.Logic
{
var address = GetAddress(seg_ans);
if (seg_ans.ArtDerAnschrift == Models.Schlüssels.SchlüsselArtDerAnschrift.Großkundenanschrift)
if (seg_ans.ArtDerAnschrift == Models.Schlüssels.SchlüsselArtDerAnschrift.Grosskundenanschrift)
{
sum.Großkundenanschrift = address;
sum.Grosskundenanschrift = address;
}
else if(seg_ans.ArtDerAnschrift == Models.Schlüssels.SchlüsselArtDerAnschrift.Postfachanschrift)
{

4
Dakota/Models/Schlüssels/SchlüsselArtDerAnschrift.cs
View File

@@ -12,14 +12,14 @@ namespace Dakota.Models.Schlüssels
public static SchlüsselArtDerAnschrift Hausanschrift => new SchlüsselArtDerAnschrift("1");
public static SchlüsselArtDerAnschrift Postfachanschrift => new SchlüsselArtDerAnschrift("2");
public static SchlüsselArtDerAnschrift Großkundenanschrift => new SchlüsselArtDerAnschrift("3");
public static SchlüsselArtDerAnschrift Grosskundenanschrift => new SchlüsselArtDerAnschrift("3");
public static SchlüsselArtDerAnschrift Parse(string str)
{
var list = new SchlüsselArtDerAnschrift[] {
Hausanschrift ,
Postfachanschrift ,
Großkundenanschrift};
Grosskundenanschrift};
var schlüssel = GetSchlüssel(list, str);