diff --git a/Report/DefaultReports/ServiceInvoiceReport.Designer.cs b/Report/DefaultReports/ServiceInvoiceReport.Designer.cs
index f8394f38a..a38996d66 100644
--- a/Report/DefaultReports/ServiceInvoiceReport.Designer.cs
+++ b/Report/DefaultReports/ServiceInvoiceReport.Designer.cs
@@ -90,6 +90,8 @@ namespace BeWo.Report.DefaultReports
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -106,7 +108,7 @@ namespace BeWo.Report.DefaultReports
//
// 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;
@@ -138,7 +140,7 @@ namespace BeWo.Report.DefaultReports
this.xrLabel8,
this.lblAbrechnungszeitraum,
this.xrTable2});
- this.Page1.Font = new System.Drawing.Font("Verdana", 10F);
+ this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Page1.HeightF = 354.0833F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
@@ -158,7 +160,8 @@ namespace BeWo.Report.DefaultReports
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
- this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel4.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.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
@@ -173,21 +176,24 @@ namespace BeWo.Report.DefaultReports
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
- this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrLabel3.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.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
+ this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName], geb. [Cu" +
+ "stomerBirthdate!dd.MM.yyyy]";
this.xrLabel3.WordWrap = false;
//
// xrLabel2
//
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, 195F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -239,8 +245,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableRow3,
this.xrTableRow1,
this.xrTableRow6,
- this.xrTableRow8});
- this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F);
+ this.xrTableRow8,
+ this.xrTableRow7});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 151F);
//
// xrTableRow2
//
@@ -371,7 +378,7 @@ namespace BeWo.Report.DefaultReports
//
// xrLabel15
//
- this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -381,7 +388,7 @@ namespace BeWo.Report.DefaultReports
//
// 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[] {
@@ -423,7 +430,7 @@ namespace BeWo.Report.DefaultReports
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
- this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
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);
@@ -433,7 +440,7 @@ namespace BeWo.Report.DefaultReports
//
// 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);
@@ -625,7 +632,8 @@ namespace BeWo.Report.DefaultReports
//
// 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[] {
@@ -776,7 +784,7 @@ namespace BeWo.Report.DefaultReports
//
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);
@@ -791,6 +799,25 @@ namespace BeWo.Report.DefaultReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
+ // xrTableRow7
+ //
+ this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3});
+ this.xrTableRow7.Name = "xrTableRow7";
+ this.xrTableRow7.StylePriority.UseTextAlignment = false;
+ this.xrTableRow7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableRow7.Weight = 0.11258278145695365D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
+ this.xrTableCell3.Multiline = true;
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell3.TextFormatString = "GP-Nr.: {0}";
+ this.xrTableCell3.Weight = 1D;
+ //
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -802,14 +829,14 @@ namespace BeWo.Report.DefaultReports
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, 158, 50);
+ this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 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.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
@@ -881,5 +908,7 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
}
}
diff --git a/Report/DefaultReports/ServiceInvoiceReport.resx b/Report/DefaultReports/ServiceInvoiceReport.resx
index 0f60e7858..c7e0d4bdf 100644
--- a/Report/DefaultReports/ServiceInvoiceReport.resx
+++ b/Report/DefaultReports/ServiceInvoiceReport.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
diff --git a/Report/DefaultReports/SettlementReport.Designer.cs b/Report/DefaultReports/SettlementReport.Designer.cs
index b397df482..9f858a74f 100644
--- a/Report/DefaultReports/SettlementReport.Designer.cs
+++ b/Report/DefaultReports/SettlementReport.Designer.cs
@@ -121,6 +121,8 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -160,7 +162,7 @@ namespace BeWo.Report.DefaultReports.Alt
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 146.0833F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 163.7916F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
@@ -171,7 +173,7 @@ namespace BeWo.Report.DefaultReports.Alt
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 352.4166F);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 370.1249F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -302,7 +304,7 @@ namespace BeWo.Report.DefaultReports.Alt
//
// xrLabel6
//
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 277.4166F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 295.1249F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -312,7 +314,7 @@ namespace BeWo.Report.DefaultReports.Alt
//
// xrLabel5
//
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 244.4167F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 262.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);
@@ -324,7 +326,7 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 202.0833F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 219.7916F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -339,7 +341,7 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 186.0833F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 203.7916F);
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);
@@ -354,7 +356,7 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001907349F, 169.0833F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 186.7916F);
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);
@@ -374,8 +376,9 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrTableRow3,
this.xrTableRow1,
this.xrTableRow6,
- this.xrTableRow8});
- this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F);
+ this.xrTableRow8,
+ this.xrTableRow13});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 151F);
//
// xrTableRow2
//
@@ -759,7 +762,7 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.GroupHeader1.HeightF = 420.4166F;
+ this.GroupHeader1.HeightF = 438.1249F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -1052,6 +1055,25 @@ namespace BeWo.Report.DefaultReports.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
+ // xrTableRow13
+ //
+ this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell10});
+ this.xrTableRow13.Name = "xrTableRow13";
+ this.xrTableRow13.Weight = 0.11258278145695365D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
+ this.xrTableCell10.Multiline = true;
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell10.TextFormatString = "GP-Nr.: {0}";
+ this.xrTableCell10.Weight = 1D;
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1175,5 +1197,7 @@ namespace BeWo.Report.DefaultReports.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
}
}
diff --git a/Report/DefaultReports/SettlementReport2.Designer.cs b/Report/DefaultReports/SettlementReport2.Designer.cs
index 54a5b45fe..2b5249c79 100644
--- a/Report/DefaultReports/SettlementReport2.Designer.cs
+++ b/Report/DefaultReports/SettlementReport2.Designer.cs
@@ -122,6 +122,8 @@ namespace BeWo.Report.DefaultReports
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -162,7 +164,7 @@ namespace BeWo.Report.DefaultReports
//
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(366.9999F, 147.125F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 162.75F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
@@ -173,7 +175,7 @@ namespace BeWo.Report.DefaultReports
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 353.4583F);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 369.0833F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.rowErbrachteLeistung});
@@ -210,7 +212,7 @@ namespace BeWo.Report.DefaultReports
// xrLabel6
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 278.4583F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.0833F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -221,7 +223,7 @@ namespace BeWo.Report.DefaultReports
//
// xrLabel5
//
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245.4583F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.0833F);
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);
@@ -233,7 +235,7 @@ namespace BeWo.Report.DefaultReports
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 203.125F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 218.75F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -248,14 +250,14 @@ namespace BeWo.Report.DefaultReports
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187.125F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 202.75F);
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);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" +
- "stName], geb. [CustomerBirthday!dd.MM.yyyy]";
+ this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName], geb. [Cust" +
+ "omerBirthday], geb. [CustomerBirthday!dd.MM.yyyy]";
this.xrLabel3.WordWrap = false;
//
// xrLabel2
@@ -263,10 +265,10 @@ namespace BeWo.Report.DefaultReports
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170.125F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.75F);
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(363.5417F, 17F);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
@@ -283,8 +285,9 @@ namespace BeWo.Report.DefaultReports
this.xrTableRow3,
this.xrTableRow1,
this.xrTableRow6,
- this.xrTableRow8});
- this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 134F);
+ this.xrTableRow8,
+ this.xrTableRow11});
+ this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 151F);
//
// xrTableRow2
//
@@ -668,7 +671,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
- this.GroupHeader1.HeightF = 370.4583F;
+ this.GroupHeader1.HeightF = 386.0833F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -1049,6 +1052,23 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.16397432767427886D;
//
+ // xrTableRow11
+ //
+ this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell12});
+ this.xrTableRow11.Name = "xrTableRow11";
+ this.xrTableRow11.Weight = 0.11258278145695365D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
+ this.xrTableCell12.Multiline = true;
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell12.TextFormatString = "GP-Nr.: {0}";
+ this.xrTableCell12.Weight = 1D;
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1174,5 +1194,7 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
}
}
\ No newline at end of file
diff --git a/Report/ReportObjects/ServiceInvoiceRO.cs b/Report/ReportObjects/ServiceInvoiceRO.cs
index fef7b2e79..7da76b9d0 100644
--- a/Report/ReportObjects/ServiceInvoiceRO.cs
+++ b/Report/ReportObjects/ServiceInvoiceRO.cs
@@ -104,7 +104,9 @@ namespace BeWo.Report.ReportObjects
public string OrganisationCostCenter { get; set; }
- public string ApprovalDate { get; set; }
+ public string BusinessPartnerId { get; set; }
+
+ public string ApprovalDate { get; set; }
public InvoiceBaseDC InvoiceBase { get; set; }
@@ -210,6 +212,7 @@ namespace BeWo.Report.ReportObjects
var org = pDC.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer;
lResult.OrganisationDebitorNumber = org.DebitorNumber;
lResult.OrganisationCostCenter = org.CostCenter;
+ lResult.BusinessPartnerId = org.BusinessPartnerId;
}
else
{
diff --git a/Report/ReportObjects/Settlement2RO.cs b/Report/ReportObjects/Settlement2RO.cs
index 290d314dc..81fd43519 100644
--- a/Report/ReportObjects/Settlement2RO.cs
+++ b/Report/ReportObjects/Settlement2RO.cs
@@ -351,7 +351,7 @@ namespace BeWo.Report.ReportObjects
if (!org.BusinessPartnerId.IsNullOrEmpty())
{
- lResult.BusinessPartnerId = "GP-Nummer: " + org.BusinessPartnerId;
+ lResult.BusinessPartnerId = org.BusinessPartnerId;
}
}
diff --git a/Report/ReportObjects/SettlementRO.cs b/Report/ReportObjects/SettlementRO.cs
index d7d2e99f6..c91a295d9 100644
--- a/Report/ReportObjects/SettlementRO.cs
+++ b/Report/ReportObjects/SettlementRO.cs
@@ -692,7 +692,7 @@ namespace BeWo.Report.ReportObjects
if (!org.BusinessPartnerId.IsNullOrEmpty())
{
- lResult.BusinessPartnerId = "GP-Nummer: " + org.BusinessPartnerId;
+ lResult.BusinessPartnerId = org.BusinessPartnerId;
}
}
diff --git a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
index 086e23ded..444c442c9 100644
--- a/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
+++ b/Service/DCEntityMapper/CompactOrganisationDC_Organisation.cs
@@ -20,7 +20,8 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Name2 = pEntity.Name2;
pDataContract.ActivationType = pEntity.IsActive;
pDataContract.DebitorNumber = pEntity.DebitorNumber;
-
+ pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId;
+
if (pEntity.CostBearer != null)
{
pDataContract.CostBearerID = pEntity.CostBearer.ID;
diff --git a/Shared/DataContracts/Compact/CompactOrganisationDC.cs b/Shared/DataContracts/Compact/CompactOrganisationDC.cs
index 448723eba..efa90a0d6 100644
--- a/Shared/DataContracts/Compact/CompactOrganisationDC.cs
+++ b/Shared/DataContracts/Compact/CompactOrganisationDC.cs
@@ -99,5 +99,8 @@ namespace BS.Shared.DataContracts.Compact
[DataMember]
public string IKDatenannahmestelle { get; set; }
+
+ [DataMember]
+ public string BusinessPartnerId { get; set; }
}
}
\ No newline at end of file