From 73f5092b6783fc67cfc1902295c79e9b7dfb1a9f Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 27 Sep 2021 21:33:04 +0200 Subject: [PATCH 01/12] cb --- .gitignore | 3 + BeWoAllReports.sln | 27 + ReportImp/Bussmannshof/Budgetnachweis.cs | 2 +- ReportImp/Bussmannshof/Bussmannshof.csproj | 2 +- .../DiakonischesWerkPassau.csproj | 2 +- .../CollectiveBillingReport.Designer.cs | 892 +++++++++--------- .../DomizielAnsbach/DomizielAnsbach.csproj | 3 + .../Invoicing/CollectiveInvoiceCreation.cs | 98 ++ .../Invoicing/CustomInvoiceFactory.cs | 21 + .../QuittierungsbelegPB.Designer.cs | 87 +- .../SettlementReport.Designer.cs | 4 +- .../SettlementReport.resx | 2 +- .../SettlementReport2.resx | 2 +- .../Invoicing/FudInvoiceCreation.cs | 1 + .../Behandlungsnachweis.Designer.cs | 52 +- .../PraxisPusteblume/Behandlungsnachweis.cs | 17 + .../PraxisPusteblume/IfsRechnung.Designer.cs | 96 +- .../IfsRechnungBezirk.Designer.cs | 4 +- .../RechnungIndividualbegleitung.Designer.cs | 38 +- .../Wetterleuchten/Budgetnachweis.Designer.cs | 66 +- Service/Invoicing/InvoiceCreation.cs | 2 +- Service/Plugins/PluginLoader.cs | 5 +- 22 files changed, 790 insertions(+), 636 deletions(-) create mode 100644 ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs create mode 100644 ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs diff --git a/.gitignore b/.gitignore index 7c8a859aa..343e0e5e0 100644 --- a/.gitignore +++ b/.gitignore @@ -546,3 +546,6 @@ /ReportImp/Wichernhaus/obj /ReportImp/FAMRheinSiegGbr/obj/Release /ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Release +/ReportImp/DiakonischesWerkPassau/obj/Release +/ReportImp/DiakonischesWerkRegensburg/obj/Debug +/ReportImp/DiakonischesWerkRegensburg/obj/Release diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index caa14acb7..4c2372561 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -658,6 +658,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkRegensburg" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KoelnerBeWoSelbstbestimmtLeben", "ReportImp\KoelnerBeWoSelbstbestimmtLeben\KoelnerBeWoSelbstbestimmtLeben.csproj", "{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkPassau", "ReportImp\DiakonischesWerkPassau\DiakonischesWerkPassau.csproj", "{BE015430-F83C-4CAB-902A-5D1962697715}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -7937,6 +7939,30 @@ Global {FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Mixed Platforms.Build.0 = Release|Any CPU {FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.ActiveCfg = Release|Any CPU {FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.Build.0 = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|.NET.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|.NET.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|x86.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Debug|x86.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|x86.Build.0 = Debug|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|.NET.ActiveCfg = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|.NET.Build.0 = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|Any CPU.Build.0 = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|x86.ActiveCfg = Release|Any CPU + {BE015430-F83C-4CAB-902A-5D1962697715}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -8264,6 +8290,7 @@ Global {88273E87-C5F9-4DBF-876A-296527A61B4A} = {D8A691C5-146D-4613-86CC-438F02FE9106} {330C49F0-B2D7-4F09-9F6E-E26FF1038BF2} = {D8A691C5-146D-4613-86CC-438F02FE9106} {FE240F9F-CC85-4F7D-9080-BEEBE76B0735} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {BE015430-F83C-4CAB-902A-5D1962697715} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/ReportImp/Bussmannshof/Budgetnachweis.cs b/ReportImp/Bussmannshof/Budgetnachweis.cs index e15e73bf7..d612cae3d 100644 --- a/ReportImp/Bussmannshof/Budgetnachweis.cs +++ b/ReportImp/Bussmannshof/Budgetnachweis.cs @@ -10,7 +10,7 @@ using DevExpress.XtraReports.UI; namespace Bussmannshof { [IDSpecificClass(Identifier = "LWLNEU")] - public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport { public Budgetnachweis() { diff --git a/ReportImp/Bussmannshof/Bussmannshof.csproj b/ReportImp/Bussmannshof/Bussmannshof.csproj index 7c046ad17..9e7e40240 100644 --- a/ReportImp/Bussmannshof/Bussmannshof.csproj +++ b/ReportImp/Bussmannshof/Bussmannshof.csproj @@ -104,7 +104,7 @@ - + diff --git a/ReportImp/DiakonischesWerkPassau/DiakonischesWerkPassau.csproj b/ReportImp/DiakonischesWerkPassau/DiakonischesWerkPassau.csproj index f4775008c..5f0450088 100644 --- a/ReportImp/DiakonischesWerkPassau/DiakonischesWerkPassau.csproj +++ b/ReportImp/DiakonischesWerkPassau/DiakonischesWerkPassau.csproj @@ -7,7 +7,7 @@ {BE015430-F83C-4CAB-902A-5D1962697715} Library Properties - KundeXyz + DiakonischesWerkPassau 4947061147_Reports v4.7.2 512 diff --git a/ReportImp/DomizielAnsbach/CollectiveBillingReport.Designer.cs b/ReportImp/DomizielAnsbach/CollectiveBillingReport.Designer.cs index 716bbb6a5..7a51e43ba 100644 --- a/ReportImp/DomizielAnsbach/CollectiveBillingReport.Designer.cs +++ b/ReportImp/DomizielAnsbach/CollectiveBillingReport.Designer.cs @@ -39,22 +39,30 @@ namespace DomizielAnsbach this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -72,34 +80,22 @@ namespace DomizielAnsbach this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -145,7 +141,7 @@ namespace DomizielAnsbach this.xrLabel4.StylePriority.UseBorders = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Übergangseinrichtung + Ambulante Hilfen"; + this.xrLabel4.Text = "Ambulant Betreutes Wohnen"; this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; // // xrLabel13 @@ -193,362 +189,96 @@ namespace DomizielAnsbach this.bottomMarginBand1.HeightF = 71.00005F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel21 + // + this.xrLabel21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); + this.xrLabel21.Multiline = true; + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(133.4162F, 61.00006F); + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.Text = "Bankverbindung:\t\r\n"; + // + // xrLabel23 + // + this.xrLabel23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(133.4162F, 9.999974F); + this.xrLabel23.Multiline = true; + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(209.5002F, 61.00007F); + this.xrLabel23.StylePriority.UseFont = false; + this.xrLabel23.Text = "Bank für Sozialwirtschaft\r\nDE17 7002 0500 0007 8315 00\r\nBFSWDE33MUE\t\t\r\n"; + // + // xrLabel22 + // + this.xrLabel22.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(342.9166F, 9.999974F); + this.xrLabel22.Multiline = true; + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(181.25F, 61.00006F); + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Sparkasse Ansbach\t\r\nDE97 7655 0000 0000 2917 81 \r\nBYLADEM1ANS\r\n"; + // + // xrPictureBox2 + // + this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(524.1666F, 9.999974F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(153.8335F, 47.4584F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel5 + // + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel5.ForeColor = System.Drawing.Color.White; + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 0F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel5.SizeF = new System.Drawing.SizeF(627.0835F, 9.999974F); + this.xrLabel5.StylePriority.UseBorders = false; + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseForeColor = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "LEER"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // // GroupFooter // this.GroupFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4, - this.xrLabel15, - this.xrLabel14}); - this.GroupFooter.HeightF = 229.4584F; + this.xrLabel10, + this.xrLabel1}); + this.GroupFooter.HeightF = 87.79178F; this.GroupFooter.Name = "GroupFooter"; // - // xrTable4 - // - this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 9.999974F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow7, - this.xrTableRow10, - this.xrTableRow14, - this.xrTableRow19, - this.xrTableRow24}); - this.xrTable4.SizeF = new System.Drawing.SizeF(626F, 68F); - this.xrTable4.StylePriority.UseFont = false; - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.38095238095238093D; - // - // xrTableCell3 - // - this.xrTableCell3.CanShrink = true; - this.xrTableCell3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); - this.xrTableCell3.FormattingRules.Add(this.ruleNoticeNull); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.StylePriority.UseFont = false; - this.xrTableCell3.Text = "Abschließende Bemerkungen:"; - this.xrTableCell3.Weight = 3D; - // // ruleNoticeNull // this.ruleNoticeNull.Condition = "[Notice] == ?"; this.ruleNoticeNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.ruleNoticeNull.Name = "ruleNoticeNull"; // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9}); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.38095238095238093D; - // - // xrTableCell9 - // - this.xrTableCell9.CanShrink = true; - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.Text = "xrTableCell1"; - this.xrTableCell9.Weight = 3D; - // - // xrTableRow14 - // - this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell12}); - this.xrTableRow14.Name = "xrTableRow14"; - this.xrTableRow14.Weight = 0.23809523809523808D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Weight = 3D; - // - // xrTableRow19 - // - this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell14}); - this.xrTableRow19.Name = "xrTableRow19"; - this.xrTableRow19.Weight = 0.38095238095238088D; - // - // xrTableCell14 - // - this.xrTableCell14.CanShrink = true; - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.Text = "[NotBillableNote]"; - this.xrTableCell14.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell20}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.23809523809523803D; - // - // xrTableCell20 - // - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.Weight = 3D; - // - // xrLabel15 - // - this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 93.70836F); - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F); - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.Text = "Mit freundlichen Grüßen"; - // - // xrLabel14 - // - this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 156.2084F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(250F, 17F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "[CreatorName]"; - // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, this.xrTable2, this.xrLabel19, this.xrLabel7, this.xrLabel3, this.xrLabel2, this.xrLabel8}); - this.Page1.Font = new System.Drawing.Font("Verdana", 10F); this.Page1.HeightF = 253.3333F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // - // xrLabel7 - // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + - "tStreet]\r\n[RecipientPostCodeAndTown]"; - // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Transparent; - this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.5F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(626F, 20F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung für Zeitraum [AccountingPeriod]"; - this.xrLabel3.WordWrap = false; - // - // xrLabel2 - // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.5F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(626F, 20F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; - this.xrLabel2.WordWrap = false; - // - // xrLabel8 - // - this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(344F, 172.5F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 20F); - this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "xrLabel8"; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // DetailReport - // - this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1, - this.DetailReport2}); - this.DetailReport.DataMember = "ServiceInvoicePeriods"; - this.DetailReport.DataSource = this.bindingSource1; - this.DetailReport.Level = 0; - this.DetailReport.Name = "DetailReport"; - // - // Detail1 - // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable5}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 10F); - this.Detail1.HeightF = 25F; - this.Detail1.Name = "Detail1"; - this.Detail1.StylePriority.UseFont = false; - // - // xrTable5 - // - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable5.Name = "xrTable5"; - this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(545F, 25F); - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell37, - this.xrTableCell36}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 1D; - // - // xrTableCell37 - // - this.xrTableCell37.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell37.StylePriority.UseBackColor = false; - this.xrTableCell37.StylePriority.UseBorderColor = false; - this.xrTableCell37.StylePriority.UseBorders = false; - this.xrTableCell37.StylePriority.UsePadding = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.Text = "Leistung"; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell37.Weight = 1.6985645512702885D; - // - // xrTableCell36 - // - this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell36.StylePriority.UseBackColor = false; - this.xrTableCell36.StylePriority.UseBorderColor = false; - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.Text = "Betrag"; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.90909095112205562D; - // - // DetailReport2 - // - this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail3, - this.GroupFooter1}); - this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; - this.DetailReport2.DataSource = this.bindingSource1; - this.DetailReport2.Level = 0; - this.DetailReport2.Name = "DetailReport2"; - // - // Detail3 - // - this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable6}); - this.Detail3.HeightF = 25F; - this.Detail3.Name = "Detail3"; - // - // xrTable6 - // - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable6.Name = "xrTable6"; - this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(545F, 25F); - this.xrTable6.StylePriority.UseFont = false; - // - // xrTableRow25 - // - this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell42, - this.xrTableCell45}); - this.xrTableRow25.Name = "xrTableRow25"; - this.xrTableRow25.Weight = 1D; - // - // xrTableCell42 - // - this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); - this.xrTableCell42.Name = "xrTableCell42"; - this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell42.StylePriority.UseBorderColor = false; - this.xrTableCell42.StylePriority.UseBorders = false; - this.xrTableCell42.StylePriority.UsePadding = false; - this.xrTableCell42.StylePriority.UseTextAlignment = false; - this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 1.6985642207574698D; - // - // xrTableCell45 - // - this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00} €")}); - this.xrTableCell45.Name = "xrTableCell45"; - this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell45.StylePriority.UseBorderColor = false; - this.xrTableCell45.StylePriority.UseBorders = false; - this.xrTableCell45.StylePriority.UsePadding = false; - this.xrTableCell45.StylePriority.UseTextAlignment = false; - this.xrTableCell45.Text = "xrTableCell45"; - this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell45.Weight = 0.9090907739518439D; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel1}); - this.GroupFooter1.HeightF = 24.16667F; - this.GroupFooter1.Name = "GroupFooter1"; - // - // xrLabel1 - // - this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.Claim", "Gesamt: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(355.0001F, 0F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(190F, 24.16667F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "xrLabel1"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // xrTable2 // this.xrTable2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(487.7083F, 0F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(487.7083F, 10.00002F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, @@ -698,70 +428,370 @@ namespace DomizielAnsbach // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(487.7083F, 145.4167F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(487.7083F, 155.5F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(158.9586F, 17F); this.xrLabel19.StylePriority.UseFont = false; this.xrLabel19.Text = "www.domiziel-ansbach.de"; // - // xrLabel5 + // xrLabel7 // - this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel5.ForeColor = System.Drawing.Color.White; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 0F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel5.SizeF = new System.Drawing.SizeF(627.0835F, 9.999974F); - this.xrLabel5.StylePriority.UseBorders = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseForeColor = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "LEER"; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00002F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + + "tStreet]\r\n[RecipientPostCodeAndTown]"; // - // xrLabel21 + // xrLabel3 // - this.xrLabel21.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); - this.xrLabel21.Multiline = true; - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(133.4162F, 61.00006F); - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.Text = "Bankverbindung:\t\r\n"; + this.xrLabel3.BackColor = System.Drawing.Color.Transparent; + this.xrLabel3.CanShrink = true; + this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.5F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(626F, 20F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Betreutes Wohnen"; + this.xrLabel3.WordWrap = false; // - // xrLabel23 + // xrLabel2 // - this.xrLabel23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(133.4162F, 9.999974F); - this.xrLabel23.Multiline = true; - this.xrLabel23.Name = "xrLabel23"; - this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(209.5002F, 61.00007F); - this.xrLabel23.StylePriority.UseFont = false; - this.xrLabel23.Text = "Bank für Sozialwirtschaft\r\nDE17 7002 0500 0007 8315 00\r\nBFSWDE33MUE\t\t\r\n"; + this.xrLabel2.BackColor = System.Drawing.Color.Transparent; + this.xrLabel2.CanShrink = true; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.5F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(250F, 19.99998F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Abrechnung"; + this.xrLabel2.WordWrap = false; // - // xrLabel22 + // xrLabel8 // - this.xrLabel22.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(342.9166F, 9.999974F); - this.xrLabel22.Multiline = true; - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(181.25F, 61.00006F); - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "Sparkasse Ansbach\t\r\nDE97 7655 0000 0000 2917 81 \r\nBYLADEM1ANS\r\n"; + this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Ansbach, {0:dd.MM.yyyy}")}); + this.xrLabel8.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(412.0555F, 172.5F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(214.9445F, 20.00002F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrPictureBox2 + // DetailReport // - this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(524.1666F, 9.999974F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(153.8335F, 47.4584F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport2}); + this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5}); + this.Detail1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 25F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTable5 + // + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow23}); + this.xrTable5.SizeF = new System.Drawing.SizeF(635F, 25F); + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell37, + this.xrTableCell7, + this.xrTableCell36}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 1D; + // + // xrTableCell37 + // + this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell37.StylePriority.UseBackColor = false; + this.xrTableCell37.StylePriority.UseBorderColor = false; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UsePadding = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell37.Weight = 1.6985645512702885D; + // + // xrTableCell36 + // + this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell36.StylePriority.UseBackColor = false; + this.xrTableCell36.StylePriority.UseBorderColor = false; + this.xrTableCell36.StylePriority.UseBorders = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "Gesamtkosten"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell36.Weight = 0.71770342553031441D; + // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3, + this.GroupFooter1}); + this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Detail3.HeightF = 25F; + this.Detail3.Name = "Detail3"; + // + // xrTable6 + // + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow25}); + this.xrTable6.SizeF = new System.Drawing.SizeF(635F, 25F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow25 + // + this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell42, + this.xrTableCell10, + this.xrTableCell45}); + this.xrTableRow25.Name = "xrTableRow25"; + this.xrTableRow25.Weight = 1D; + // + // xrTableCell42 + // + this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell42.StylePriority.UseBorderColor = false; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell42.Weight = 1.6985642207574698D; + // + // xrTableCell45 + // + this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00} €")}); + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell45.StylePriority.UseBorderColor = false; + this.xrTableCell45.StylePriority.UseBorders = false; + this.xrTableCell45.StylePriority.UsePadding = false; + this.xrTableCell45.StylePriority.UseTextAlignment = false; + this.xrTableCell45.Text = "xrTableCell45"; + this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell45.Weight = 0.71770328563102037D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter1.HeightF = 25F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // xrLabel6 + // + this.xrLabel6.BackColor = System.Drawing.Color.Transparent; + this.xrLabel6.CanShrink = true; + this.xrLabel6.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(250F, 192.5F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(250F, 19.99998F); + this.xrLabel6.StylePriority.UseBackColor = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "ZE 70027"; + this.xrLabel6.WordWrap = false; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell7.StylePriority.UseBackColor = false; + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Entgelt"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell7.Weight = 0.62200957147374258D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00} €")}); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell10.Weight = 0.62200945020992493D; + // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(2.119276E-05F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow6}); + this.xrTable1.SizeF = new System.Drawing.SizeF(635F, 25F); + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell9, + this.xrTableCell11}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell3.StylePriority.UseBackColor = false; + this.xrTableCell3.StylePriority.UseBorderColor = false; + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "SUMME:"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell3.Weight = 1.6985645512702885D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell9.StylePriority.UseBackColor = false; + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "Entgelt"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell9.Weight = 0.62200957147374258D; + // + // xrTableCell11 + // + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); + this.xrTableCell11.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.StylePriority.UseBorderColor = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "Gesamtkosten"; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell11.Weight = 0.71770342553031441D; + // + // xrLabel1 + // + this.xrLabel1.BackColor = System.Drawing.Color.Transparent; + this.xrLabel1.CanShrink = true; + this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.47921F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(250F, 25F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Forderung"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel1.WordWrap = false; + // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.DarkGray; + this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel10.CanShrink = true; + this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(487.7083F, 23.47921F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(147.29F, 25F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseBorders = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "Forderung"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel10.WordWrap = false; // // Sammelrechnung // @@ -775,7 +805,7 @@ namespace DomizielAnsbach this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull, this.ruleNoticeNull}); @@ -784,11 +814,11 @@ namespace DomizielAnsbach this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -805,17 +835,6 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel8; - private DevExpress.XtraReports.UI.XRLabel xrLabel15; - private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow19; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.XRTable xrTable5; @@ -829,10 +848,7 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.FormattingRule ruleNoticeNull; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel4; @@ -859,5 +875,15 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRLabel xrLabel23; private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; } } diff --git a/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj b/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj index 3030a57b9..14fb3bbfc 100644 --- a/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj +++ b/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj @@ -60,6 +60,8 @@ InvoiceCustomerReport.cs + + Component @@ -121,5 +123,6 @@ Designer + \ No newline at end of file diff --git a/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs new file mode 100644 index 000000000..994c672c1 --- /dev/null +++ b/ReportImp/DomizielAnsbach/Invoicing/CollectiveInvoiceCreation.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; +using BS.Shared.Services; + + +namespace DomizielAnsbach.Invoicing +{ + public class CollectiveInvoiceCreation : InvoiceCreation + { + private DateTime? accountingPeriodStart = null; + private DateTime? accountingPeriodEnd = null; + + public virtual List GenerateServiceInvoices(long costBearerOid, + DateTimeSpan invoicePeriod, + Dictionary> supportConcepts2ServiceRecords) + { + var costBearer = DAOFactory.GenericDAO.LoadByID(costBearerOid); + var invoiceList = new List(); + + var invoiceCounter = 0; + ServiceInvoice invoice; + + invoice = CreateCollectiveBilling2(costBearer, invoicePeriod, supportConcepts2ServiceRecords); + if (invoice != null) + { + invoiceList.Add(invoice); + } + + + var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList(); + + return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result; + } + + private ServiceInvoice CreateCollectiveBilling2(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary> supportConcepts2ServiceRecords) + { + var invoice = new ServiceInvoice(); + + var newDict = new Dictionary>(); + + foreach (var sc2sr in supportConcepts2ServiceRecords) + { + if (sc2sr.Key.IsApproved) + { + newDict.Add(sc2sr.Key, sc2sr.Value); + } + } + + SetRecipientInformation(invoice, costBearer); + SetSenderInformation(invoice); + SetInvoiceBaseData(0, invoice, costBearer, invoicePeriod, newDict.Keys.ToList()); + SetCollectiveBillingBaseData(0, invoice, costBearer, invoicePeriod, newDict); + + SetCollectiveBillingServiceInvoicePeriods(invoice, invoicePeriod, newDict); + + SetServiceInvoicePeriodAmounts(invoice); + + // Spitzabrechnung + if (invoicePeriod == null) + { + SetAmountAdvancePayments(invoice); + } + return invoice; + } + + public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, + IList supportConceptList) + { + if (invoicePeriod != null) + { + accountingPeriodStart = invoicePeriod.StartDate; + accountingPeriodEnd = invoicePeriod.EndDate; + } + base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList); + } + + + + + public override IList CreateInvoiceItems(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + Calculations calc) + { + return base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc); + } + } +} diff --git a/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs b/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs new file mode 100644 index 000000000..9747b43b0 --- /dev/null +++ b/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; + +namespace DomizielAnsbach.Invoicing +{ + public class CustomInvoiceFactory : InvoiceFactory + { + + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + + return new CollectiveInvoiceCreation(); + + + } + + } +} diff --git a/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs b/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs index 4f1ab634b..934c2c8d5 100644 --- a/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs +++ b/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs @@ -46,7 +46,6 @@ namespace DomizielAnsbach this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -67,13 +66,15 @@ namespace DomizielAnsbach this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -81,10 +82,8 @@ namespace DomizielAnsbach // // Detail // - this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTableServiceRecords1}); this.Detail.Font = new System.Drawing.Font("Arial", 11F); - this.Detail.HeightF = 60F; + this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.StylePriority.UseFont = false; @@ -95,7 +94,7 @@ namespace DomizielAnsbach this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0.6944444F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -163,7 +162,8 @@ namespace DomizielAnsbach // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.GroupHeader1}); this.DetailReport.DataMember = "Services"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -213,34 +213,36 @@ namespace DomizielAnsbach this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")}); this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); this.xrTableCell13.StylePriority.UseFont = false; this.xrTableCell13.StylePriority.UsePadding = false; this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "xrTableCell13"; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell13.Weight = 0.13888887377323028D; // // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##} Min.")}); this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell2.StylePriority.UsePadding = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "xrTableCell2"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell2.Weight = 0.13888887698574931D; // // xrTableCell15 // this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription", "{0:0.##}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:0.##}")}); this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 0, 100F); this.xrTableCell15.StylePriority.UseFont = false; this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.Text = "xrTableCell15"; - this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell15.Weight = 0.40404036892472889D; // // xrTableCell5 @@ -251,10 +253,6 @@ namespace DomizielAnsbach this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell5.Weight = 0.16414128592247781D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -457,6 +455,28 @@ namespace DomizielAnsbach this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(540F, 62.08327F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F); + this.xrLabel3.StylePriority.UseBorders = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Berufsbezeichnung"; + // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 62.08327F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F); + this.xrLabel2.StylePriority.UseBorders = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Unterschrift des Bezugsbetreuers"; + // // xrLabel6 // this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -497,27 +517,19 @@ namespace DomizielAnsbach this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // - // xrLabel2 + // GroupHeader1 // - this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 62.08327F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F); - this.xrLabel2.StylePriority.UseBorders = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Unterschrift des Bezugsbetreuers"; + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableServiceRecords1}); + this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F); + this.GroupHeader1.HeightF = 60F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.RepeatEveryPage = true; + this.GroupHeader1.StylePriority.UseFont = false; // - // xrLabel3 + // bindingSource1 // - this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(540F, 62.08327F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F); - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Berufsbezeichnung"; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // QuittierungsbelegPB // @@ -596,5 +608,6 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; } } diff --git a/ReportImp/LebenshilfeEssenReports/SettlementReport.Designer.cs b/ReportImp/LebenshilfeEssenReports/SettlementReport.Designer.cs index acb4ab76f..1f5159526 100644 --- a/ReportImp/LebenshilfeEssenReports/SettlementReport.Designer.cs +++ b/ReportImp/LebenshilfeEssenReports/SettlementReport.Designer.cs @@ -555,7 +555,7 @@ namespace BeWo.LebenshilfeEssenReports this.xrRichText3, this.xrLabel10}); this.ReportFooter.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ReportFooter.HeightF = 260F; + this.ReportFooter.HeightF = 305.8333F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.PrintAtBottom = true; @@ -575,7 +575,7 @@ namespace BeWo.LebenshilfeEssenReports this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(588F, 0F); this.xrRichText3.Name = "xrRichText3"; this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); - this.xrRichText3.SizeF = new System.Drawing.SizeF(199F, 260F); + this.xrRichText3.SizeF = new System.Drawing.SizeF(199F, 305.8333F); // // xrLabel10 // diff --git a/ReportImp/LebenshilfeEssenReports/SettlementReport.resx b/ReportImp/LebenshilfeEssenReports/SettlementReport.resx index 048ee9d55..573552590 100644 --- a/ReportImp/LebenshilfeEssenReports/SettlementReport.resx +++ b/ReportImp/LebenshilfeEssenReports/SettlementReport.resx @@ -127,7 +127,7 @@ ewBcAHIAdABmADEAXABmAGIAaQBkAGkAcwBcAGEAbgBzAGkAXABhAG4AcwBpAGMAcABnADEAMgA1ADIAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMABcAGYAcwB3AGkAcwBzAFwAZgBwAHIAcQAyAFwAZgBjAGgAYQByAHMAZQB0ADAAIABPAHAAZQBuACAAUwBhAG4AcwA7AH0AewBcAGYAMQBcAGYAcgBvAG0AYQBuAFwAZgBwAHIAcQAyAFwAZgBjAGgAYQByAHMAZQB0ADIAIABXAGkAbgBnAGQAaQBuAGcAcwAgADIAOwB9AHsAXABmADIAXABmAG4AaQBsACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AH0ADQAKAFwAdgBpAGUAdwBrAGkAbgBkADQAXAB1AGMAMQBcAHQAcgBvAHcAZABcAHQAcgBnAGEAcABoADEAMAA4AFwAdAByAGwAZQBmAHQALQAxADAAOABcAGMAZQBsAGwAeAA0ADIANQAzAFwAcABhAHIAZABcAGkAbgB0AGIAbABcAGwAdAByAHAAYQByAFwAcwBsADIANQAyAFwAcwBsAG0AdQBsAHQAMQBcAGwAYQBuAGcAMQAwADMAMQBcAGYAMABcAGYAcwAxADIAIABMAGUAYgBlAG4AcwBoAGkAbABmAGUAIABFAHMAcwBlAG4AIABTAGUAcgB2AGkAYwBlACAAZwBHAG0AYgBIACAAXABmADEAXAAnADkANgBcAGYAMAAgACAASABhAHIAawBvAHIAdABzAHQAcgBhAFwAJwBkAGYAZQAgADYAMwAgAFwAZgAxAFwAJwA5ADYAXABmADAAIAAgADQANQAxADQANQAgAEUAcwBzAGUAbgBcAGYAcwAyADIAXABjAGUAbABsAFwAcgBvAHcADQAKAFwAcABhAHIAZABcAGwAdAByAHAAYQByAFwAZgAyAFwAZgBzADIANABcAHAAYQByAA0ACgB9AA0ACgA= - ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE8AcABlAG4AIABTAGEAbgBzADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADUAMQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATABlAGIAZQBuAHMAaABpAGwAZgBlACAARQBzAHMAZQBuACAAUwBlAHIAdgBpAGMAZQAgAGcARwBtAGIASAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABbAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQQBVAFcAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFMAYQBuAGQAcgBhACAASABvAGYAZgBlAHMAbwBtAG0AZQByACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAF0AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASABhAHIAawBvAHIAdABzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA2ADMAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIAA0ADUAMQA0ADUAIABFAHMAcwBlAG4AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAVABlAGwALgAgADAAMgAwADEAIAAvACAAMQAwACAAMgAyADkAIAAtACAAMAA1ADIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABGAGEAeAAgADAAMgAwADEAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAALwAgADEAMAAgADIAMgA5ACAALQAgADAAMgA5AH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAHMALgBoAG8AZgBmAGUAcwBvAG0AbQBlAHIAfQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEAAbABlAGIAZQBuAHMAaABpAGwAZgBlAC0AZQBzAHMAZQBuAC4AZABlAH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAdwB3AHcALgBsAGUAYgBlAG4AcwBoAGkAbABmAGUALQBlAHMAcwBlAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHEAYwBcAHQAeAA0ADUAMwA2AFwAdABxAHIAXAB0AHgAOQAwADcAMgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE8AcABlAG4AIABTAGEAbgBzADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADUAMQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATABlAGIAZQBuAHMAaABpAGwAZgBlACAARQBzAHMAZQBuACAAUwBlAHIAdgBpAGMAZQAgAGcARwBtAGIASAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQQBVAFcAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFMAYQBuAGQAcgBhACAASABvAGYAZgBlAHMAbwBtAG0AZQByAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEgAYQByAGsAbwByAHQAcwB0AHIAYQBcAHUAMgAyADMAXAAnAGQAZgBlACAANgAzAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAANAA1ADEANAA1ACAARQBzAHMAZQBuAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFQAZQBsAC4AIAAwADIAMAAxACAALwAgADEAMAAgADIAMgA5ACAALQAgADAANQAyAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARgBhAHgAIAAwADIAMAAxACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAC8AIAAxADAAIAAyADIAOQAgAC0AIAAwADIAOQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABzAC4AaABvAGYAZgBlAHMAbwBtAG0AZQByAH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABAAGwAZQBiAGUAbgBzAGgAaQBsAGYAZQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAHcAdwB3AC4AbABlAGIAZQBuAHMAaABpAGwAZgBlAC0AZQBzAHMAZQBuAC4AZABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdABxAGMAXAB0AHgANAA1ADMANgBcAHQAcQByAFwAdAB4ADkAMAA3ADIAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= diff --git a/ReportImp/LebenshilfeEssenReports/SettlementReport2.resx b/ReportImp/LebenshilfeEssenReports/SettlementReport2.resx index 37a1afffe..bdfe83889 100644 --- a/ReportImp/LebenshilfeEssenReports/SettlementReport2.resx +++ b/ReportImp/LebenshilfeEssenReports/SettlementReport2.resx @@ -124,7 +124,7 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE8AcABlAG4AIABTAGEAbgBzADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABHAGUAcwBjAGgAXAB1ADIAMgA4AFwAJwBlADQAZgB0AHMAZgBcAHUAMgA1ADIAXAAnAGYAYwBoAHIAZQByADoAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATABvAHQAaABhAHIAIABSAGUAdQBzAGMAaABlAGwAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABKAFwAdQAyADQANgBcACcAZgA2AHIAZwAgAFcAbwBsAHQAZQByAG0AYQBuAG4ALQBIAG8AZgBmAHIAaQBjAGgAdABlAHIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwA6AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEIAYQBuAGsAIABmAFwAdQAyADUAMgBcACcAZgBjAHIAIABTAG8AegBpAGEAbAB3AGkAcgB0AHMAYwBoAGEAZgB0AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASQBCAEEATgA6ACAARABFADIANAAgADMANwAwADIAIAAwADUAMAAwACAAMAAwADAAMQAgADEAMQA1ADIAIAAwADAAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABCAEkAQwA6ACAAIAAgACAAQgBGAFMAVwBEAEUAMwAzAFgAWABYAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABTAHAAZQBuAGQAZQBuAGsAbwBuAHQAbwA6AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFMAcABhAHIAawBhAHMAcwBlACAARQBzAHMAZQBuAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASQBCAEEATgA6ACAARABFADMAMgAgADMANgAwADUAIAAwADEAMAA1ACAAMAAwADAAMwAgADMAMAA1ADUAIAA2ADIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABCAEkAQwA6ACAAUwBQAEUAUwBEAEUAMwBFAFgAWABYAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABIAGEAbgBkAGUAbABzAHIAZQBnAGkAcwB0AGUAcgA6AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQQBtAHQAcwBnAGUAcgBpAGMAaAB0ACAARQBzAHMAZQBuAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASABSAEIAIAAyADAAOAA4ADkAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAUwB0AGUAdQBlAHIAbgB1AG0AbQBlAHIAOgAgADEAMQAyAC8ANQA3ADkAOAAvADAAOQA2ADkAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABVAFMAdAAtAEkARAA6ACAARABFADMAMAA3ADMAMgA0ADQAOQA3AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgB9AA== - ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE8AcABlAG4AIABTAGEAbgBzADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADUAMQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATABlAGIAZQBuAHMAaABpAGwAZgBlACAARQBzAHMAZQBuACAAUwBlAHIAdgBpAGMAZQAgAGcARwBtAGIASAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABbAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQQBVAFcAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFMAYQBuAGQAcgBhACAASABvAGYAZgBlAHMAbwBtAG0AZQByACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAF0AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASABhAHIAawBvAHIAdABzAHQAcgBhAFwAdQAyADIAMwBcACcAZABmAGUAIAA2ADMAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIAA0ADUAMQA0ADUAIABFAHMAcwBlAG4AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAVABlAGwALgAgADAAMgAwADEAIAAvACAAMQAwACAAMgAyADkAIAAtACAAMAA1ADIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABGAGEAeAAgADAAMgAwADEAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAALwAgADEAMAAgADIAMgA5ACAALQAgADAAMgA5AH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAHMAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAC4AaABvAGYAZgB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAZQBzAG8AbQBtAGUAcgB9AHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQABsAGUAYgBlAG4AcwBoAGkAbABmAGUALQBlAHMAcwBlAG4ALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIAB3AHcAdwAuAGwAZQBiAGUAbgBzAGgAaQBsAGYAZQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAcQBjAFwAdAB4ADQANQAzADYAXAB0AHEAcgBcAHQAeAA5ADAANwAyAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE8AcABlAG4AIABTAGEAbgBzADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAyADUAMQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMQA2ADAAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATABlAGIAZQBuAHMAaABpAGwAZgBlACAARQBzAHMAZQBuACAAUwBlAHIAdgBpAGMAZQAgAGcARwBtAGIASAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQQBVAFcAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFMAYQBuAGQAcgBhACAASABvAGYAZgBlAHMAbwBtAG0AZQByAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEgAYQByAGsAbwByAHQAcwB0AHIAYQBcAHUAMgAyADMAXAAnAGQAZgBlACAANgAzAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAANAA1ADEANAA1ACAARQBzAHMAZQBuAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAFQAZQBsAC4AIAAwADIAMAAxACAALwAgADEAMAAgADIAMgA5ACAALQAgADAANQAyAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARgBhAHgAIAAwADIAMAAxACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAC8AIAAxADAAIAAyADIAOQAgAC0AIAAwADIAOQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABzAC4AaABvAGYAZgBlAHMAbwBtAG0AZQByAH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABAAGwAZQBiAGUAbgBzAGgAaQBsAGYAZQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAHcAdwB3AC4AbABlAGIAZQBuAHMAaABpAGwAZgBlAC0AZQBzAHMAZQBuAC4AZABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdABxAGMAXAB0AHgANAA1ADMANgBcAHQAcQByAFwAdAB4ADkAMAA3ADIAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= ewBcAHIAdABmADEAXABmAGIAaQBkAGkAcwBcAGEAbgBzAGkAXABhAG4AcwBpAGMAcABnADEAMgA1ADIAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMABcAGYAcwB3AGkAcwBzAFwAZgBwAHIAcQAyAFwAZgBjAGgAYQByAHMAZQB0ADAAIABPAHAAZQBuACAAUwBhAG4AcwA7AH0AewBcAGYAMQBcAGYAcgBvAG0AYQBuAFwAZgBwAHIAcQAyAFwAZgBjAGgAYQByAHMAZQB0ADIAIABXAGkAbgBnAGQAaQBuAGcAcwAgADIAOwB9AHsAXABmADIAXABmAG4AaQBsACAAVABpAG0AZQBzACAATgBlAHcAIABSAG8AbQBhAG4AOwB9AH0ADQAKAFwAdgBpAGUAdwBrAGkAbgBkADQAXAB1AGMAMQBcAHQAcgBvAHcAZABcAHQAcgBnAGEAcABoADEAMAA4AFwAdAByAGwAZQBmAHQALQAxADAAOABcAGMAZQBsAGwAeAA0ADIANQAzAFwAcABhAHIAZABcAGkAbgB0AGIAbABcAGwAdAByAHAAYQByAFwAcwBsADIANQAyAFwAcwBsAG0AdQBsAHQAMQBcAGwAYQBuAGcAMQAwADMAMQBcAGYAMABcAGYAcwAxADIAIABMAGUAYgBlAG4AcwBoAGkAbABmAGUAIABFAHMAcwBlAG4AIABTAGUAcgB2AGkAYwBlACAAZwBHAG0AYgBIACAAXABmADEAXAAnADkANgBcAGYAMAAgACAASABhAHIAawBvAHIAdABzAHQAcgBhAFwAJwBkAGYAZQAgADYAMwAgAFwAZgAxAFwAJwA5ADYAXABmADAAIAAgADQANQAxADQANQAgAEUAcwBzAGUAbgBcAGYAcwAyADIAXABjAGUAbABsAFwAcgBvAHcADQAKAFwAcABhAHIAZABcAGwAdAByAHAAYQByAFwAZgAyAFwAZgBzADIANABcAHAAYQByAA0ACgB9AA0ACgA= diff --git a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/FudInvoiceCreation.cs b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/FudInvoiceCreation.cs index d1e467b4f..e35b1c34b 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/FudInvoiceCreation.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/FudInvoiceCreation.cs @@ -426,6 +426,7 @@ namespace LebenshilfeFrankfurtOder.Invoicing if (sr.DistanceInMeter.HasValue) { km += sr.DistanceInMeter.Value; + sr.DistanceInMeter = 0; // Verhindern, dass bei mehreren Bewilligungen doppelt abgerechnet wird } } diff --git a/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs b/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs index a02826acf..be0db641f 100644 --- a/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs +++ b/ReportImp/PraxisPusteblume/Behandlungsnachweis.Designer.cs @@ -60,7 +60,7 @@ namespace PraxisPusteblume this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBetreff = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -78,7 +78,6 @@ namespace PraxisPusteblume this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.tableGesamtStunden = new DevExpress.XtraReports.UI.XRTable(); this.tableRowGesamtStunden = new DevExpress.XtraReports.UI.XRTableRow(); this.cellDescription = new DevExpress.XtraReports.UI.XRTableCell(); @@ -86,6 +85,7 @@ namespace PraxisPusteblume this.cellHouryRate = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellClaim = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.rtAnschriftIfs)).BeginInit(); @@ -299,7 +299,7 @@ namespace PraxisPusteblume this.lblMonatJahr, this.lblNachweisFuer, this.xrTable3, - this.xrLabel5}); + this.lblBetreff}); this.Page1.HeightF = 190F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; @@ -326,8 +326,8 @@ namespace PraxisPusteblume // // xrTable3 // - this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable3.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 145F); @@ -385,15 +385,15 @@ namespace PraxisPusteblume this.xrTableCell18.Text = "Gruppen-\r\nförderung*"; this.xrTableCell18.Weight = 0.15384610472396937D; // - // xrLabel5 + // lblBetreff // - this.xrLabel5.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(120.125F, 29.50002F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Rechnung"; + this.lblBetreff.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); + this.lblBetreff.Name = "lblBetreff"; + this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBetreff.SizeF = new System.Drawing.SizeF(645.8195F, 29.50002F); + this.lblBetreff.StylePriority.UseFont = false; + this.lblBetreff.Text = "Rechnung"; // // DetailReport // @@ -430,7 +430,7 @@ namespace PraxisPusteblume // // xrTable4 // - this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); this.xrTable4.Name = "xrTable4"; @@ -562,17 +562,6 @@ namespace PraxisPusteblume this.GroupFooter2.Name = "GroupFooter2"; this.GroupFooter2.StylePriority.UseFont = false; // - // GroupFooter3 - // - this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel14, - this.xrLabel2}); - this.GroupFooter3.Font = new System.Drawing.Font("Segoe UI", 10F); - this.GroupFooter3.HeightF = 173.1593F; - this.GroupFooter3.Level = 2; - this.GroupFooter3.Name = "GroupFooter3"; - this.GroupFooter3.StylePriority.UseFont = false; - // // tableGesamtStunden // this.tableGesamtStunden.LocationFloat = new DevExpress.Utils.PointFloat(45.83F, 0F); @@ -633,6 +622,17 @@ namespace PraxisPusteblume this.cellClaim.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.cellClaim.Weight = 0.16153846153846155D; // + // GroupFooter3 + // + this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel14, + this.xrLabel2}); + this.GroupFooter3.Font = new System.Drawing.Font("Segoe UI", 10F); + this.GroupFooter3.HeightF = 173.1593F; + this.GroupFooter3.Level = 2; + this.GroupFooter3.Name = "GroupFooter3"; + this.GroupFooter3.StylePriority.UseFont = false; + // // xrLabel14 // this.xrLabel14.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -707,7 +707,7 @@ namespace PraxisPusteblume private DevExpress.XtraReports.UI.GroupHeaderBand Page1; private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.XRRichText rtKopfNormal; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblBetreff; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; diff --git a/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs b/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs index 854e6fbe3..2d996307c 100644 --- a/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs +++ b/ReportImp/PraxisPusteblume/Behandlungsnachweis.cs @@ -26,6 +26,11 @@ namespace PraxisPusteblume public void SetReportDataSource(ServiceInvoiceRO pRO) { bool isIfs = PruefeIfs(pRO); + bool isIndHp = CheckHP(pRO); + if (isIndHp) + { + lblBetreff.Text = "Rechnung - Heilpädagogische Leistungen"; + } StringBuilder sb = new StringBuilder(); @@ -66,6 +71,8 @@ namespace PraxisPusteblume { lblUnterschrift.Visible = false; } + + //var stats = GetStatistics(pRO); //if (stats != null) //{ @@ -206,6 +213,16 @@ namespace PraxisPusteblume this.bindingSource1.DataSource = pRO; } + private bool CheckHP(ServiceInvoiceRO pRo) + { + //if (pRo.InvoiceBase.in) + if (pRo.RecipientOrganisation.Contains("Heilpädagogisch")) + { + return true; + } + return false; + } + private void AddGruppenZeilen(ServiceInvoiceRO pRO, Dictionary gruppenHours, Dictionary gruppenHourlyRate, Dictionary gruppenClaim) { if (gruppenHours.Count > 0) diff --git a/ReportImp/PraxisPusteblume/IfsRechnung.Designer.cs b/ReportImp/PraxisPusteblume/IfsRechnung.Designer.cs index 02a235e07..3ccd60cc3 100644 --- a/ReportImp/PraxisPusteblume/IfsRechnung.Designer.cs +++ b/ReportImp/PraxisPusteblume/IfsRechnung.Designer.cs @@ -75,8 +75,10 @@ namespace PraxisPusteblume this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.lblBetragTeamsitzung = new DevExpress.XtraReports.UI.XRLabel(); + this.lblGleichTeam = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBezeichnungTeam = new DevExpress.XtraReports.UI.XRLabel(); this.tableSummen = new DevExpress.XtraReports.UI.XRTable(); this.rowFirstSumme = new DevExpress.XtraReports.UI.XRTableRow(); this.cellDesription1 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -97,16 +99,14 @@ namespace PraxisPusteblume this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.lblBezeichnungTeam = new DevExpress.XtraReports.UI.XRLabel(); - this.lblGleichTeam = new DevExpress.XtraReports.UI.XRLabel(); - this.lblBetragTeamsitzung = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.rtAnschriftIfs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtKopfIfs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtFussIfs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tableSummen)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -553,10 +553,6 @@ namespace PraxisPusteblume this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell7.Weight = 0.15384615384615377D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -569,6 +565,46 @@ namespace PraxisPusteblume this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // lblBetragTeamsitzung + // + this.lblBetragTeamsitzung.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBetragTeamsitzung.LocationFloat = new DevExpress.Utils.PointFloat(534.2051F, 10.00002F); + this.lblBetragTeamsitzung.Multiline = true; + this.lblBetragTeamsitzung.Name = "lblBetragTeamsitzung"; + this.lblBetragTeamsitzung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBetragTeamsitzung.SizeF = new System.Drawing.SizeF(105.0032F, 29.99997F); + this.lblBetragTeamsitzung.StylePriority.UseBorders = false; + this.lblBetragTeamsitzung.StylePriority.UseFont = false; + this.lblBetragTeamsitzung.StylePriority.UseTextAlignment = false; + this.lblBetragTeamsitzung.Text = "Pauschale für Teamsitzung"; + // + // lblGleichTeam + // + this.lblGleichTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblGleichTeam.LocationFloat = new DevExpress.Utils.PointFloat(494.205F, 10.00002F); + this.lblGleichTeam.Multiline = true; + this.lblGleichTeam.Name = "lblGleichTeam"; + this.lblGleichTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGleichTeam.SizeF = new System.Drawing.SizeF(39.99973F, 29.99997F); + this.lblGleichTeam.StylePriority.UseBorders = false; + this.lblGleichTeam.StylePriority.UseFont = false; + this.lblGleichTeam.StylePriority.UseTextAlignment = false; + this.lblGleichTeam.Text = "="; + this.lblGleichTeam.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // lblBezeichnungTeam + // + this.lblBezeichnungTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBezeichnungTeam.LocationFloat = new DevExpress.Utils.PointFloat(45.83401F, 10.00002F); + this.lblBezeichnungTeam.Multiline = true; + this.lblBezeichnungTeam.Name = "lblBezeichnungTeam"; + this.lblBezeichnungTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBezeichnungTeam.SizeF = new System.Drawing.SizeF(448.371F, 29.99997F); + this.lblBezeichnungTeam.StylePriority.UseBorders = false; + this.lblBezeichnungTeam.StylePriority.UseFont = false; + this.lblBezeichnungTeam.StylePriority.UseTextAlignment = false; + this.lblBezeichnungTeam.Text = "Pauschale für Teamsitzung"; + // // tableSummen // this.tableSummen.LocationFloat = new DevExpress.Utils.PointFloat(45.83F, 40F); @@ -750,45 +786,9 @@ namespace PraxisPusteblume this.GroupFooter2.Level = 1; this.GroupFooter2.Name = "GroupFooter2"; // - // lblBezeichnungTeam + // bindingSource1 // - this.lblBezeichnungTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblBezeichnungTeam.LocationFloat = new DevExpress.Utils.PointFloat(45.83401F, 10.00002F); - this.lblBezeichnungTeam.Multiline = true; - this.lblBezeichnungTeam.Name = "lblBezeichnungTeam"; - this.lblBezeichnungTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBezeichnungTeam.SizeF = new System.Drawing.SizeF(448.371F, 29.99997F); - this.lblBezeichnungTeam.StylePriority.UseBorders = false; - this.lblBezeichnungTeam.StylePriority.UseFont = false; - this.lblBezeichnungTeam.StylePriority.UseTextAlignment = false; - this.lblBezeichnungTeam.Text = "Pauschale für Teamsitzung"; - // - // lblGleichTeam - // - this.lblGleichTeam.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGleichTeam.LocationFloat = new DevExpress.Utils.PointFloat(494.205F, 10.00002F); - this.lblGleichTeam.Multiline = true; - this.lblGleichTeam.Name = "lblGleichTeam"; - this.lblGleichTeam.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblGleichTeam.SizeF = new System.Drawing.SizeF(39.99973F, 29.99997F); - this.lblGleichTeam.StylePriority.UseBorders = false; - this.lblGleichTeam.StylePriority.UseFont = false; - this.lblGleichTeam.StylePriority.UseTextAlignment = false; - this.lblGleichTeam.Text = "="; - this.lblGleichTeam.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // - // lblBetragTeamsitzung - // - this.lblBetragTeamsitzung.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblBetragTeamsitzung.LocationFloat = new DevExpress.Utils.PointFloat(534.2051F, 10.00002F); - this.lblBetragTeamsitzung.Multiline = true; - this.lblBetragTeamsitzung.Name = "lblBetragTeamsitzung"; - this.lblBetragTeamsitzung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBetragTeamsitzung.SizeF = new System.Drawing.SizeF(105.0032F, 29.99997F); - this.lblBetragTeamsitzung.StylePriority.UseBorders = false; - this.lblBetragTeamsitzung.StylePriority.UseFont = false; - this.lblBetragTeamsitzung.StylePriority.UseTextAlignment = false; - this.lblBetragTeamsitzung.Text = "Pauschale für Teamsitzung"; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // // IfsRechnung // @@ -820,8 +820,8 @@ namespace PraxisPusteblume ((System.ComponentModel.ISupportInitialize)(this.rtFussIfs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tableSummen)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/PraxisPusteblume/IfsRechnungBezirk.Designer.cs b/ReportImp/PraxisPusteblume/IfsRechnungBezirk.Designer.cs index 08945ecd5..5ba68fef8 100644 --- a/ReportImp/PraxisPusteblume/IfsRechnungBezirk.Designer.cs +++ b/ReportImp/PraxisPusteblume/IfsRechnungBezirk.Designer.cs @@ -526,9 +526,9 @@ namespace PraxisPusteblume this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(464.5831F, 29.50002F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(565.2776F, 29.50002F); this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Rechnung - Heilpädagogische Leistungen"; + this.xrLabel5.Text = "Rechnung"; // // bindingSource1 // diff --git a/ReportImp/PraxisPusteblume/RechnungIndividualbegleitung.Designer.cs b/ReportImp/PraxisPusteblume/RechnungIndividualbegleitung.Designer.cs index 8c4808ae5..e8d4e00cb 100644 --- a/ReportImp/PraxisPusteblume/RechnungIndividualbegleitung.Designer.cs +++ b/ReportImp/PraxisPusteblume/RechnungIndividualbegleitung.Designer.cs @@ -58,7 +58,7 @@ namespace PraxisPusteblume this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBetreff = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -67,7 +67,6 @@ namespace PraxisPusteblume this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField(); @@ -85,6 +84,7 @@ namespace PraxisPusteblume this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter4 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.rtAnschriftIfs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtAnschriftNormal)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtKopfNormal)).BeginInit(); @@ -93,8 +93,8 @@ namespace PraxisPusteblume ((System.ComponentModel.ISupportInitialize)(this.rtFussNormal)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tableGesamtStunden)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -126,7 +126,7 @@ namespace PraxisPusteblume // rtAnschriftIfs // this.rtAnschriftIfs.Font = new System.Drawing.Font("Verdana", 10F); - this.rtAnschriftIfs.LocationFloat = new DevExpress.Utils.PointFloat(190.0622F, 76.58335F); + this.rtAnschriftIfs.LocationFloat = new DevExpress.Utils.PointFloat(190.0588F, 75.04171F); this.rtAnschriftIfs.Name = "rtAnschriftIfs"; this.rtAnschriftIfs.SerializableRtfString = resources.GetString("rtAnschriftIfs.SerializableRtfString"); this.rtAnschriftIfs.SizeF = new System.Drawing.SizeF(434.2296F, 32.29169F); @@ -296,7 +296,7 @@ namespace PraxisPusteblume this.lblMonatJahr, this.lblNachweisFuer, this.xrTable3, - this.xrLabel5}); + this.lblBetreff}); this.Page1.HeightF = 190F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; @@ -364,15 +364,15 @@ namespace PraxisPusteblume this.xrTableCell14.Text = "Anzahl Betreuungsstunden"; this.xrTableCell14.Weight = 0.30769224549594154D; // - // xrLabel5 + // lblBetreff // - this.xrLabel5.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(501.375F, 29.50002F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Rechnung Individualbegleitung"; + this.lblBetreff.Font = new System.Drawing.Font("Segoe UI", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(45.83333F, 0F); + this.lblBetreff.Name = "lblBetreff"; + this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBetreff.SizeF = new System.Drawing.SizeF(501.375F, 29.50002F); + this.lblBetreff.StylePriority.UseFont = false; + this.lblBetreff.Text = "Rechnung Individualbegleitung"; // // DetailReport // @@ -454,10 +454,6 @@ namespace PraxisPusteblume this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell15.Weight = 0.3076923076923076D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -613,6 +609,10 @@ namespace PraxisPusteblume this.xrLabel8.SizeF = new System.Drawing.SizeF(660.9375F, 32.99998F); this.xrLabel8.StylePriority.UseFont = false; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // RechnungIndividualbegleitung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -648,8 +648,8 @@ namespace PraxisPusteblume ((System.ComponentModel.ISupportInitialize)(this.rtFussNormal)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tableGesamtStunden)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -664,7 +664,7 @@ namespace PraxisPusteblume private DevExpress.XtraReports.UI.GroupHeaderBand Page1; private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.XRRichText rtKopfNormal; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblBetreff; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; diff --git a/ReportImp/Wetterleuchten/Budgetnachweis.Designer.cs b/ReportImp/Wetterleuchten/Budgetnachweis.Designer.cs index 0801f829d..8b499e1d1 100644 --- a/ReportImp/Wetterleuchten/Budgetnachweis.Designer.cs +++ b/ReportImp/Wetterleuchten/Budgetnachweis.Designer.cs @@ -58,10 +58,6 @@ namespace Wetterleuchten this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); @@ -325,10 +321,6 @@ namespace Wetterleuchten // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.RecipientPostCodeAndTown, - this.xrLabel_RecipientStreet, - this.xrLabel_RecipientDivision, - this.xrLabel_RecipientContactPerson, this.xrLabel14, this.xrLabel13, this.xrPictureBox1, @@ -416,60 +408,18 @@ namespace Wetterleuchten // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // - // RecipientPostCodeAndTown - // - this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.5833F); - this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; - this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); - this.RecipientPostCodeAndTown.StylePriority.UseFont = false; - this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; - // - // xrLabel_RecipientStreet - // - this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 202.5833F); - this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; - this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientStreet.StylePriority.UseFont = false; - this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; - // - // xrLabel_RecipientDivision - // - this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.5833F); - this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; - this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientDivision.StylePriority.UseFont = false; - this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; - // - // xrLabel_RecipientContactPerson - // - this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.5833F); - this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; - this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; - this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]"; - // // xrLabel14 // - this.xrLabel14.CanShrink = true; - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 151.5833F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 160F); + this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel14.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(351.4559F, 98.33334F); this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "[RecipientOrganisation]"; + this.xrLabel14.StylePriority.UseTextAlignment = false; + this.xrLabel14.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster"; // // Budgetnachweis // @@ -522,10 +472,6 @@ namespace Wetterleuchten private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel13; - private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown; - private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet; - private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision; - private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/Service/Invoicing/InvoiceCreation.cs b/Service/Invoicing/InvoiceCreation.cs index 2f9d57204..249bf2ff0 100644 --- a/Service/Invoicing/InvoiceCreation.cs +++ b/Service/Invoicing/InvoiceCreation.cs @@ -96,7 +96,7 @@ namespace BeWo.Service.Invoicing return null; } - private ServiceInvoice CreateCollectiveBilling(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary> supportConcepts2ServiceRecords) + public virtual ServiceInvoice CreateCollectiveBilling(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary> supportConcepts2ServiceRecords) { var invoice = new ServiceInvoice(); diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 65a10aca9..a515d9f38 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -1,5 +1,4 @@ using System; -using System; using System.Configuration; using System.IO; using System.Linq; @@ -224,7 +223,7 @@ namespace BeWo.Service.Plugins //t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.) //t = "5207911843"; // Pro Balance //t = "8619663355"; // HSH Cologne - //t = "1652658918"; // LH Frankfurt Oder + t = "1652658918"; // LH Frankfurt Oder //t = "7696927868"; // Kuhring Betreuung //t = "6251348980"; // BeWo Gün //t = "6782533512"; // LH Dorsten @@ -279,7 +278,7 @@ namespace BeWo.Service.Plugins //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) //t = "2387527289"; // Lebenshilfe Duisburg HPFH - //t = "5595701056"; // Domiziel Ansbach + t = "5595701056"; // Domiziel Ansbach //t = "9430188510"; // Pro INTEGRA //t = "4820371076"; // Zuhause Wohnen Iris Thimm //t = "1078667960"; // FAM Rhein-Sieg Gbr From b489d9c46d3d5d3f1421e259fafa776b9742002c Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 28 Sep 2021 19:03:51 +0200 Subject: [PATCH 02/12] =?UTF-8?q?=C3=84nderungen=20LHDuisburgAtz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/LHDuisburgAtzInvoiceCreation.cs | 2 +- .../RechnungAtz.Designer.cs | 99 +++++++++++++++---- .../RechnungAtz.cs | 34 +++---- Service/Plugins/PluginLoader.cs | 5 +- 4 files changed, 100 insertions(+), 40 deletions(-) diff --git a/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs b/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs index 7048cd7a8..50c0dc23a 100644 --- a/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs +++ b/ReportImp/LebenshilfeDuisburgAtz6860475645/Invoicing/LHDuisburgAtzInvoiceCreation.cs @@ -12,7 +12,7 @@ namespace LebenshilfeDuisburgAtz.Invoicing protected override void CreateItemTextForCategory(InvoiceItem ii, string cat, string catOriginal) { - ii.ItemDescription = "Eingliederungshilfe nach den Bestimmungen des Sozialgesetzbuch Achtes Buch (SGB VIII) (Autismusspezifische Therapie)"; + ii.ItemDescription = "Eingliederungshilfe nach den Bestimmungen des Sozialgesetzbuch Achtes Buch (§ 35a SGB VIII) / Sozialgesetzbuch Zwölftes Buch(§ 53 SGB XII) (Autismusspezifische Therapie)"; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs index 10c0b92bc..0bcd68efa 100644 --- a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs +++ b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.Designer.cs @@ -33,7 +33,6 @@ namespace LebenshilfeDuisburgAtz this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); @@ -82,12 +81,16 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -95,12 +98,13 @@ namespace LebenshilfeDuisburgAtz ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // + this.Detail.Expanded = false; this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -109,8 +113,11 @@ namespace LebenshilfeDuisburgAtz // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, + this.xrLabel14, + this.xrLabel16, + this.xrLabel17, this.xrRichText1, - this.lblAdresse, this.xrRichText2}); this.ReportHeader.HeightF = 240F; this.ReportHeader.Name = "ReportHeader"; @@ -124,15 +131,6 @@ namespace LebenshilfeDuisburgAtz this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(371.875F, 32.2917F); // - // lblAdresse - // - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.2917F); - this.lblAdresse.Multiline = true; - this.lblAdresse.Name = "lblAdresse"; - this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAdresse.SizeF = new System.Drawing.SizeF(454.5F, 153.1667F); - this.lblAdresse.StylePriority.UseFont = false; - // // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Verdana", 10F); @@ -289,7 +287,8 @@ namespace LebenshilfeDuisburgAtz this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(235.755F, 81.08164F); this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "[CustomerName]\r\n\r\n[CustomerStreet]\r\n[CustomerPostalCode] [CustomerTown]"; + this.xrLabel2.Text = "[CustomerName]\r\n[CustomerBirthdate]\r\n[CustomerStreet]\r\n[CustomerPostalCode] [Cust" + + "omerTown]"; // // xrTable2 // @@ -497,6 +496,7 @@ namespace LebenshilfeDuisburgAtz // // Detail1 // + this.Detail1.Expanded = false; this.Detail1.HeightF = 0F; this.Detail1.Name = "Detail1"; // @@ -599,10 +599,6 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell20.Weight = 0.2069230769230769D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -656,6 +652,66 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell32.Weight = 0.206923076923077D; // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")}); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 46.41666F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel1.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // xrLabel14 + // + this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientDivision")}); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 66.54167F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel14.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // xrLabel16 + // + this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientStreet")}); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 86.66668F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel16.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // xrLabel17 + // + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientPostCodeAndTown")}); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 106.7917F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel17.SizeF = new System.Drawing.SizeF(329.9999F, 20.12498F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" + + "ünster\r\n"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // RechnungAtz // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -685,8 +741,8 @@ namespace LebenshilfeDuisburgAtz ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -700,7 +756,6 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; private DevExpress.XtraReports.UI.GroupHeaderBand Page1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -750,5 +805,9 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell txtMittelbindungsnr; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs index fabd016e1..0a568e441 100644 --- a/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs +++ b/ReportImp/LebenshilfeDuisburgAtz6860475645/RechnungAtz.cs @@ -22,23 +22,23 @@ namespace LebenshilfeDuisburgAtz { StringBuilder sb = new StringBuilder(); - if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) - { - sb.AppendLine(pRO.RecipientOrganisation); - } - if (!String.IsNullOrEmpty(pRO.RecipientDivision)) - { - sb.AppendLine(pRO.RecipientDivision); - } - if (!String.IsNullOrEmpty(pRO.RecipientStreet)) - { - sb.AppendLine(pRO.RecipientStreet); - } - if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) - { - sb.AppendLine(pRO.RecipientPostCodeAndTown); - } - lblAdresse.Text = sb.ToString(); + //if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + // { + // sb.AppendLine(pRO.RecipientOrganisation); + // } + //if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + // { + // sb.AppendLine(pRO.RecipientDivision); + // } + //if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + // { + // sb.AppendLine(pRO.RecipientStreet); + // } + //if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + // { + // sb.AppendLine(pRO.RecipientPostCodeAndTown); + // } + // lblAdresse.Text = sb.ToString(); pRO.Notice = ""; diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 254128bd6..f96ffe364 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -223,7 +223,7 @@ namespace BeWo.Service.Plugins //t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.) //t = "5207911843"; // Pro Balance //t = "8619663355"; // HSH Cologne - t = "1652658918"; // LH Frankfurt Oder + //t = "1652658918"; // LH Frankfurt Oder //t = "7696927868"; // Kuhring Betreuung //t = "6251348980"; // BeWo Gün //t = "6782533512"; // LH Dorsten @@ -274,11 +274,12 @@ namespace BeWo.Service.Plugins //t = "7951718431"; // Ambulant Betreutes Wohnen Astrid Pulm //t = "5850903700"; // Alzey Teilhabe //t = "5929601293"; // Lebenshilfe Duisburg Frühförderung (Projekt heißt LebenshilfeDuisburgAtz) + t = "6860475645"; // Lebenshilfe Duisburg Frühförderung (Projekt heißt LebenshilfeDuisburgAtz6860475645) //t = "4823067940"; // Die Kette 2 //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) //t = "2387527289"; // Lebenshilfe Duisburg HPFH - t = "5595701056"; // Domiziel Ansbach + // t = "5595701056"; // Domiziel Ansbach //t = "9430188510"; // Pro INTEGRA //t = "4820371076"; // Zuhause Wohnen Iris Thimm //t = "1078667960"; // FAM Rhein-Sieg Gbr From 58722d739b7f4fcfe07e0201aad759e62b4aa228 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 1 Oct 2021 14:23:56 +0200 Subject: [PATCH 03/12] Reports Support --- .../DieDueneReports/SettlementReport.resx | 2 +- .../DieDueneReports/SettlementReport2.resx | 2 +- .../Quittierungsbeleg.Designer.cs | 84 ++++++++----------- .../VaroSozialagentur/Quittierungsbeleg.cs | 14 ++-- 4 files changed, 41 insertions(+), 61 deletions(-) diff --git a/ReportImp/DieDueneReports/SettlementReport.resx b/ReportImp/DieDueneReports/SettlementReport.resx index 3b9821114..7c5ab36d5 100644 --- a/ReportImp/DieDueneReports/SettlementReport.resx +++ b/ReportImp/DieDueneReports/SettlementReport.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + anbei sende ich Ihnen die Spitzabrechnung über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: diff --git a/ReportImp/DieDueneReports/SettlementReport2.resx b/ReportImp/DieDueneReports/SettlementReport2.resx index dac8c7ff8..6f596b5da 100644 --- a/ReportImp/DieDueneReports/SettlementReport2.resx +++ b/ReportImp/DieDueneReports/SettlementReport2.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + anbei sende ich Ihnen die Spitzabrechnung über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: diff --git a/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs b/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs index ebd4b0f3b..bc636f479 100644 --- a/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs +++ b/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs @@ -62,7 +62,6 @@ namespace VaroSozialagentur this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -80,7 +79,6 @@ namespace VaroSozialagentur this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -113,13 +111,14 @@ namespace VaroSozialagentur this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -223,7 +222,7 @@ namespace VaroSozialagentur // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.StylePriority.UsePadding = false; @@ -511,10 +510,6 @@ namespace VaroSozialagentur this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell49.Weight = 0.44692737430167606D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -719,8 +714,7 @@ namespace VaroSozialagentur // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblUnterschriftKlient, - this.lblUnterschriftMitarbeiter, + this.xrLabel11, this.xrTableAbwesenheiten, this.lblHatAbwesenheiten, this.lblHatGruppen, @@ -736,28 +730,13 @@ namespace VaroSozialagentur this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // - // lblUnterschriftMitarbeiter - // - this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F); - this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; - this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F); - this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false; - this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false; - this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false; - this.lblUnterschriftMitarbeiter.StylePriority.UsePadding = false; - this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false; - this.lblUnterschriftMitarbeiter.Text = "Datum, verantwortliche/r Mitarbeiter/in"; - this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // xrTableAbwesenheiten // this.xrTableAbwesenheiten.BorderColor = System.Drawing.Color.Black; this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 98.74998F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -953,7 +932,7 @@ namespace VaroSozialagentur | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(432.6945F, 148.75F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -970,7 +949,7 @@ namespace VaroSozialagentur | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(432.6945F, 98.74998F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -984,7 +963,7 @@ namespace VaroSozialagentur // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(472.028F, 148.75F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 90.97221F); @@ -993,7 +972,7 @@ namespace VaroSozialagentur // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(472.028F, 98.74998F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1002,7 +981,7 @@ namespace VaroSozialagentur // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.74998F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1017,7 +996,7 @@ namespace VaroSozialagentur // // xrLabel13 // - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel13.SizeF = new System.Drawing.SizeF(320F, 20F); @@ -1026,12 +1005,13 @@ namespace VaroSozialagentur this.xrLabel13.StylePriority.UseFont = false; this.xrLabel13.StylePriority.UsePadding = false; this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = "GR = Gruppenangebot"; + this.xrLabel13.Text = "GR = Gruppenangebot"; this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel12 // this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F); + this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(320F, 20F); @@ -1040,7 +1020,7 @@ namespace VaroSozialagentur this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UsePadding = false; this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "E = ear to ear, face to face"; + this.xrLabel12.Text = "E = ear to ear"; this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel10 @@ -1098,20 +1078,23 @@ namespace VaroSozialagentur this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // lblUnterschriftKlient + // xrLabel11 // - this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99999F, 250F); - this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; - this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(271.8472F, 20F); - this.lblUnterschriftKlient.StylePriority.UseBackColor = false; - this.lblUnterschriftKlient.StylePriority.UseBorders = false; - this.lblUnterschriftKlient.StylePriority.UseFont = false; - this.lblUnterschriftKlient.StylePriority.UsePadding = false; - this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; - this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; - this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99996F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UsePadding = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "F = face to face"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // Quittierungsbeleg // @@ -1138,10 +1121,10 @@ namespace VaroSozialagentur this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1210,7 +1193,6 @@ namespace VaroSozialagentur private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; @@ -1230,6 +1212,6 @@ namespace VaroSozialagentur private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox picSignature; - private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; } } diff --git a/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs b/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs index de6e8011d..71a2a0e30 100644 --- a/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs +++ b/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs @@ -36,14 +36,18 @@ namespace VaroSozialagentur foreach (var sd in pRO.Services) { - if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt")) + if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt")) // AB: ich bin mir nicht sicher ob die "Fahrt" hier noch maßgeblich ist... { minuten += sd.Minutes; ServicesOverviewRO.CreateSignatureString(sd); - if (sd.IsGroup) + sd.Notice5 = "F"; + if (sd.ServiceDescription.Contains("ear")) + sd.Notice5 = "E"; + else if (sd.IsGroup) { //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount); hatGruppen = true; + sd.Notice5 = "GR"; } servicesBillable.Add(sd); } @@ -105,12 +109,6 @@ namespace VaroSozialagentur index++; } - - if (newRows > 0) - { - lblUnterschriftKlient.Top += newRows * 20; - lblUnterschriftMitarbeiter.Top += newRows * 20; - } } } From 8b8177fcdc7aec0ef9ae65a80fcb2c2d24ee00ff Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 1 Oct 2021 16:49:37 +0200 Subject: [PATCH 04/12] cb --- .gitignore | 2 + BeWo/Core/BeWoUtils.cs | 2 +- BeWo/View/Controls/ListboxSelectControl.xaml | 7 +- .../Controls/ListboxSelectControl.xaml.cs | 6 + BeWoAllReports.sln | 32 +- Host/ReportView.aspx.cs | 12 +- Report/AbstractReportCreator.cs | 3 +- Report/DefaultReportCreator.cs | 13 + ReportImp/BellaDonna/BellaDonna.csproj | 10 + ReportImp/BellaDonna/CustomReportCreator.cs | 2 +- ReportImp/BellaDonna/Finanzauswertung.cs | 104 +++ .../BellaDonna/Finanzauswertung.designer.cs | 801 ++++++++++++++++++ ReportImp/BellaDonna/Finanzauswertung.resx | 123 +++ .../Invoicing/DefaultInvoiceCreation.cs | 27 +- ReportImp/BellaDonna/ServiceInvoiceReport.cs | 84 +- .../CustomGroupDurationCalculator.cs | 22 + .../DiakonischesWerkPassau.csproj | 1 + .../Quittierungsbeleg.cs | 1 + .../QuittierungsbelegMitDatum.Designer.cs | 171 ++-- .../QuittierungsbelegMitDatum.cs | 4 +- .../ServiceInvoiceReport.Designer.cs | 480 +++-------- .../ServiceInvoiceReport.resx | 4 +- .../Quittierungsbeleg.Designer.cs | 39 +- .../Quittierungsbeleg.resx | 755 +++++------------ .../logo_mit_schrift.png | Bin 0 -> 12732 bytes .../CustomerDataReport.Designer.cs | 18 +- Service/Plugins/PluginLoader.cs | 4 +- 27 files changed, 1670 insertions(+), 1057 deletions(-) create mode 100644 ReportImp/BellaDonna/Finanzauswertung.cs create mode 100644 ReportImp/BellaDonna/Finanzauswertung.designer.cs create mode 100644 ReportImp/BellaDonna/Finanzauswertung.resx create mode 100644 ReportImp/DiakonischesWerkPassau/Calculations/CustomGroupDurationCalculator.cs create mode 100644 ReportImp/SozialwerkAachenerChristen/logo_mit_schrift.png diff --git a/.gitignore b/.gitignore index bbed8f5b7..8b7e110fe 100644 --- a/.gitignore +++ b/.gitignore @@ -550,3 +550,5 @@ /ReportImp/DiakonischesWerkRegensburg/obj/Debug /ReportImp/DiakonischesWerkRegensburg/obj/Release /ReportImp/CarlSonnenscheinHaus/obj/Debug +/ReportImp/CarlSonnenscheinHaus/obj/Release +/ReportImp/SozialwerkAachenerChristen/obj/Release diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index a17af0c9b..583cbe2da 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -129,7 +129,7 @@ namespace BeWo.Core WindowStartupLocation = WindowStartupLocation.CenterOwner, GroupBoxContent = control, Owner = BeWoApp.CurrentBeWo.MainWindow, - rootGroupBox = { Header = "Layout speichern" } + rootGroupBox = { Header = "Bericht auswählen" } }; control.CancelButtonClicked += () => beWoWindow.Close(); diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml b/BeWo/View/Controls/ListboxSelectControl.xaml index 2290b72c1..6420a7a0d 100644 --- a/BeWo/View/Controls/ListboxSelectControl.xaml +++ b/BeWo/View/Controls/ListboxSelectControl.xaml @@ -18,8 +18,9 @@ - -