diff --git a/ReportImp/BellaDonna/BellaDonna.csproj b/ReportImp/BellaDonna/BellaDonna.csproj index 62f981216..eb5a23f63 100644 --- a/ReportImp/BellaDonna/BellaDonna.csproj +++ b/ReportImp/BellaDonna/BellaDonna.csproj @@ -73,6 +73,7 @@ + Component diff --git a/ReportImp/BellaDonna/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/BellaDonna/Invoicing/SettlementInvoiceCreation.cs new file mode 100644 index 000000000..72ee14191 --- /dev/null +++ b/ReportImp/BellaDonna/Invoicing/SettlementInvoiceCreation.cs @@ -0,0 +1,18 @@ +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.Services; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BellaDonna +{ + public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation + { + public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) + { + return false; + } + } +} diff --git a/ReportImp/BellaDonna/Rechnung67.Designer.cs b/ReportImp/BellaDonna/Rechnung67.Designer.cs index 6e44bc65e..107c28ed5 100644 --- a/ReportImp/BellaDonna/Rechnung67.Designer.cs +++ b/ReportImp/BellaDonna/Rechnung67.Designer.cs @@ -52,6 +52,8 @@ 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(); @@ -66,7 +68,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; @@ -86,7 +88,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"); @@ -101,6 +103,8 @@ namespace BellaDonna // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel5, + this.lblGp, this.xrRichText1, this.lblAdresse, this.xrLabel3, @@ -112,11 +116,11 @@ namespace BellaDonna // // 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, 154.1389F); this.xrRichText1.StylePriority.UseFont = false; // // lblAdresse @@ -147,7 +151,7 @@ namespace BellaDonna // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(476.3336F, 239.3611F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(472.8336F, 232.0694F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(169.1664F, 23F); @@ -213,7 +217,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"; @@ -242,7 +247,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, 189.5833F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -254,6 +260,25 @@ 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[] { @@ -265,14 +290,15 @@ 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"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -303,5 +329,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; } } diff --git a/ReportImp/BellaDonna/Rechnung67.cs b/ReportImp/BellaDonna/Rechnung67.cs index 13eb2c6fd..10c623870 100644 --- a/ReportImp/BellaDonna/Rechnung67.cs +++ b/ReportImp/BellaDonna/Rechnung67.cs @@ -55,6 +55,19 @@ 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/Rechnung67.resx b/ReportImp/BellaDonna/Rechnung67.resx index 180fbd97c..fc26f08ec 100644 --- a/ReportImp/BellaDonna/Rechnung67.resx +++ b/ReportImp/BellaDonna/Rechnung67.resx @@ -123,7 +123,4 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAAgAE4AYQByAHIAbwB3ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABzAGwAMgA4ADgAXABzAGwAbQB1AGwAdAAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAAWwBOAG8AIABwAGEAcgBhAGcAcgBhAHAAaAAgAHMAdAB5AGwAZQBdADsAfQB7AFwAKgBcAGMAcwAyAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMwBcAHMAYgBhAHMAZQBkAG8AbgAyAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwA0AFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANgBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADUAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAcwBsADIANgA0AFwAcwBsAG0AdQBsAHQAMQBcAHQAeAAyADgANAB7AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAEQAcgBvAGcAZQBuAGIAZQByAGEAdAB1AG4AZwAgAGYAXAB1ADIANQAyAFwAJwBmAGMAcgAgAE0AXAB1ADIAMgA4AFwAJwBlADQAZABjAGgAZQBuACAAdQBuAGQAIABGAHIAYQB1AGUAbgB9AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAfQB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAxACAAcABvAHMAdABAAGIAZQBsAGwAYQBkAG8AbgBuAGEALQBlAHMAcwBlAG4ALgBkAGUAfQBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAVABlAGwAZQBmAG8AbgAgADAAMgAwADEALQAyADQAMAA4ADgAOAAtADMALwAtADQAfQBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABzAGwAMgA2ADQAXABzAGwAbQB1AGwAdAAxAFwAdAB4ADIAOAA0AHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAEEAbQBiAHUAbABhAG4AdABlACAARgBsAGUAeABpAGIAbABlACAASABpAGwAZgBlAG4AfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAcwBsADIANgA0AFwAcwBsAG0AdQBsAHQAMQBcAHQAeAAyADgANAB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAfQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAHMALgBiAG8AZQBjAGsAZQByAEAAYgBlAGwAbABhAGQAbwBuAG4AYQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAVABlAGwAZQBmAG8AbgAgADAAMQA3ADgALQA5ADMANwAwADQAMwA5AH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAcwBsADIANgA0AFwAcwBsAG0AdQBsAHQAMQBcAHQAeAAyADgANAB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABCAGUAdAByAGUAdQB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAxACAAXAB0AGEAYgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABuAC4AbQBlAGkAZQByAEAAYgBlAGwAbABhAGQAbwBuAG4AYQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgACAAIAAgACAAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABUAGUAbABlAGYAbwBuACAAMAAxADYAMwAtADgAOAAwADQAMwA3ADEAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/BellaDonna/SettlementReport.cs b/ReportImp/BellaDonna/SettlementReport.cs index 8f2f5dc66..3c0c9c034 100644 --- a/ReportImp/BellaDonna/SettlementReport.cs +++ b/ReportImp/BellaDonna/SettlementReport.cs @@ -10,6 +10,7 @@ namespace BellaDonna { public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { + // ab September 2024 nur noch SR2 public Spitzabrechnung() { InitializeComponent(); diff --git a/ReportImp/BellaDonna/SettlementReport2.Designer.cs b/ReportImp/BellaDonna/SettlementReport2.Designer.cs index 7f825309e..6697990ea 100644 --- a/ReportImp/BellaDonna/SettlementReport2.Designer.cs +++ b/ReportImp/BellaDonna/SettlementReport2.Designer.cs @@ -320,7 +320,8 @@ namespace BellaDonna.Neu this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" + + "irthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2