From 5f52dbc89260242be44aafa6b0342e89a1676dc4 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 9 Jul 2024 11:18:23 +0200 Subject: [PATCH] SkmViersen/Invoicing/CustomInvoiceCreation - Rundung nach Std * Faktor --- .../Invoicing/CustomInvoiceCreation.cs | 35 ++- .../SammelrechnungSeite2.Designer.cs | 291 ++++++++---------- .../SkmViersen/SammelrechnungSeite2.resx | 3 - 3 files changed, 163 insertions(+), 166 deletions(-) diff --git a/ReportImp/SkmViersen/Invoicing/CustomInvoiceCreation.cs b/ReportImp/SkmViersen/Invoicing/CustomInvoiceCreation.cs index 88967a42c..c990f8851 100644 --- a/ReportImp/SkmViersen/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/SkmViersen/Invoicing/CustomInvoiceCreation.cs @@ -27,9 +27,42 @@ namespace SkmViersen.Invoicing serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.Title.Value + " " + serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName; else serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName; - + serviceInvoice.InvoiceBase.RecipientPersonLastName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.LastName; } } + + public override void BerechneSummaryItemsSummen(List newlist, bool addRateFactorToUnitCount) + { + // Rundung nach Stundenzahl * Faktor plus die OriginalStunden ohne Faktor nachher wieder ausgewiesen! + foreach (InvoiceItem invoiceItem in newlist) + { + if (!invoiceItem.AmountPerUnit.HasValue) + { + invoiceItem.AmountPerUnit = 0; + } + invoiceItem.AmountPerUnit = Math.Round(invoiceItem.AmountPerUnit.Value, 2, MidpointRounding.AwayFromZero); + + if (!invoiceItem.UnitCount.HasValue) + { + invoiceItem.UnitCount = 0; + } + + var UnitOld = invoiceItem.UnitCount; + if (invoiceItem.RateFactor.HasValue) + { + invoiceItem.UnitCount = (invoiceItem.UnitCount ?? 0) * ((invoiceItem.RateFactor + 100) / 100); + } + + invoiceItem.UnitCount = Math.Round(invoiceItem.UnitCount.Value, 2, MidpointRounding.AwayFromZero); + + + invoiceItem.AmountTotal = invoiceItem.AmountPerUnit * invoiceItem.UnitCount; + invoiceItem.AmountTotal = Math.Round(invoiceItem.AmountTotal.Value, 2, MidpointRounding.AwayFromZero); + invoiceItem.UnitCount = Math.Round(UnitOld.Value, 2, MidpointRounding.AwayFromZero); + + invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal; + } + } } } \ No newline at end of file diff --git a/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs b/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs index 1a8c40e07..6695ea189 100644 --- a/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs +++ b/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs @@ -29,12 +29,20 @@ namespace SkmViersen private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + 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.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); @@ -51,7 +59,6 @@ namespace SkmViersen this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -62,19 +69,11 @@ namespace SkmViersen this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -90,7 +89,7 @@ namespace SkmViersen // // ReportHeader // - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 0F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -123,16 +122,120 @@ namespace SkmViersen this.xrLabel6, this.xrLabel3, this.xrLabel2}); - this.Page1.Font = new System.Drawing.Font("Verdana", 10F); + this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.Page1.HeightF = 173.875F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel13 + // + this.xrLabel13.BackColor = System.Drawing.Color.Transparent; + this.xrLabel13.CanShrink = true; + this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(175F, 60.00004F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(365.625F, 20F); + this.xrLabel13.StylePriority.UseBackColor = false; + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.WordWrap = false; + // + // xrLabel11 + // + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.CanShrink = true; + this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")}); + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(175F, 40.00003F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(365.625F, 20F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.WordWrap = false; + // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.Transparent; + this.xrLabel10.CanShrink = true; + this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(175F, 20.00001F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(365.625F, 20F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.WordWrap = false; + // + // xrLabel8 + // + this.xrLabel8.BackColor = System.Drawing.Color.Transparent; + this.xrLabel8.CanShrink = true; + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(175F, 0F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(365.625F, 20F); + this.xrLabel8.StylePriority.UseBackColor = false; + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.Text = "[CustomerLastName], [CustomerFirstName]"; + this.xrLabel8.WordWrap = false; + // + // xrLabel12 + // + this.xrLabel12.BackColor = System.Drawing.Color.Transparent; + this.xrLabel12.CanShrink = true; + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.00004F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(175F, 20F); + this.xrLabel12.StylePriority.UseBackColor = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "Rechnungsnummer"; + this.xrLabel12.WordWrap = false; + // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 40.00003F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(175F, 20F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Abrechnung"; + this.xrLabel7.WordWrap = false; + // + // xrLabel6 + // + this.xrLabel6.BackColor = System.Drawing.Color.Transparent; + this.xrLabel6.CanShrink = true; + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 20.00001F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(175F, 20F); + this.xrLabel6.StylePriority.UseBackColor = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "Aktenzeichen"; + this.xrLabel6.WordWrap = false; + // // xrLabel3 // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 124.375F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -146,7 +249,8 @@ namespace SkmViersen // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -158,7 +262,7 @@ namespace SkmViersen // // xrTable4 // - this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -198,7 +302,7 @@ namespace SkmViersen // // xrLabel9 // - this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -229,7 +333,7 @@ namespace SkmViersen this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(677F, 25F); + this.xrTable5.SizeF = new System.Drawing.SizeF(676.8332F, 25F); // // xrTableRow23 // @@ -238,7 +342,6 @@ namespace SkmViersen this.xrTableCell37, this.xrTableCell35, this.xrTableCell33, - this.xrTableCell36, this.xrTableCell38, this.xrTableCell34}); this.xrTableRow23.Name = "xrTableRow23"; @@ -316,24 +419,6 @@ namespace SkmViersen this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell33.Weight = 0.2893277257020575D; // - // xrTableCell36 - // - this.xrTableCell36.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell36.StylePriority.UseBackColor = false; - this.xrTableCell36.StylePriority.UseBorderColor = false; - this.xrTableCell36.StylePriority.UseBorders = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.Text = "Betrag"; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell36.Weight = 0.26310971709438763D; - // // xrTableCell38 // this.xrTableCell38.BackColor = System.Drawing.Color.Gainsboro; @@ -390,12 +475,13 @@ namespace SkmViersen // // xrTable6 // - this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable6.Name = "xrTable6"; this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F); + this.xrTable6.SizeF = new System.Drawing.SizeF(676.8332F, 25F); this.xrTable6.StylePriority.UseFont = false; // // xrTableRow25 @@ -405,7 +491,6 @@ namespace SkmViersen this.xrTableCell42, this.xrTableCell43, this.xrTableCell44, - this.xrTableCell45, this.xrTableCell46, this.xrTableCell47}); this.xrTableRow25.Name = "xrTableRow25"; @@ -476,23 +561,6 @@ namespace SkmViersen this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell44.Weight = 0.2893277257020575D; // - // xrTableCell45 - // - this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")}); - this.xrTableCell45.Name = "xrTableCell45"; - this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell45.StylePriority.UseBorderColor = false; - this.xrTableCell45.StylePriority.UseBorders = false; - this.xrTableCell45.StylePriority.UsePadding = false; - this.xrTableCell45.StylePriority.UseTextAlignment = false; - this.xrTableCell45.Text = "xrTableCell45"; - this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell45.Weight = 0.26310971709438763D; - // // xrTableCell46 // this.xrTableCell46.BorderColor = System.Drawing.Color.DarkGray; @@ -538,7 +606,7 @@ namespace SkmViersen // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); @@ -553,107 +621,6 @@ namespace SkmViersen // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrLabel6 - // - this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.CanShrink = true; - this.xrLabel6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 20.00001F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(175F, 20F); - this.xrLabel6.StylePriority.UseBackColor = false; - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "Aktenzeichen"; - this.xrLabel6.WordWrap = false; - // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 40.00003F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(175F, 20F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Abrechnung"; - this.xrLabel7.WordWrap = false; - // - // xrLabel12 - // - this.xrLabel12.BackColor = System.Drawing.Color.Transparent; - this.xrLabel12.CanShrink = true; - this.xrLabel12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.00004F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(175F, 20F); - this.xrLabel12.StylePriority.UseBackColor = false; - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Rechnungsnummer"; - this.xrLabel12.WordWrap = false; - // - // xrLabel8 - // - this.xrLabel8.BackColor = System.Drawing.Color.Transparent; - this.xrLabel8.CanShrink = true; - this.xrLabel8.Font = new System.Drawing.Font("Verdana", 9.75F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(175F, 0F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(365.625F, 20F); - this.xrLabel8.StylePriority.UseBackColor = false; - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "[CustomerLastName], [CustomerFirstName]"; - this.xrLabel8.WordWrap = false; - // - // xrLabel10 - // - this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.CanShrink = true; - this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); - this.xrLabel10.Font = new System.Drawing.Font("Verdana", 9.75F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(175F, 20.00001F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(365.625F, 20F); - this.xrLabel10.StylePriority.UseBackColor = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.WordWrap = false; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Transparent; - this.xrLabel11.CanShrink = true; - this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")}); - this.xrLabel11.Font = new System.Drawing.Font("Verdana", 9.75F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(175F, 40.00003F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(365.625F, 20F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.WordWrap = false; - // - // xrLabel13 - // - this.xrLabel13.BackColor = System.Drawing.Color.Transparent; - this.xrLabel13.CanShrink = true; - this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrLabel13.Font = new System.Drawing.Font("Verdana", 9.75F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(175F, 60.00004F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(365.625F, 20F); - this.xrLabel13.StylePriority.UseBackColor = false; - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.WordWrap = false; - // // SammelrechnungSeite2 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -665,14 +632,16 @@ namespace SkmViersen this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 198, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 198F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); @@ -705,7 +674,6 @@ namespace SkmViersen private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; @@ -716,7 +684,6 @@ namespace SkmViersen private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; diff --git a/ReportImp/SkmViersen/SammelrechnungSeite2.resx b/ReportImp/SkmViersen/SammelrechnungSeite2.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/SkmViersen/SammelrechnungSeite2.resx +++ b/ReportImp/SkmViersen/SammelrechnungSeite2.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file