From b07ccc8313f2dc3998fe41231f4de08b35acdbaa Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 5 Oct 2021 13:30:20 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20an=20Rechnungen=20IFF=20und?= =?UTF-8?q?=20HPFF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWoAllReports.sln | 28 ++ .../CollectiveBillingReport.cs | 19 ++ .../DomizielAnsbach/DomizielAnsbach.csproj | 21 ++ .../Invoicing/CustomInvoiceFactory.cs | 20 +- .../Invoicing/CustomInvoiceFactory.cs | 8 +- .../LebenshilfeDuisburgAtz.csproj | 1 + .../RechnungAtz.Designer.cs | 137 ++++----- .../LebenshilfeDuisburgAtz/RechnungAtz.cs | 18 +- .../RechnungIFF.Designer.cs | 264 ++++++++++-------- .../LebenshilfeDuisburgAtz/RechnungIFF.cs | 5 +- .../LebenshilfeDuisburgReports.csproj | 1 - Service/Plugins/PluginLoader.cs | 6 +- 12 files changed, 324 insertions(+), 204 deletions(-) diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index e7f45051c..1e676d6f3 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -659,8 +659,11 @@ 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 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarlSonnenscheinHaus", "ReportImp\CarlSonnenscheinHaus\CarlSonnenscheinHaus.csproj", "{2CE355CA-0227-4536-B097-C672FCEF4BAA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SozialwerkAachenerChristen", "ReportImp\SozialwerkAachenerChristen\SozialwerkAachenerChristen.csproj", "{47A029F9-D420-48D2-BFE3-CB4988346366}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -7988,6 +7991,30 @@ Global {2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU {2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|x86.ActiveCfg = Release|Any CPU {2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|x86.Build.0 = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|.NET.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|.NET.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|x86.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|x86.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|x86.Build.0 = Debug|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|.NET.ActiveCfg = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|.NET.Build.0 = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Any CPU.Build.0 = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|x86.ActiveCfg = Release|Any CPU + {47A029F9-D420-48D2-BFE3-CB4988346366}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -8317,6 +8344,7 @@ Global {FE240F9F-CC85-4F7D-9080-BEEBE76B0735} = {D8A691C5-146D-4613-86CC-438F02FE9106} {BE015430-F83C-4CAB-902A-5D1962697715} = {D8A691C5-146D-4613-86CC-438F02FE9106} {2CE355CA-0227-4536-B097-C672FCEF4BAA} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {47A029F9-D420-48D2-BFE3-CB4988346366} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/ReportImp/DomizielAnsbach/CollectiveBillingReport.cs b/ReportImp/DomizielAnsbach/CollectiveBillingReport.cs index a6060f29d..0cf662d62 100644 --- a/ReportImp/DomizielAnsbach/CollectiveBillingReport.cs +++ b/ReportImp/DomizielAnsbach/CollectiveBillingReport.cs @@ -3,6 +3,7 @@ using BeWo.Report.ReportObjects; using DevExpress.XtraReports.UI; using BS.Shared.Core; using BeWo.Report; +using System.Collections.Generic; namespace DomizielAnsbach { @@ -16,6 +17,24 @@ namespace DomizielAnsbach public void SetReportDataSource(ServiceInvoiceRO pRO) { + var newSip = new ServiceInvoicePeriodRO(); + + foreach (var sip in pRO.ServiceInvoicePeriods) + { + var newItem = new ServiceInvoiceItemRO(); + + foreach (var item in sip.ServiceInvoiceItems) + { + newItem.UnitCount += item.UnitCount; + newItem.NetAmount += item.NetAmount; + newItem.ServiceDescription = item.ServiceDescription; + } + + newSip.ServiceInvoiceItems.Add(newItem); + } + pRO.ServiceInvoicePeriods = new List(); + pRO.ServiceInvoicePeriods.Add(newSip); + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj b/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj index 14fb3bbfc..af50de167 100644 --- a/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj +++ b/ReportImp/DomizielAnsbach/DomizielAnsbach.csproj @@ -48,6 +48,18 @@ + + Component + + + RechnungBezirk.cs + + + Component + + + RechnungBezirkDetail.cs + Component @@ -60,6 +72,7 @@ InvoiceCustomerReport.cs + @@ -102,6 +115,14 @@ + + RechnungBezirk.cs + Designer + + + RechnungBezirkDetail.cs + Designer + QuittierungsbelegPB.cs diff --git a/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs b/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs index 9747b43b0..6dc342c53 100644 --- a/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs @@ -8,14 +8,24 @@ namespace DomizielAnsbach.Invoicing { public class CustomInvoiceFactory : InvoiceFactory { - + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) { - + foreach (var list in supportConcepts2ServiceRecords.Values) + { + + foreach (var sr in list) + { + if (sr.CostBearer != null) + { + if (sr.CostBearer.Name.Contains("Bezirk Mittelfranken")) // (stationär) + { + return new StationaerInvoiceCreation(); + } + } + } + } return new CollectiveInvoiceCreation(); - - } - } } diff --git a/ReportImp/LebenshilfeDuisburgAtz/Invoicing/CustomInvoiceFactory.cs b/ReportImp/LebenshilfeDuisburgAtz/Invoicing/CustomInvoiceFactory.cs index dafa0a854..a392f6d4d 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/Invoicing/CustomInvoiceFactory.cs @@ -17,15 +17,15 @@ namespace LebenshilfeDuisburgAtz.Invoicing foreach (var item in supportConcepts2ServiceRecords) { var csc = item.Key; - if (csc.CostBearer.Contains("(ATZ)")) + if (csc.CostBearer.Contains("(HPFF)")) { - return new LHDuisburgAtzInvoiceCreation(); + return new LHDuisburgHPFFInvoiceCreation(); } var sc = DAOFactory.GenericDAO.LoadByID(csc.SupportConceptOid); - if (sc.Customer.Person.FirstNameLastName.Contains("(ATZ)")) + if (sc.Customer.Person.FirstNameLastName.Contains("(HPFF)")) { - return new LHDuisburgAtzInvoiceCreation(); + return new LHDuisburgHPFFInvoiceCreation(); } } diff --git a/ReportImp/LebenshilfeDuisburgAtz/LebenshilfeDuisburgAtz.csproj b/ReportImp/LebenshilfeDuisburgAtz/LebenshilfeDuisburgAtz.csproj index 41e9e12b5..e6f5b8859 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/LebenshilfeDuisburgAtz.csproj +++ b/ReportImp/LebenshilfeDuisburgAtz/LebenshilfeDuisburgAtz.csproj @@ -49,6 +49,7 @@ + diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs index 10c0b92bc..d1403721b 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.Designer.cs @@ -54,7 +54,7 @@ namespace LebenshilfeDuisburgAtz this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.txtBelegnr = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -62,11 +62,11 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblKreditor = new DevExpress.XtraReports.UI.XRTableCell(); + this.txtKreditor = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.txtMittelbindungsnr = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblMittelbindung = new DevExpress.XtraReports.UI.XRTableCell(); + this.txtMittelbindung = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -78,7 +78,7 @@ namespace LebenshilfeDuisburgAtz this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.txtLeistung = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -174,19 +174,19 @@ namespace LebenshilfeDuisburgAtz // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 106.0816F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(120.125F, 17F); this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "Aktenzeichen:"; + this.xrLabel8.Text = "GP-Nr.:"; // // lblAZ // this.lblAZ.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); this.lblAZ.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAZ.LocationFloat = new DevExpress.Utils.PointFloat(120.1251F, 115F); + this.lblAZ.LocationFloat = new DevExpress.Utils.PointFloat(120.1251F, 106.0816F); this.lblAZ.Multiline = true; this.lblAZ.Name = "lblAZ"; this.lblAZ.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -289,7 +289,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\ngeb. [CustomerBirthdate!dd.MM.yyyy]\r\n[CustomerStreet]\r\n[CustomerP" + + "ostalCode] [CustomerTown]"; // // xrTable2 // @@ -307,7 +308,7 @@ namespace LebenshilfeDuisburgAtz // this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell11, - this.xrTableCell2}); + this.txtBelegnr}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 0.139636369834711D; // @@ -325,15 +326,15 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell11.Text = "Belegnummer"; this.xrTableCell11.Weight = 1.4596787374581406D; // - // xrTableCell2 + // txtBelegnr // - this.xrTableCell2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.StylePriority.UseBackColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.Text = "[InvoiceNumber]"; - this.xrTableCell2.Weight = 1.4596787374581406D; + this.txtBelegnr.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.txtBelegnr.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.txtBelegnr.Name = "txtBelegnr"; + this.txtBelegnr.StylePriority.UseBackColor = false; + this.txtBelegnr.StylePriority.UseBorders = false; + this.txtBelegnr.Text = "[InvoiceNumber]"; + this.txtBelegnr.Weight = 1.4596787374581406D; // // xrTableRow3 // @@ -400,56 +401,56 @@ namespace LebenshilfeDuisburgAtz // xrTableRow4 // this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell13, - this.xrTableCell4}); + this.lblKreditor, + this.txtKreditor}); this.xrTableRow4.Name = "xrTableRow4"; this.xrTableRow4.Weight = 0.13963636983471095D; // - // xrTableCell13 + // lblKreditor // - this.xrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell13.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell13.StylePriority.UseBorders = false; - this.xrTableCell13.StylePriority.UseFont = false; - this.xrTableCell13.StylePriority.UsePadding = false; - this.xrTableCell13.Text = "Kreditorennummer"; - this.xrTableCell13.Weight = 1.4596787374581406D; + this.lblKreditor.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.lblKreditor.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblKreditor.Name = "lblKreditor"; + this.lblKreditor.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.lblKreditor.StylePriority.UseBorders = false; + this.lblKreditor.StylePriority.UseFont = false; + this.lblKreditor.StylePriority.UsePadding = false; + this.lblKreditor.Text = "Kreditorennummer"; + this.lblKreditor.Weight = 1.4596787374581406D; // - // xrTableCell4 + // txtKreditor // - this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.txtKreditor.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.txtKreditor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "OrganisationDebitorNumber")}); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.Weight = 1.4596787374581406D; + this.txtKreditor.Name = "txtKreditor"; + this.txtKreditor.StylePriority.UseBorders = false; + this.txtKreditor.Weight = 1.4596787374581406D; // // xrTableRow5 // this.xrTableRow5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell6, - this.txtMittelbindungsnr}); + this.lblMittelbindung, + this.txtMittelbindung}); this.xrTableRow5.Name = "xrTableRow5"; this.xrTableRow5.StylePriority.UseBackColor = false; this.xrTableRow5.Weight = 0.13963636983471095D; // - // xrTableCell6 + // lblMittelbindung // - this.xrTableCell6.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.Text = "Mittelbindungsnummer"; - this.xrTableCell6.Weight = 1.4596787374581406D; + this.lblMittelbindung.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblMittelbindung.Name = "lblMittelbindung"; + this.lblMittelbindung.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.lblMittelbindung.StylePriority.UseFont = false; + this.lblMittelbindung.StylePriority.UsePadding = false; + this.lblMittelbindung.Text = "Mittelbindungsnummer"; + this.lblMittelbindung.Weight = 1.4596787374581406D; // - // txtMittelbindungsnr + // txtMittelbindung // - this.txtMittelbindungsnr.Name = "txtMittelbindungsnr"; - this.txtMittelbindungsnr.Weight = 1.4596787374581406D; + this.txtMittelbindung.Name = "txtMittelbindung"; + this.txtMittelbindung.Weight = 1.4596787374581406D; // // ReportFooter // @@ -531,7 +532,7 @@ namespace LebenshilfeDuisburgAtz // this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell12, - this.xrTableCell15, + this.txtLeistung, this.xrTableCell17, this.xrTableCell19, this.xrTableCell20}); @@ -546,19 +547,19 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell12.Text = "xrTableCell43"; this.xrTableCell12.Weight = 0.12307692307692306D; // - // xrTableCell15 + // txtLeistung // - this.xrTableCell15.CanShrink = true; - this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.txtLeistung.CanShrink = true; + this.txtLeistung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); - this.xrTableCell15.Multiline = true; - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell15.StylePriority.UseBorderColor = false; - this.xrTableCell15.StylePriority.UseBorders = false; - this.xrTableCell15.StylePriority.UseFont = false; - this.xrTableCell15.StylePriority.UsePadding = false; - this.xrTableCell15.Weight = 0.4307691838191105D; + this.txtLeistung.Multiline = true; + this.txtLeistung.Name = "txtLeistung"; + this.txtLeistung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.txtLeistung.StylePriority.UseBorderColor = false; + this.txtLeistung.StylePriority.UseBorders = false; + this.txtLeistung.StylePriority.UseFont = false; + this.txtLeistung.StylePriority.UsePadding = false; + this.txtLeistung.Weight = 0.4307691838191105D; // // xrTableCell17 // @@ -705,13 +706,13 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell txtBelegnr; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell lblKreditor; + private DevExpress.XtraReports.UI.XRTableCell txtKreditor; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable3; @@ -733,7 +734,7 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTable xrTable4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell txtLeistung; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; @@ -748,7 +749,7 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; private DevExpress.XtraReports.UI.XRRichText xrRichText4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableCell txtMittelbindungsnr; + private DevExpress.XtraReports.UI.XRTableCell lblMittelbindung; + private DevExpress.XtraReports.UI.XRTableCell txtMittelbindung; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs index fabd016e1..eedd44868 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungAtz.cs @@ -41,7 +41,7 @@ namespace LebenshilfeDuisburgAtz lblAdresse.Text = sb.ToString(); pRO.Notice = ""; - + //pRO.CustomerReferenceNumber = pRO.CustomerReferenceNumber.Replace("Az.:", "GP:"); lblAZ.Text = pRO.CustomerReferenceNumber; if (pRO.InvoiceDateTime.HasValue) pRO.Notice = String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime.Value.AddDays(30)); @@ -120,9 +120,19 @@ namespace LebenshilfeDuisburgAtz } } - - txtMittelbindungsnr.Text = mnr; - + if (!pRO.RecipientOrganisation.Contains("LVR")) + { + txtMittelbindung.Text = mnr; + } + else + { + txtMittelbindung.Text = pRO.InvoiceNumber.Replace("-IFF", "-FF:"); + //txtLeistung.Text = pRO.Ser + lblKreditor.Visible = false; + lblMittelbindung.Visible = false; + txtKreditor.Visible = false; + txtMittelbindung.Visible = false; + } } } } \ No newline at end of file diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.Designer.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.Designer.cs index debd9a6ad..3f5fdd841 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.Designer.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.Designer.cs @@ -39,6 +39,18 @@ namespace LebenshilfeDuisburgAtz this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAZ = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.txtBelegnr = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -70,25 +82,15 @@ namespace LebenshilfeDuisburgAtz this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((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.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -152,6 +154,8 @@ namespace LebenshilfeDuisburgAtz // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel8, + this.lblAZ, this.xrTable2, this.xrLabel4, this.xrTable3, @@ -161,6 +165,132 @@ namespace LebenshilfeDuisburgAtz this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel8 + // + this.xrLabel8.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(120.125F, 17F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.Text = "GP-Nr.:"; + // + // lblAZ + // + this.lblAZ.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); + this.lblAZ.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblAZ.LocationFloat = new DevExpress.Utils.PointFloat(120.1251F, 100F); + this.lblAZ.Multiline = true; + this.lblAZ.Name = "lblAZ"; + this.lblAZ.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAZ.SizeF = new System.Drawing.SizeF(235.755F, 36.70664F); + this.lblAZ.StylePriority.UseFont = false; + // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(427.0004F, 51.99998F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow3, + this.xrTableRow1}); + this.xrTable2.SizeF = new System.Drawing.SizeF(270F, 48F); + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell11, + this.txtBelegnr}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.139636369834711D; + // + // xrTableCell11 + // + this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.xrTableCell11.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell11.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.Text = "Belegnummer"; + this.xrTableCell11.Weight = 1.4596787374581406D; + // + // txtBelegnr + // + this.txtBelegnr.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.txtBelegnr.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.txtBelegnr.Name = "txtBelegnr"; + this.txtBelegnr.StylePriority.UseBackColor = false; + this.txtBelegnr.StylePriority.UseBorders = false; + this.txtBelegnr.Text = "[InvoiceNumber]"; + this.txtBelegnr.Weight = 1.4596787374581406D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell8}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.139636369834711D; + // + // xrTableCell5 + // + this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell5.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.Weight = 1.4596787374581406D; + // + // xrTableCell8 + // + this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.Text = "[InvoiceDate]"; + this.xrTableCell8.Weight = 1.4596787374581406D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell3}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.13963636983471098D; + // + // xrTableCell1 + // + this.xrTableCell1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell1.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBackColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Text = "Abrechnungsmonat"; + this.xrTableCell1.Weight = 1.4596787374581406D; + // + // xrTableCell3 + // + this.xrTableCell3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodStart", "{0:MMMM}")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseBackColor = false; + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.Weight = 1.4596787374581406D; + // // xrLabel4 // this.xrLabel4.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -255,7 +385,7 @@ namespace LebenshilfeDuisburgAtz this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; 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.SizeF = new System.Drawing.SizeF(235.755F, 75F); this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "[CustomerName]\r\ngeb. [CustomerBirthdate!dd.MM.yyyy]\r\n[CustomerStreet]\r\n[CustomerP" + "ostalCode] [CustomerTown]"; @@ -465,110 +595,6 @@ namespace LebenshilfeDuisburgAtz this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell32.Weight = 0.206923076923077D; // - // xrTable2 - // - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(427.0004F, 51.99998F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2, - this.xrTableRow3, - this.xrTableRow1}); - this.xrTable2.SizeF = new System.Drawing.SizeF(270F, 48F); - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell11, - this.xrTableCell2}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.139636369834711D; - // - // xrTableCell11 - // - this.xrTableCell11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.xrTableCell11.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell11.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell11.StylePriority.UseBackColor = false; - this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UsePadding = false; - this.xrTableCell11.Text = "Belegnummer"; - this.xrTableCell11.Weight = 1.4596787374581406D; - // - // xrTableCell2 - // - this.xrTableCell2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.StylePriority.UseBackColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.Text = "[InvoiceNumber]"; - this.xrTableCell2.Weight = 1.4596787374581406D; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5, - this.xrTableCell8}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.139636369834711D; - // - // xrTableCell5 - // - this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell5.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.Text = "Datum"; - this.xrTableCell5.Weight = 1.4596787374581406D; - // - // xrTableCell8 - // - this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.Text = "[InvoiceDate]"; - this.xrTableCell8.Weight = 1.4596787374581406D; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1, - this.xrTableCell3}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13963636983471098D; - // - // xrTableCell1 - // - this.xrTableCell1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell1.Font = new System.Drawing.Font("Segoe UI", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell1.StylePriority.UseBackColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.Text = "Abrechnungsmonat"; - this.xrTableCell1.Weight = 1.4596787374581406D; - // - // xrTableCell3 - // - this.xrTableCell3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodStart", "{0:MMMM}")}); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.StylePriority.UseBackColor = false; - this.xrTableCell3.StylePriority.UseBorders = false; - this.xrTableCell3.Text = "xrTableCell3"; - this.xrTableCell3.Weight = 1.4596787374581406D; - // // RechnungIFF // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -593,13 +619,13 @@ namespace LebenshilfeDuisburgAtz this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -648,12 +674,14 @@ namespace LebenshilfeDuisburgAtz private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell txtBelegnr; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel lblAZ; } } diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs index 89d918b11..97124c59f 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs @@ -97,7 +97,10 @@ namespace LebenshilfeDuisburgAtz } } - sb.AppendLine("über Stadt Duisburg"); + + //sb.AppendLine("über Stadt Duisburg"); + if (pRO.CustomerName.Contains("(HPFF)")) + txtBelegnr.Text = pRO.InvoiceNumber.Replace("-IFF", "-FF:"); sb.AppendLine(pRO.RecipientOrganisation); sb.AppendLine(pRO.RecipientStreet); sb.Append(pRO.RecipientPostCodeAndTown); diff --git a/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj b/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj index df0b4caf3..701ac351d 100644 --- a/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj +++ b/ReportImp/LebenshilfeDuisburgReports/LebenshilfeDuisburgReports.csproj @@ -122,7 +122,6 @@ ServiceInvoiceReportFF.cs - Component diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index f96ffe364..731abee8a 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -273,13 +273,13 @@ namespace BeWo.Service.Plugins //t = "9389386079"; // VARO Sozialagentur //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 = "5929601293"; // Lebenshilfe Duisburg Frühförderung (Projekt heißt LebenshilfeDuisburgAtz) + //t = "6860475645"; // Lebenshilfe Duisburg ATZ (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