From cd715c065eaf6e5a90deddb0c19cf34f88bc5ff0 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 12 May 2025 18:03:57 +0200 Subject: [PATCH] InklusioElmarBauer: Bei Rechnungen an den LVR festen Erzeuger eintragen (Elmar Bauer) --- .../InvoiceCustomerReport.Designer.cs | 20 ++++++++-------- .../InvoiceCustomerReport.cs | 6 +++++ .../ServiceInvoiceReport.Designer.cs | 24 +++++++++---------- .../ServiceInvoiceReport.cs | 5 ++++ .../SettlementReport2.Designer.cs | 20 ++++++++-------- .../InklusioElmarBauer/SettlementReport2.cs | 7 +++++- 6 files changed, 49 insertions(+), 33 deletions(-) diff --git a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs index e63fffa9f..38d4faa20 100644 --- a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs @@ -83,7 +83,7 @@ namespace InklusioElmarBauer this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterzeichner = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -710,7 +710,7 @@ namespace InklusioElmarBauer this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel8, this.xrLabel10, - this.xrLabel12, + this.lblUnterzeichner, this.lblNotice, this.xrTable4}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); @@ -739,14 +739,14 @@ namespace InklusioElmarBauer this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // - // xrLabel12 + // lblUnterzeichner // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.5417F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(292F, 17.00002F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorFirstName] [CreatorLastName]"; + this.lblUnterzeichner.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.5417F); + this.lblUnterzeichner.Name = "lblUnterzeichner"; + this.lblUnterzeichner.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterzeichner.SizeF = new System.Drawing.SizeF(292F, 17.00002F); + this.lblUnterzeichner.StylePriority.UseFont = false; + this.lblUnterzeichner.Text = "[CreatorFirstName] [CreatorLastName]"; // // lblNotice // @@ -921,7 +921,7 @@ namespace InklusioElmarBauer private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel lblUnterzeichner; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; diff --git a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs index 7d7cbc7f3..acba52804 100644 --- a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs +++ b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs @@ -48,6 +48,12 @@ namespace InklusioElmarBauer } lblAddress.Text = sb.ToString(); + if (pRO.RecipientOrganisation.Contains("LVR")) + { + pRO.CreatorFirstName = "Elmar"; + pRO.CreatorLastName = "Bauer"; + } + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs index 92679c5de..898975665 100644 --- a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs @@ -75,7 +75,7 @@ namespace InklusioElmarBauer this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterzeichner = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -594,17 +594,17 @@ namespace InklusioElmarBauer this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.Weight = 3D; // - // xrLabel14 + // lblUnterzeichner // - this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.lblUnterzeichner.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 184.5833F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "[CreatorName]"; + this.lblUnterzeichner.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.lblUnterzeichner.LocationFloat = new DevExpress.Utils.PointFloat(0F, 184.5833F); + this.lblUnterzeichner.Name = "lblUnterzeichner"; + this.lblUnterzeichner.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterzeichner.SizeF = new System.Drawing.SizeF(225F, 17F); + this.lblUnterzeichner.StylePriority.UseFont = false; + this.lblUnterzeichner.Text = "[CreatorName]"; // // xrLabel9 // @@ -971,7 +971,7 @@ namespace InklusioElmarBauer this.xrLabel1, this.xrLabel9, this.xrTable4, - this.xrLabel14, + this.lblUnterzeichner, this.xrLabel15}); this.GroupFooter1.HeightF = 206.5833F; this.GroupFooter1.Name = "GroupFooter1"; @@ -1045,7 +1045,7 @@ namespace InklusioElmarBauer private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel lblUnterzeichner; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; diff --git a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs index 9ab85ed70..a38d837ad 100644 --- a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs +++ b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs @@ -29,6 +29,11 @@ namespace InklusioElmarBauer SetzeAdresse(pRO); + if (pRO.RecipientOrganisation.Contains("LVR")) + { + pRO.CreatorName = "Elmar Bauer"; + } + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs b/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs index dd8d4b6b5..08e99cb34 100644 --- a/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs +++ b/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs @@ -88,7 +88,7 @@ namespace InklusioElmarBauer this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterzeichner = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); @@ -553,7 +553,7 @@ namespace InklusioElmarBauer this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel10, this.xrTable3, - this.xrLabel12, + this.lblUnterzeichner, this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); @@ -691,14 +691,14 @@ namespace InklusioElmarBauer this.xrTableCell31.Text = "xrTableCell8"; this.xrTableCell31.Weight = 3D; // - // xrLabel12 + // lblUnterzeichner // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorName]"; + this.lblUnterzeichner.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187F); + this.lblUnterzeichner.Name = "lblUnterzeichner"; + this.lblUnterzeichner.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterzeichner.SizeF = new System.Drawing.SizeF(225F, 17F); + this.lblUnterzeichner.StylePriority.UseFont = false; + this.lblUnterzeichner.Text = "[CreatorName]"; // // xrLabel11 // @@ -1275,7 +1275,7 @@ namespace InklusioElmarBauer private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel lblUnterzeichner; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; diff --git a/ReportImp/InklusioElmarBauer/SettlementReport2.cs b/ReportImp/InklusioElmarBauer/SettlementReport2.cs index e3c9e77af..70c6d082b 100644 --- a/ReportImp/InklusioElmarBauer/SettlementReport2.cs +++ b/ReportImp/InklusioElmarBauer/SettlementReport2.cs @@ -54,7 +54,12 @@ namespace InklusioElmarBauer } pRO.RateFactor = (double)rateFactor; - this.bindingSource1.DataSource = pRO; + if (pRO.RecipientOrganisation.Contains("LVR")) + { + pRO.CreatorName = "Elmar Bauer"; + } + + this.bindingSource1.DataSource = pRO; } } }