diff --git a/ReportImp/BellaDonna/Rechnung67.Designer.cs b/ReportImp/BellaDonna/Rechnung67.Designer.cs index 107c28ed5..f5f184d6f 100644 --- a/ReportImp/BellaDonna/Rechnung67.Designer.cs +++ b/ReportImp/BellaDonna/Rechnung67.Designer.cs @@ -37,6 +37,8 @@ namespace BellaDonna this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblGP = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -52,8 +54,6 @@ namespace BellaDonna this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.lblGp = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -103,8 +103,8 @@ namespace BellaDonna // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGP, this.xrLabel5, - this.lblGp, this.xrRichText1, this.lblAdresse, this.xrLabel3, @@ -114,13 +114,34 @@ namespace BellaDonna this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // lblGP + // + this.lblGP.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.lblGP.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 168.3333F); + this.lblGP.Name = "lblGP"; + this.lblGP.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGP.SizeF = new System.Drawing.SizeF(230.6664F, 23F); + this.lblGP.StylePriority.UseTextAlignment = false; + this.lblGP.Text = "xrLabel8"; + this.lblGP.TextFormatString = "GP-Nr.: {0}"; + // + // xrLabel5 + // + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 259.3611F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(437.9164F, 23F); + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "Rechnungnr.: [InvoiceNumber]"; + // // xrRichText1 // this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 0F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(230.6664F, 154.1389F); + this.xrRichText1.SizeF = new System.Drawing.SizeF(230.6664F, 168.3333F); this.xrRichText1.StylePriority.UseFont = false; // // lblAdresse @@ -260,25 +281,6 @@ namespace BellaDonna // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // lblGp - // - this.lblGp.LocationFloat = new DevExpress.Utils.PointFloat(472.8336F, 209.0694F); - this.lblGp.Name = "lblGp"; - this.lblGp.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblGp.SizeF = new System.Drawing.SizeF(169.1664F, 23F); - this.lblGp.StylePriority.UseTextAlignment = false; - this.lblGp.Text = "GP: "; - this.lblGp.Visible = false; - // - // xrLabel5 - // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 259.3611F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(437.9164F, 23F); - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Rechnungnr.: [InvoiceNumber]"; - // // Rechnung67 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -329,7 +331,7 @@ namespace BellaDonna private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel lblGp; private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblGP; } } diff --git a/ReportImp/BellaDonna/Rechnung67.cs b/ReportImp/BellaDonna/Rechnung67.cs index 10c623870..13eb2c6fd 100644 --- a/ReportImp/BellaDonna/Rechnung67.cs +++ b/ReportImp/BellaDonna/Rechnung67.cs @@ -55,19 +55,6 @@ namespace BellaDonna } lblAbrechnungszeitraum.Text = lblAbrechnungszeitraum.Text.Replace("#####", text); - if (pRO.RecipientOrganisation.Contains("Landschaftsverband Rheinland")) - { - lblGp.Visible = true; - if (pRO.RecipientOrganisation.Contains("Dez 7")) - { - lblGp.Text = "GP-Nr. 2000089562"; - } - else - { - lblGp.Text = "GP-Nr. 2000239439"; - } - } - this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/BellaDonna/ServiceInvoiceReport.Designer.cs b/ReportImp/BellaDonna/ServiceInvoiceReport.Designer.cs index 0531ee630..c71474627 100644 --- a/ReportImp/BellaDonna/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/BellaDonna/ServiceInvoiceReport.Designer.cs @@ -30,6 +30,7 @@ namespace BellaDonna { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungFlex)); + 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(); @@ -37,6 +38,7 @@ namespace BellaDonna this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblGP = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.lblBetreff = new DevExpress.XtraReports.UI.XRLabel(); @@ -67,7 +69,7 @@ namespace BellaDonna // // 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; @@ -87,7 +89,7 @@ namespace BellaDonna // // xrRichText2 // - this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); @@ -102,6 +104,7 @@ namespace BellaDonna // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGP, this.xrRichText1, this.lblAdresse, this.lblBetreff, @@ -112,13 +115,26 @@ namespace BellaDonna this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // lblGP + // + this.lblGP.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.CostBearer2SupportConcept.CostBearer.Organisation.BusinessP" + + "artnerId")}); + this.lblGP.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 194.375F); + this.lblGP.Name = "lblGP"; + this.lblGP.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGP.SizeF = new System.Drawing.SizeF(230.6664F, 23F); + this.lblGP.StylePriority.UseTextAlignment = false; + this.lblGP.Text = "xrLabel8"; + this.lblGP.TextFormatString = "GP-Nr.: {0}"; + // // xrRichText1 // - this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 0F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(230.6664F, 224.5833F); + this.xrRichText1.SizeF = new System.Drawing.SizeF(230.6664F, 194.375F); this.xrRichText1.StylePriority.UseFont = false; // // lblAdresse @@ -147,7 +163,8 @@ namespace BellaDonna // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 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(1.059638E-05F, 332.2222F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -224,7 +241,8 @@ namespace BellaDonna // // xrLabel4 // - this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 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.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(380F, 20.00003F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -253,7 +271,8 @@ namespace BellaDonna // // xrLabel14 // - this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel14.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.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.5833F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -276,14 +295,17 @@ namespace BellaDonna this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Arial", 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(80, 40, 200, 50); + this.Margins = new DevExpress.Drawing.DXMargins(80F, 40F, 200F, 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.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -315,5 +337,6 @@ namespace BellaDonna private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel lblGP; } } diff --git a/ReportImp/BellaDonna/ServiceInvoiceReport.cs b/ReportImp/BellaDonna/ServiceInvoiceReport.cs index 7194cfaa5..bf7661af9 100644 --- a/ReportImp/BellaDonna/ServiceInvoiceReport.cs +++ b/ReportImp/BellaDonna/ServiceInvoiceReport.cs @@ -19,8 +19,6 @@ namespace BellaDonna public void SetReportDataSource(ServiceInvoiceRO pRO) { SetzeAdresse(pRO); - - DateTime start = pRO.AccountingPeriodStart; DateTime end = pRO.AccountingPeriodEnd; diff --git a/ReportImp/BellaDonna/ServiceInvoiceReport.resx b/ReportImp/BellaDonna/ServiceInvoiceReport.resx index 97e8fedf0..c9e48b77b 100644 --- a/ReportImp/BellaDonna/ServiceInvoiceReport.resx +++ b/ReportImp/BellaDonna/ServiceInvoiceReport.resx @@ -137,7 +137,4 @@ Bei Rückfragen stehen wir jederzeit zur Verfügung. Mit freundlichen Grüßen - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/BellaDonna/SettlementReport2.Designer.cs b/ReportImp/BellaDonna/SettlementReport2.Designer.cs index 6697990ea..6506822a7 100644 --- a/ReportImp/BellaDonna/SettlementReport2.Designer.cs +++ b/ReportImp/BellaDonna/SettlementReport2.Designer.cs @@ -31,6 +31,7 @@ namespace BellaDonna.Neu this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -79,6 +80,7 @@ namespace BellaDonna.Neu this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -136,7 +138,7 @@ namespace BellaDonna.Neu // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(476.3299F, 155.4583F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(476.33F, 202.4028F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(173.6701F, 23F); @@ -146,7 +148,7 @@ namespace BellaDonna.Neu // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325.4445F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 354.6111F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -277,7 +279,7 @@ namespace BellaDonna.Neu // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 264.6945F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 293.8611F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -287,7 +289,7 @@ namespace BellaDonna.Neu // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 241.6945F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 270.8612F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -299,7 +301,7 @@ namespace BellaDonna.Neu this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.2361F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 241.4028F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -314,7 +316,7 @@ namespace BellaDonna.Neu this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.2361F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225.4028F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); @@ -329,10 +331,10 @@ namespace BellaDonna.Neu this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.2361F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 208.4028F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(292F, 17F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; @@ -590,6 +592,7 @@ namespace BellaDonna.Neu // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrRichText1, this.xrLabel1, this.xrLabel_RecipientContactPerson, @@ -603,10 +606,22 @@ namespace BellaDonna.Neu this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.HeightF = 393.4445F; + this.GroupHeader1.HeightF = 422.6111F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(476.33F, 155.4583F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(230.6701F, 23F); + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel7.TextFormatString = "GP-Nr.: {0}"; + // // xrRichText1 // this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); @@ -1017,6 +1032,8 @@ namespace BellaDonna.Neu 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.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); @@ -1115,5 +1132,6 @@ namespace BellaDonna.Neu private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/BellaDonna/SettlementReport2.cs b/ReportImp/BellaDonna/SettlementReport2.cs index a6ea9ca7f..2b19c94cc 100644 --- a/ReportImp/BellaDonna/SettlementReport2.cs +++ b/ReportImp/BellaDonna/SettlementReport2.cs @@ -1,31 +1,31 @@ -using System; -using BeWo.Report; -using BeWo.Report.ReportObjects; +using System; +using BeWo.Report; +using BeWo.Report.ReportObjects; using BS.Shared.Extensions; -namespace BellaDonna.Neu -{ - public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport - { - public Spitzabrechnung() - { - InitializeComponent(); - } - - public void SetReportDataSource(Settlement2RO pRO) - { - if (!String.IsNullOrWhiteSpace(pRO.RateFactorText2)) - { - if (pRO.RateFactorText2 == "1,2") - { - pRO.RateFactorText2 = "1,20"; - } - } - - if (pRO.InvoiceItems != null) - { - foreach (var ii in pRO.InvoiceItems) - { +namespace BellaDonna.Neu +{ + public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public Spitzabrechnung() + { + InitializeComponent(); + } + + public void SetReportDataSource(Settlement2RO pRO) + { + if (!String.IsNullOrWhiteSpace(pRO.RateFactorText2)) + { + if (pRO.RateFactorText2 == "1,2") + { + pRO.RateFactorText2 = "1,20"; + } + } + + if (pRO.InvoiceItems != null) + { + foreach (var ii in pRO.InvoiceItems) + { if (pRO.FehlkontakteString != null && ii.RateFactor == 0) { Zwischensumme.Visible = true; @@ -36,21 +36,21 @@ namespace BellaDonna.Neu { ii.ItemDescription = "Fachleistungsstunden"; } - } - } - - if (String.IsNullOrEmpty(pRO.Notice)) - { - lblNotice.Visible = false; - } - - if (pRO.Claim < 0) - { - cellRestforderung.Text = "Rückforderung"; - pRO.FinalSentence = ""; - } - - this.bindingSource1.DataSource = pRO; - } - } -} + } + } + + if (String.IsNullOrEmpty(pRO.Notice)) + { + lblNotice.Visible = false; + } + + if (pRO.Claim < 0) + { + cellRestforderung.Text = "Rückforderung"; + pRO.FinalSentence = ""; + } + + this.bindingSource1.DataSource = pRO; + } + } +}