From 36ebbd2c0154bd99daae271e2d1a27b46935ca30 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Thu, 6 Jul 2023 08:30:30 +0200 Subject: [PATCH] PerspektivenEV LWV zu Landeswohlfahrtsverband --- .../CollectiveBillingReport.Designer.cs | 36 +++++++++---------- .../PerspektivenEV/CustomReportCreator.cs | 2 +- .../PerspektivenEV/Export/DatevExporter.cs | 4 +-- .../Invoicing/CustomInvoiceFactory.cs | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs b/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs index 390723533..2ba090e57 100644 --- a/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs +++ b/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs @@ -36,6 +36,7 @@ namespace PerspektivenEV this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule(); @@ -73,7 +74,6 @@ namespace PerspektivenEV this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -119,6 +119,21 @@ namespace PerspektivenEV this.GroupFooter.HeightF = 213.8335F; this.GroupFooter.Name = "GroupFooter"; // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.CanShrink = true; + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(631F, 19.99998F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.WordWrap = false; + // // xrLabel7 // this.xrLabel7.BackColor = System.Drawing.Color.Transparent; @@ -197,8 +212,8 @@ namespace PerspektivenEV this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F); this.lblAdresse.StylePriority.UseFont = false; - this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + - "tStreet]\r\n[RecipientPostCodeAndTown]"; + this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientAddressLine1]\r\n[RecipientDivision]\r\n[Recipient" + + "Street]\r\n[RecipientPostCodeAndTown]"; // // xrLabel3 // @@ -614,21 +629,6 @@ namespace PerspektivenEV // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrLabel4 - // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(631F, 19.99998F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.WordWrap = false; - // // Sammelrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/PerspektivenEV/CustomReportCreator.cs b/ReportImp/PerspektivenEV/CustomReportCreator.cs index 4dafa1098..221583e87 100644 --- a/ReportImp/PerspektivenEV/CustomReportCreator.cs +++ b/ReportImp/PerspektivenEV/CustomReportCreator.cs @@ -48,7 +48,7 @@ namespace PerspektivenEV { XtraReport invoiceReport = null; - if (iDC.InvoiceBase.RecipientOrganisation != "LWV Hessen" && iDC.InvoiceBase.Type.ToString() == "Service" + if (iDC.InvoiceBase.RecipientOrganisation != "Landeswohlfahrtsverband Hessen" && iDC.InvoiceBase.Type.ToString() == "Service" && iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory.Name.Contains("BW")) { XtraReport masterReport = new XtraReport(); diff --git a/ReportImp/PerspektivenEV/Export/DatevExporter.cs b/ReportImp/PerspektivenEV/Export/DatevExporter.cs index 14ce7875b..47f777c49 100644 --- a/ReportImp/PerspektivenEV/Export/DatevExporter.cs +++ b/ReportImp/PerspektivenEV/Export/DatevExporter.cs @@ -439,7 +439,7 @@ namespace PerspektivenEV.Export inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid inner join invoiceitem ii on ii.serviceinvoiceperiodoid = sip.oid WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' and ib.IsActive = 1 - AND ib.RecipientOrganisation <> 'LWV Hessen' + AND ib.RecipientOrganisationOid <> 4 ORDER BY invoiceoid, ii.ItemDescription "; @@ -504,7 +504,7 @@ namespace PerspektivenEV.Export JOIN serviceinvoiceperiod sip ON sip.serviceinvoiceoid = si.oid JOIN invoiceitem ii ON ii.serviceinvoiceperiodoid = sip.oid WHERE ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodEnd` < ':Monat_End' AND ib.IsActive = 1 - AND ib.RecipientOrganisation = 'LWV Hessen' + AND ib.RecipientOrganisationOid = 4 ORDER BY ii.ItemDescription "; diff --git a/ReportImp/PerspektivenEV/Invoicing/CustomInvoiceFactory.cs b/ReportImp/PerspektivenEV/Invoicing/CustomInvoiceFactory.cs index 418267383..396572af8 100644 --- a/ReportImp/PerspektivenEV/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/PerspektivenEV/Invoicing/CustomInvoiceFactory.cs @@ -20,7 +20,7 @@ namespace PerspektivenEV.Invoicing { return new CustomInvoiceCreation(); } - else if (sr.CostBearer.Name.Contains("LWV Hessen")) + else if (sr.CostBearer.Name.Contains("LWV Hessen") || sr.CostBearer.Name.Contains("Landeswohlfahrtsverband Hessen")) { return new CollectiveInvoiceCreation(); }