From 39edfabff4887fab19f9f97d59e077f503bf2607 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 18 Nov 2025 17:23:51 +0100 Subject: [PATCH] TwgJonathan/Export & Rechnung Nacharbeiten --- .../TwgJonathan/Export/ConturaExporter.cs | 4 +- ReportImp/TwgJonathan/Rechnung.Designer.cs | 47 +++++++++++-------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/ReportImp/TwgJonathan/Export/ConturaExporter.cs b/ReportImp/TwgJonathan/Export/ConturaExporter.cs index 6e728adf2..995d12abc 100644 --- a/ReportImp/TwgJonathan/Export/ConturaExporter.cs +++ b/ReportImp/TwgJonathan/Export/ConturaExporter.cs @@ -84,7 +84,7 @@ namespace TwgJonathan.Export sb.Append(String.Format("{0}", row[2])); // FibuBelegNr sb.Append(";"); - sb.Append(String.Format("{0:dd.MM.yyyy}", row[3])); // Belegdatum + sb.Append(String.Format("{0:dd.MM.yyyy}", date.AddMonths(1).AddDays(-1))); // Belegdatum sb.Append(";;;;;"); sb.Append(String.Format("{0}", row[4])); // FKontoNr (Debitor) sb.Append(";;"); @@ -136,7 +136,7 @@ namespace TwgJonathan.Export sb.Append(";"); sb.Append(String.Format("{0:0}", date.Month)); // Wirtschaftsmonat sb.Append(";;;;;1;;"); //Buchungssatz - sb.Append(String.Format("{0:0}", idx)); //ErfaBuchhnr + sb.Append(String.Format("{0:0}", idx++)); //ErfaBuchhnr sb.Append(";;"); if (row[7] != null && row[7].ToString().Trim() != "0" && row[0] != null) // Die Miete startet/endet innerhalb des laufenden Monats { diff --git a/ReportImp/TwgJonathan/Rechnung.Designer.cs b/ReportImp/TwgJonathan/Rechnung.Designer.cs index 4a4e0813b..b1ade4b8d 100644 --- a/ReportImp/TwgJonathan/Rechnung.Designer.cs +++ b/ReportImp/TwgJonathan/Rechnung.Designer.cs @@ -30,6 +30,7 @@ namespace TwgJonathan { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); @@ -112,12 +113,12 @@ namespace TwgJonathan // // xrTable2 // - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0005245209F, 0F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(660F, 40F); + this.xrTable2.SizeF = new System.Drawing.SizeF(673.5417F, 40F); this.xrTable2.StylePriority.UseBorderColor = false; this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; @@ -144,7 +145,7 @@ namespace TwgJonathan // this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.Text = "Ihr Zeichen"; - this.xrTableCell1.Weight = 0.13652272774333885D; + this.xrTableCell1.Weight = 0.18748169389727223D; // // xrTableCell2 // @@ -155,7 +156,7 @@ namespace TwgJonathan this.xrTableCell2.StylePriority.UseBorders = false; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.Text = "Ihre Nachricht vom"; - this.xrTableCell2.Weight = 0.1365227203249709D; + this.xrTableCell2.Weight = 0.12515430011164208D; // // xrTableCell4 // @@ -163,13 +164,13 @@ namespace TwgJonathan this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Unser Zeichen"; - this.xrTableCell4.Weight = 0.12514583410477922D; + this.xrTableCell4.Weight = 0.10413556597885279D; // // xrTableCell6 // this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Text = "Durchwahl, Name"; - this.xrTableCell6.Weight = 0.12514583353095182D; + this.xrTableCell6.Weight = 0.11771373941581999D; // // xrTableCell5 // @@ -177,13 +178,13 @@ namespace TwgJonathan this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Fax"; - this.xrTableCell5.Weight = 0.11376893966674678D; + this.xrTableCell5.Weight = 0.10876088442371408D; // // xrTableCell7 // this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Text = "Datum"; - this.xrTableCell7.Weight = 0.11376893966674676D; + this.xrTableCell7.Weight = 0.10762881121023317D; // // xrTableRow2 // @@ -201,21 +202,23 @@ namespace TwgJonathan // this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F); this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseFont = false; this.xrTableCell8.Text = "25/204-"; - this.xrTableCell8.Weight = 0.13652272774333879D; + this.xrTableCell8.Weight = 0.18748175465644046D; // // xrTableCell9 // this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.Weight = 0.1365227203249709D; + this.xrTableCell9.Weight = 0.12515424057405411D; // // xrTableCell10 // this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Weight = 0.12514586882430395D; + this.xrTableCell10.Weight = 0.10413556545531835D; // // xrTableCell11 // @@ -224,7 +227,7 @@ namespace TwgJonathan this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.Text = "08091 2734"; - this.xrTableCell11.Weight = 0.1251457988114271D; + this.xrTableCell11.Weight = 0.11771373871777409D; // // xrTableCell13 // @@ -233,15 +236,17 @@ namespace TwgJonathan this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseFont = false; this.xrTableCell13.Text = "08091 538 144"; - this.xrTableCell13.Weight = 0.11376893966674678D; + this.xrTableCell13.Weight = 0.10876088442371408D; // // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 9F); this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.11376893966674676D; + this.xrTableCell20.Weight = 0.10762881121023317D; // // xrLabel17 // @@ -471,7 +476,7 @@ namespace TwgJonathan // this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(544.71F, 0F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(576.9982F, 0F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(150.0003F, 30F); @@ -485,9 +490,9 @@ namespace TwgJonathan this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(332.8124F, 0F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(211.8975F, 30F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(244.1858F, 30F); this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.Text = "Aktenzeichen: [DebitorNumber]"; + this.xrLabel18.Text = "Debitor: [DebitorNumber]"; // // xrLabel9 // @@ -511,10 +516,10 @@ namespace TwgJonathan // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(195.8333F, 59.99997F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(195.8333F, 59.99994F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(525.1668F, 30F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(531.1652F, 30F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.Text = "[AccountingPeriodStart!dd.MM.yyyy] - [AccountingPeriodEnd!dd.MM.yyyy]"; // @@ -683,6 +688,8 @@ namespace TwgJonathan this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldEinzel, this.fieldGruppe}); + this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { + this.bindingSource1}); this.DataSource = this.bindingSource1; this.DisplayName = "Rechnung"; this.ExportOptions.PrintPreview.DefaultFileName = "Rechnung"; @@ -695,6 +702,8 @@ namespace TwgJonathan this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();