diff --git a/ReportImp/Hiba/ServiceInvoiceReport.Designer.cs b/ReportImp/Hiba/ServiceInvoiceReport.Designer.cs index 3a87f56f0..f67d19fc2 100644 --- a/ReportImp/Hiba/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/Hiba/ServiceInvoiceReport.Designer.cs @@ -30,6 +30,7 @@ namespace Hiba { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); + 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(); @@ -61,6 +62,7 @@ namespace Hiba this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -75,7 +77,7 @@ namespace Hiba // // 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; @@ -144,7 +146,8 @@ namespace Hiba // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, 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, 193.4167F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F); @@ -246,7 +249,8 @@ namespace Hiba // this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitDescription")}); - this.xrLabel6.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Underline, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(200F, 20.00001F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.SizeF = new System.Drawing.SizeF(185.75F, 20F); @@ -258,7 +262,8 @@ namespace Hiba // this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); - this.xrLabel4.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Underline, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.SizeF = new System.Drawing.SizeF(193.75F, 20F); @@ -269,19 +274,21 @@ namespace Hiba // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrLabel14, this.xrRichText2, this.xrLabel13, this.xrLabel9, this.xrLabel1}); - this.GroupFooter1.HeightF = 260F; + this.GroupFooter1.HeightF = 302.6249F; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel14 // this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel14.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.75F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 279.3749F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.SizeF = new System.Drawing.SizeF(255.5415F, 23.25F); this.xrLabel14.StylePriority.UseBorders = false; @@ -291,14 +298,14 @@ namespace Hiba // // xrRichText2 // - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112.6249F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(666.9998F, 147.2083F); // // xrLabel13 // - this.xrLabel13.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(200F, 17.00001F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.SizeF = new System.Drawing.SizeF(139.21F, 33.33333F); @@ -311,7 +318,7 @@ namespace Hiba // xrLabel9 // this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -323,7 +330,8 @@ namespace Hiba // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "{0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Tahoma", 11F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))), DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(419.0798F, 17.00001F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.SizeF = new System.Drawing.SizeF(133.0002F, 33.33333F); @@ -364,6 +372,18 @@ namespace Hiba // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel7 + // + this.xrLabel7.CanShrink = true; + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 71.33325F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(666.9998F, 23F); + this.xrLabel7.Text = "xrLabel7"; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -376,14 +396,17 @@ namespace Hiba this.ReportFooter}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Tahoma", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 230, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 230F, 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.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -423,5 +446,6 @@ namespace Hiba private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel xrLabel15; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/Hiba/ServiceInvoiceReport.resx b/ReportImp/Hiba/ServiceInvoiceReport.resx index d10f2b6c1..25134d744 100644 --- a/ReportImp/Hiba/ServiceInvoiceReport.resx +++ b/ReportImp/Hiba/ServiceInvoiceReport.resx @@ -123,7 +123,4 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFQAYQBoAG8AbQBhADsAfQB7AFwAZgAzACAATABpAGIAZQByAGEAdABpAG8AbgAgAFMAZQByAGkAZgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGoAXAB0AHgAMgAyADYAOABcAHQAeAAyADgAMwA1AFwAdAB4ADQANQAzADYAXAB0AHgANQA2ADcAMAB7AFwAZgAyAFwAZgBzADIAMgBcAGMAZgAwACAAQgBpAHQAdABlACAAXAB1ADIANQAyAFwAJwBmAGMAYgBlAHIAdwBlAGkAcwBlAG4AIABTAGkAZQAgAGQAZQBuACAAUgBlAGMAaABuAHUAbgBnAHMAYgBlAHQAcgBhAGcAIAB1AG4AdABlAHIAIABBAG4AZwBhAGIAZQAgAGQAZQBzACAATgBhAG0AZQBuACAAZABlAHMALwBkAGUAcgAgAEIAZQB0AHIAZQB1AHQAZQBuACAAdQBuAGQAIABkAGUAcgAgAFIAZQBjAGgAbgB1AG4AZwBzAG4AdQBtAG0AZQByACAAaQBuAG4AZQByAGgAYQBsAGIAIAB2AG8AbgAgADEAMAAgAFQAYQBnAGUAbgAgAG4AYQBjAGgAIABSAGUAYwBoAG4AdQBuAGcAcwBzAHQAZQBsAGwAdQBuAGcAIABhAHUAZgAgAGQAYQBzACAASwBvAG4AdABvACAAYgBlAGkAIABkAGUAcgAgAH0AXABmADMAXABmAHMAMgA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBqAFwAdAB4ADIAMgA2ADgAXAB0AHgAMgA4ADMANQBcAHQAeAA0ADUAMwA2AFwAdAB4ADUANgA3ADAAewBcAGIAXABmADIAXABmAHMAMgAyAFwAYwBmADAAIABTAHAAYQByAGsAYQBzAHMAZQAgAEgAaQBsAGQAZQBzAGgAZQBpAG0ALAAgAEkAQgBBAE4AOgAgAEQARQAgADUANQAgADIANQA5ADUAMAAxADMAMAAgADAAMAA5ADkAMAA4ADYANAA2ADIALAAgAEIASQBDADoAIABOAE8ATABBAEQARQAyADEASABJAEsAfQBcAGYAMwBcAGYAcwAyADQAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGoAXAB0AHgAMgAyADYAOABcAHQAeAAyADgAMwA1AFwAdAB4ADQANQAzADYAXAB0AHgANQA2ADcAMABcAGIAXABmADIAXABmAHMAMgA0AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBqAFwAdAB4ADIAMgA2ADgAXAB0AHgAMgA4ADMANQBcAHQAeAA0ADUAMwA2AFwAdAB4ADUANgA3ADAAewBcAGYAMgBcAGYAcwAyADIAXABjAGYAMAAgAEQAaQBlAHMAZQByACAAUgBlAGMAaABuAHUAbgBnACAAaQBzAHQAIABlAGkAbgAgAE4AYQBjAGgAdwBlAGkAcwBiAG8AZwBlAG4AIABiAGUAaQBnAGUAZgBcAHUAMgA1ADIAXAAnAGYAYwBnAHQALgB9AFwAZgAzAFwAZgBzADIANABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAagBcAHQAeAAyADIANgA4AFwAdAB4ADIAOAAzADUAXAB0AHgANAA1ADMANgBcAHQAeAA1ADYANwAwAFwAZgAyAFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAagBcAHQAeAAyADIANgA4AFwAdAB4ADIAOAAzADUAXAB0AHgANAA1ADMANgBcAHQAeAA1ADYANwAwAHsAXABmADIAXABmAHMAMgAyAFwAYwBmADAAIABNAGkAdAAgAGYAcgBlAHUAbgBkAGwAaQBjAGgAZQBuACAARwByAFwAdQAyADUAMgBcACcAZgBjAFwAdQAyADIAMwBcACcAZABmAGUAbgB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A - - 17, 17 - \ No newline at end of file