diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/BetreuungsbueroFrankRoehrig.csproj b/ReportImp/BetreuungsbueroFrankRoehrig/BetreuungsbueroFrankRoehrig.csproj index 3a9a3c2a3..d6c185306 100644 --- a/ReportImp/BetreuungsbueroFrankRoehrig/BetreuungsbueroFrankRoehrig.csproj +++ b/ReportImp/BetreuungsbueroFrankRoehrig/BetreuungsbueroFrankRoehrig.csproj @@ -55,6 +55,7 @@ + Component diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/BetreuungsbueroFrankRoehrig/Invoicing/SettlementInvoiceCreation.cs new file mode 100644 index 000000000..3a64b0684 --- /dev/null +++ b/ReportImp/BetreuungsbueroFrankRoehrig/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 BetreuungsbueroFrankRoehrig +{ + public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation + { + public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) + { + return false; + } + } +} diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/Properties/licenses.licx b/ReportImp/BetreuungsbueroFrankRoehrig/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/BetreuungsbueroFrankRoehrig/Properties/licenses.licx +++ b/ReportImp/BetreuungsbueroFrankRoehrig/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.Designer.cs b/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.Designer.cs index 1d75d1a26..332633dcf 100644 --- a/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.Designer.cs @@ -78,6 +78,7 @@ namespace BetreuungsbueroFrankRoehrig this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -115,7 +116,7 @@ namespace BetreuungsbueroFrankRoehrig // xrRichText2 // this.xrRichText2.BorderColor = System.Drawing.Color.Black; - this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F); + this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 9F); this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.9167F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); @@ -126,7 +127,7 @@ namespace BetreuungsbueroFrankRoehrig // xrRichText1 // this.xrRichText1.BorderColor = System.Drawing.Color.Black; - this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(481.9163F, 0F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); @@ -153,6 +154,7 @@ namespace BetreuungsbueroFrankRoehrig // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, this.xrLabel4, this.xrLabel3, this.xrLabel2, @@ -167,7 +169,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(2.119276E-05F, 96.80557F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -182,7 +185,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(2.119276E-05F, 76.80554F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -196,7 +200,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Times New Roman", 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(2.119276E-05F, 56.80555F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -288,7 +293,8 @@ namespace BetreuungsbueroFrankRoehrig // // xrLabel9 // - this.xrLabel9.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F, DevExpress.Drawing.DXFontStyle.Italic, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); 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); @@ -480,7 +486,8 @@ namespace BetreuungsbueroFrankRoehrig // // xrTable6 // - this.xrTable6.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable6.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, 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[] { @@ -629,7 +636,8 @@ namespace BetreuungsbueroFrankRoehrig // // xrLabel6 // - this.xrLabel6.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Tahoma", 8F, 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(0F, 217.0833F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -641,7 +649,8 @@ namespace BetreuungsbueroFrankRoehrig // 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("Times New Roman", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); 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); @@ -656,6 +665,20 @@ namespace BetreuungsbueroFrankRoehrig // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.CanShrink = true; + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("times New Roman", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.80554F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "GP Nr. [BusinessPartnerId]"; + this.xrLabel17.WordWrap = false; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -667,14 +690,15 @@ namespace BetreuungsbueroFrankRoehrig this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 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, 50, 50, 50); + this.Margins = new DevExpress.Drawing.DXMargins(80F, 50F, 50F, 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.xrTable4)).EndInit(); @@ -734,5 +758,6 @@ namespace BetreuungsbueroFrankRoehrig private DevExpress.XtraReports.UI.XRRichText xrRichText1; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.resx b/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.resx index 0266fecd1..c2b97f534 100644 --- a/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.resx +++ b/ReportImp/BetreuungsbueroFrankRoehrig/ServiceInvoiceReport.resx @@ -123,7 +123,4 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFQAYQBoAG8AbQBhADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAKgBcAGIAawBtAGsAcwB0AGEAcgB0ACAAXwBkAHgAXwBmAHIAYQBnAF8AUwB0AGEAcgB0AEYAcgBhAGcAbQBlAG4AdAB9AHsAXAAqAFwAYgBrAG0AawBlAG4AZAAgAF8AZAB4AF8AZgByAGEAZwBfAFMAdABhAHIAdABGAHIAYQBnAG0AZQBuAHQAfQB7AFwAZgAyAFwAZgBzADIAOABcAGMAZgAwACAAQgBlAHQAcgBlAHUAdQBuAGcAcwBiAFwAdQAyADUAMgBcACcAZgBjAHIAbwB9AFwAZgAyAFwAZgBzADIAOABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIAOABcAGMAZgAwACAARgByAGEAbgBrACAAUgBcAHUAMgA0ADYAXAAnAGYANgBoAHIAaQBnAH0AXABmADIAXABmAHMAMgA4AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADEAOABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAwACAAQgBlAHQAcgBlAHUAdQBuAGcAIABuAGEAYwBoACAAQgBlAHQAcgBlAHUAdQBuAGcAcwByAGUAYwBoAHQAfQBcAGYAMgBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADgAXABjAGYAMAAgAEEAbQBiAHUAbABhAG4AdAAgAEIAZQB0AHIAZQB1AHQAZQBzACAAVwBvAGgAbgBlAG4AfQBcAGYAMgBcAGYAcwAxADgAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADIAXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgAwAFwAYwBmADAAIABIAGUAaQBuAHoALQBLAFwAdQAyADUAMgBcACcAZgBjAGgAbgAtAFMAdAByAC4AIAA0ADEAfQBcAGYAMgBcAGYAcwAyADAAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMAAgADUAMQAwADYANwAgAEsAXAB1ADIANAA2AFwAJwBmADYAbABuAH0AXABmADIAXABmAHMAMgAwAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADIAMABcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAEYAcgBhAG4AawAgAFIAXAB1ADIANAA2AFwAJwBmADYAaAByAGkAZwAsACAARABpAHAAbAAuACAAUwBvAHoAaQBhAGwAcABcAHUAMgAyADgAXAAnAGUANABkAGEAZwBvAGcAZQB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA1ADUAMAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAAVABlAGwALgA6AFwAdABhAGIAIAAwADIAIAAyADEAIABcAHUAOAAyADEAMQBcACcAOQA2ACAAOQAgADkANQAgADIAOAAgADkAMwB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA1ADUAMAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAARgBhAHgAOgBcAHQAYQBiACAAMAAyACAAMgAxACAAXAB1ADgAMgAxADEAXAAnADkANgAgADEANgAgADgANQAgADIAOAAgADgAMgB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAwACAARQAtAE0AYQBpAGwAOgAgAGYALgByAG8AZQBoAHIAaQBnAEAAcABlAHIALQBzAHAAZQBrAHQAaQB2AGUAbgAuAGQAZQB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAFYAbwByAHMAdABhAG4AZABzAG0AaQB0AGcAbABpAGUAZAAgAFYASwBCACYAQgAgACgAVgBlAHIAZQBpAG4AIABLAFwAdQAyADQANgBcACcAZgA2AGwAbgBlAHIAIABCAGUAcgB1AGYAcwBiAGUAdAByAGUAdQBlAHIAaQBuAG4AZQBuACAAdQBuAGQAIABCAGUAcgB1AGYAcwBiAGUAdAByAGUAdQBlAHIAKQAgAH0AXABmADIAXABmAHMAMQA2AFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAxADYAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAxADYAXABjAGYAMAAgAHcAdwB3AC4AcABlAHIALQBzAHAAZQBrAHQAaQB2AGUAbgAuAGQAZQB9AFwAZgAyAFwAZgBzADEANgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGwAYQBuAGcANwBcAGwAYQBuAGcAZgBlADcAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA== - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.Designer.cs b/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.Designer.cs index f7bca8210..eb9aba6bd 100644 --- a/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.Designer.cs +++ b/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.Designer.cs @@ -32,6 +32,7 @@ namespace BetreuungsbueroFrankRoehrig 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.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); @@ -90,7 +91,6 @@ namespace BetreuungsbueroFrankRoehrig this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -109,14 +109,17 @@ namespace BetreuungsbueroFrankRoehrig this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -137,7 +140,7 @@ namespace BetreuungsbueroFrankRoehrig this.xrLabel15, this.xrLabel16, this.xrLabel9}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 291.875F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -145,7 +148,7 @@ namespace BetreuungsbueroFrankRoehrig // xrRichText1 // this.xrRichText1.BorderColor = System.Drawing.Color.Black; - this.xrRichText1.Font = new System.Drawing.Font("Verdana", 9F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(445.083F, 0F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); @@ -156,7 +159,7 @@ namespace BetreuungsbueroFrankRoehrig // xrRichText2 // this.xrRichText2.BorderColor = System.Drawing.Color.Black; - this.xrRichText2.Font = new System.Drawing.Font("Verdana", 9F); + this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Verdana", 9F); this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 143.75F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); @@ -245,7 +248,7 @@ namespace BetreuungsbueroFrankRoehrig // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 206.3333F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.125F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -282,7 +285,7 @@ namespace BetreuungsbueroFrankRoehrig // xrLabel6 // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 131.3333F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 176.125F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -293,7 +296,7 @@ namespace BetreuungsbueroFrankRoehrig // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.3333F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 143.125F); 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); @@ -304,8 +307,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 56.00001F); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.7917F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -319,8 +322,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00003F); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 84.79169F); 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); @@ -334,8 +337,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.00002F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 39.99999F); 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); @@ -352,7 +355,7 @@ namespace BetreuungsbueroFrankRoehrig this.xrLabel12, this.xrLabel11, this.lblNotice}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 209F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -510,7 +513,7 @@ namespace BetreuungsbueroFrankRoehrig // lblNotice // this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -520,7 +523,6 @@ namespace BetreuungsbueroFrankRoehrig // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -531,6 +533,8 @@ namespace BetreuungsbueroFrankRoehrig // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, + this.xrLabel1, this.xrLabel2, this.xrLabel3, this.xrLabel4, @@ -538,8 +542,8 @@ namespace BetreuungsbueroFrankRoehrig this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 223.3333F; + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.GroupHeader1.HeightF = 268.1249F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -564,7 +568,8 @@ namespace BetreuungsbueroFrankRoehrig // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -657,7 +662,8 @@ namespace BetreuungsbueroFrankRoehrig // this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell9.StylePriority.UseBorderColor = false; @@ -674,7 +680,8 @@ namespace BetreuungsbueroFrankRoehrig | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); - this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell10.StylePriority.UseBorderColor = false; @@ -700,7 +707,8 @@ namespace BetreuungsbueroFrankRoehrig this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell7.StylePriority.UseBorderColor = false; @@ -709,15 +717,12 @@ namespace BetreuungsbueroFrankRoehrig this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.GroupFooter1.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -901,7 +906,7 @@ namespace BetreuungsbueroFrankRoehrig | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrTableCell60.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell60.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell60.Name = "xrTableCell60"; this.xrTableCell60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell60.StylePriority.UseBorderColor = false; @@ -912,6 +917,38 @@ namespace BetreuungsbueroFrankRoehrig this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // + // xrLabel1 + // + this.xrLabel1.BackColor = System.Drawing.Color.Transparent; + this.xrLabel1.CanShrink = true; + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 57F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 16F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Debitoren Nr. [DebitorNumber]"; + this.xrLabel1.WordWrap = false; + // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.CanShrink = true; + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99999F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "GP Nr. [BusinessPartnerId]"; + this.xrLabel17.WordWrap = false; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -929,19 +966,21 @@ namespace BetreuungsbueroFrankRoehrig this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 43); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 43F); 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.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1025,5 +1064,7 @@ namespace BetreuungsbueroFrankRoehrig private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; } } diff --git a/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.resx b/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.resx index 3b67cd75b..f019557a5 100644 --- a/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.resx +++ b/ReportImp/BetreuungsbueroFrankRoehrig/SettlementReport2.resx @@ -127,7 +127,4 @@ anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: - - 17, 17 - \ No newline at end of file