From dbdecf012c8a9faf69d440c461bbdd258e44c2ba Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 22 Sep 2023 15:19:02 +0200 Subject: [PATCH] AkggMid/Export/ExactExporter Korrekturen nach Test --- ReportImp/AkggMid/Export/ExactExporter.cs | 12 ++++---- .../AkggMid/ServiceInvoiceReport.Designer.cs | 29 +++++++++++++++++-- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/ReportImp/AkggMid/Export/ExactExporter.cs b/ReportImp/AkggMid/Export/ExactExporter.cs index 08ad2a6b6..2aafb3821 100644 --- a/ReportImp/AkggMid/Export/ExactExporter.cs +++ b/ReportImp/AkggMid/Export/ExactExporter.cs @@ -73,7 +73,7 @@ namespace AkggMid.Export sb.Append(String.Format("{0}, ", lastDate.Month.ToString())); //Period sb.Append(String.Format("{0:yyyy}, , ", lastDate)); //Financial year sb.Append(String.Format("{0}, ", row[2])); //Description - sb.Append(String.Format("{0:ddMMyyyy}, , ", row[3])); + sb.Append(String.Format("{0:ddMMyyyy}, , ", lastDate)); sb.Append(String.Format("{0}, , , ", row[10])); //Debtor sb.Append(String.Format("{0:0.00}, ,", row[0].ToString().Replace(",", "."))); //amount sb.Append("EUR, 1,B ,0.00,"); @@ -103,7 +103,7 @@ namespace AkggMid.Export sb.Append(String.Format("{0}, ", lastDate.Month.ToString())); //Period sb.Append(String.Format("{0:yyyy}, , ", lastDate)); //Financial year sb.Append(String.Format("{0}, ", row[2])); //Description - sb.Append(String.Format("{0:ddMMyyyy},", row[3])); + sb.Append(String.Format("{0:ddMMyyyy},", lastDate)); if (srow[4] != null && srow[4].ToString() == "Klassenfahrt") { sb.Append("8145,"); @@ -112,7 +112,8 @@ namespace AkggMid.Export { sb.Append("8140,"); } - sb.Append(String.Format("{0}, , ,", row[10])); //Debtor + sb.Append(String.Format("{0}, ,", row[10])); //Debtor + sb.Append(String.Format("{0},", row[4])); //Invoicenr sb.Append(String.Format("{0:0.00}, ,", srow[2].ToString().Replace(",", "."))); //amount sb.Append("EUR, 1, , , ,"); sb.Append(" ,0 ,0.00 , , , , ,6100 , ,"); @@ -143,7 +144,7 @@ namespace AkggMid.Export sb.Append(String.Format("{0}, ", lastDate.Month.ToString())); //Period sb.Append(String.Format("{0:yyyy}, , ", lastDate)); //Financial year sb.Append(String.Format("{0}, ", row[2])); //Description - sb.Append(String.Format("{0:ddMMyyyy},", row[3])); + sb.Append(String.Format("{0:ddMMyyyy},", lastDate)); if (srow[3] != null && srow[3].ToString() == "Klassenfahrt") { sb.Append("8145,"); @@ -152,7 +153,8 @@ namespace AkggMid.Export { sb.Append("8140,"); } - sb.Append(String.Format("{0}, , ,", row[10])); //Debtor + sb.Append(String.Format("{0}, ,", row[10])); //Debtor + sb.Append(String.Format("{0},", row[4])); //Invoicenr sb.Append(String.Format("{0:0.00}, ,", srow[2].ToString().Replace(",", "."))); //amount sb.Append("EUR, 1, , , ,"); sb.Append(" ,0 ,0.00 , , , , ,6100 , ,"); diff --git a/ReportImp/AkggMid/ServiceInvoiceReport.Designer.cs b/ReportImp/AkggMid/ServiceInvoiceReport.Designer.cs index bbad7f540..36b851ad3 100644 --- a/ReportImp/AkggMid/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/AkggMid/ServiceInvoiceReport.Designer.cs @@ -89,6 +89,7 @@ namespace AkggMid this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -507,6 +508,7 @@ namespace AkggMid // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13, this.xrLabel7, this.xrLabel4, this.xrLabel2, @@ -585,8 +587,9 @@ namespace AkggMid // xrLabel21 // this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel21.CanGrow = false; this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "OrganisationDebitorNumber")}); this.xrLabel21.Font = new System.Drawing.Font("Lato", 8.5F, System.Drawing.FontStyle.Italic); this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(584.1273F, 103.7492F); this.xrLabel21.Multiline = true; @@ -601,6 +604,7 @@ namespace AkggMid // xrLabel17 // this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel17.CanGrow = false; this.xrLabel17.Font = new System.Drawing.Font("Lato", 8.5F, System.Drawing.FontStyle.Italic); this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(489.0829F, 121.9792F); this.xrLabel17.Multiline = true; @@ -616,21 +620,23 @@ namespace AkggMid // xrLabel18 // this.xrLabel18.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel18.CanGrow = false; this.xrLabel18.Font = new System.Drawing.Font("Lato", 8.5F, System.Drawing.FontStyle.Italic); this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(489.0829F, 85.52087F); this.xrLabel18.Multiline = true; this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(95.04443F, 36.45837F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(95.04443F, 18.22837F); this.xrLabel18.StylePriority.UseBorders = false; this.xrLabel18.StylePriority.UseFont = false; this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.Text = "Rechnung Nr.\r\nKunden-Nr.\r\n"; + this.xrLabel18.Text = "Rechnung Nr."; this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel20 // this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel20.CanGrow = false; this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); this.xrLabel20.Font = new System.Drawing.Font("Lato", 8.5F, System.Drawing.FontStyle.Italic); @@ -842,6 +848,22 @@ namespace AkggMid // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel13 + // + this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel13.CanGrow = false; + this.xrLabel13.Font = new System.Drawing.Font("Lato", 8.5F, System.Drawing.FontStyle.Italic); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(489.0831F, 103.7492F); + this.xrLabel13.Multiline = true; + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(95.04443F, 18.22837F); + this.xrLabel13.StylePriority.UseBorders = false; + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.Text = "Kunden-Nr.\r\n\r\n"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -928,5 +950,6 @@ namespace AkggMid private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; } }