From b82cada791651c4feb4e6ad46dd4e29275db7608 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 4 Sep 2024 16:19:21 +0200 Subject: [PATCH] AWOMuensterlandRecklinghausen/SBUmsatzerprobung - kleiner Fix --- .../SBUmsatzerprobung.cs | 18 +- .../SbdRechnung2024.Designer.cs | 212 +++++++++--------- 2 files changed, 123 insertions(+), 107 deletions(-) diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SBUmsatzerprobung.cs b/ReportImp/AWOMuensterlandRecklinghausen/SBUmsatzerprobung.cs index 9a4edfa94..fbfe689cd 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/SBUmsatzerprobung.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/SBUmsatzerprobung.cs @@ -55,6 +55,7 @@ namespace AWOMuensterlandRecklinghausen var allInvoices = DAOFactory.GenericDAO.GetAllActive(); var invoices = allInvoices.Where(i => i.InvoiceBase.AccountingPeriodStart >= start && i.InvoiceBase.AccountingPeriodStart < end).ToList(); + invoices = (List)invoices.OrderByDescending(i => i.InvoiceBase.Oid).ToList(); var costcenterDict = new Dictionary>(); @@ -90,8 +91,23 @@ namespace AWOMuensterlandRecklinghausen costcenterDict[sip.Customer.CostCenter].Add(ii); } } - else + else if (i.InvoiceBase.CostBearer2SupportConcept != null && + i.InvoiceBase.CostBearer2SupportConcept.SupportConcept != null && + i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer != null && + !i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.CostCenter.IsNullOrEmpty()) { + if (costcenterDict.ContainsKey(i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.CostCenter)) + { + costcenterDict[i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.CostCenter].Add(ii); + } + else + { + costcenterDict.Add(i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.CostCenter, new List()); + costcenterDict[i.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.CostCenter].Add(ii); + } + } + else + { if (costcenterDict.ContainsKey("123456")) { costcenterDict["123456"].Add(ii); diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.Designer.cs b/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.Designer.cs index ddec336de..906aed30c 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.Designer.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.Designer.cs @@ -51,6 +51,12 @@ namespace AWOMuensterlandRecklinghausen this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -68,18 +74,12 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -374,6 +374,97 @@ namespace AWOMuensterlandRecklinghausen this.GroupFooter3.HeightF = 175.8542F; this.GroupFooter3.Name = "GroupFooter3"; // + // xrTable1 + // + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.4585584F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(664.3334F, 25F); + this.xrTable1.StylePriority.UseFont = false; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell2, + this.xrTableCell3, + this.xrTableCell4}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell1 + // + this.xrTableCell1.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell1.StylePriority.UseBackColor = false; + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Gesamtsumme: "; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell1.Weight = 0.94977878019157558D; + // + // xrTableCell2 + // + this.xrTableCell2.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours")}); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell2.StylePriority.UseBackColor = false; + this.xrTableCell2.StylePriority.UseBorderColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell2.Summary = xrSummary1; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell2.TextFormatString = "{0:0.##} Std."; + this.xrTableCell2.Weight = 0.66469723306968809D; + // + // xrTableCell3 + // + this.xrTableCell3.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + 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.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell3.Weight = 0.66469726496561177D; + // + // xrTableCell4 + // + this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell4.StylePriority.UseBackColor = false; + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Gesamt €"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell4.Weight = 0.66469715159411757D; + // // xrLabel15 // this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F); @@ -545,15 +636,15 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell44.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell44.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##} Std.")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours")}); this.xrTableCell44.Name = "xrTableCell44"; this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell44.StylePriority.UseBorderColor = false; this.xrTableCell44.StylePriority.UseBorders = false; this.xrTableCell44.StylePriority.UsePadding = false; this.xrTableCell44.StylePriority.UseTextAlignment = false; - this.xrTableCell44.Text = "xrTableCell44"; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell44.TextFormatString = "{0:0.##}"; this.xrTableCell44.Weight = 0.66469718635497077D; // // xrTableCell45 @@ -587,101 +678,6 @@ namespace AWOMuensterlandRecklinghausen this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell47.Weight = 0.664697417104529D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // - // xrTable1 - // - this.xrTable1.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.4585584F, 0F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(664.3334F, 25F); - this.xrTable1.StylePriority.UseFont = false; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1, - this.xrTableCell2, - this.xrTableCell3, - this.xrTableCell4}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 1D; - // - // xrTableCell1 - // - this.xrTableCell1.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell1.StylePriority.UseBackColor = false; - this.xrTableCell1.StylePriority.UseBorderColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Gesamtsumme: "; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.94977878019157558D; - // - // xrTableCell2 - // - this.xrTableCell2.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell2.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours")}); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell2.StylePriority.UseBackColor = false; - this.xrTableCell2.StylePriority.UseBorderColor = false; - this.xrTableCell2.StylePriority.UseBorders = false; - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell2.Summary = xrSummary1; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell2.TextFormatString = "{0:0.##} Std."; - this.xrTableCell2.Weight = 0.66469723306968809D; - // - // xrTableCell3 - // - this.xrTableCell3.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell3.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - 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.UsePadding = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell3.Weight = 0.66469726496561177D; - // - // xrTableCell4 - // - this.xrTableCell4.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); - this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Calibri", 11.25F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell4.StylePriority.UseBackColor = false; - this.xrTableCell4.StylePriority.UseBorderColor = false; - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Gesamt €"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell4.Weight = 0.66469715159411757D; - // // GroupHeader1 // this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { @@ -689,6 +685,10 @@ namespace AWOMuensterlandRecklinghausen this.GroupHeader1.HeightF = 0F; this.GroupHeader1.Name = "GroupHeader1"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -709,10 +709,10 @@ namespace AWOMuensterlandRecklinghausen this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }