diff --git a/ReportImp/LebensWert/LebensWert.csproj b/ReportImp/LebensWert/LebensWert.csproj
index 9d560d268..6e937aa2c 100644
--- a/ReportImp/LebensWert/LebensWert.csproj
+++ b/ReportImp/LebensWert/LebensWert.csproj
@@ -76,6 +76,18 @@
RechnungNI.cs
+
+ Component
+
+
+ SettlementReport.cs
+
+
+ Component
+
+
+ SettlementReport2.cs
+
@@ -113,6 +125,14 @@
RechnungNI.cs
Designer
+
+ SettlementReport.cs
+ Designer
+
+
+ SettlementReport2.cs
+ Designer
+
\ No newline at end of file
diff --git a/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs b/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs
index 47aceec5c..64b55ff00 100644
--- a/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs
+++ b/ReportImp/PerspektivenEV/CollectiveBillingReport.Designer.cs
@@ -40,7 +40,6 @@ namespace PerspektivenEV
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -162,32 +161,15 @@ namespace PerspektivenEV
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel4,
this.xrLabel6,
this.lblAdresse,
this.xrLabel3,
this.xrLabel2,
this.xrLabel8});
- this.Page1.HeightF = 318.9583F;
+ this.Page1.HeightF = 273.125F;
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
- // xrLabel4
- //
- this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel4.BorderWidth = 2F;
- this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 278.6458F);
- this.xrLabel4.Name = "xrLabel4";
- this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(631F, 20F);
- this.xrLabel4.StylePriority.UseBackColor = false;
- this.xrLabel4.StylePriority.UseBorders = false;
- this.xrLabel4.StylePriority.UseBorderWidth = false;
- this.xrLabel4.StylePriority.UseFont = false;
- this.xrLabel4.WordWrap = false;
- //
// xrLabel6
//
this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
@@ -251,12 +233,12 @@ namespace PerspektivenEV
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", " {0:dd.MM.yyyy}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceBase.InvoiceDate", "{0:dd.MM.yyyy}")});
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 11F);
- this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(463.0555F, 172.5F);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(501.5972F, 172.5F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel8.SizeF = new System.Drawing.SizeF(167.9445F, 20.00002F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(129.4028F, 20.00002F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -407,7 +389,7 @@ namespace PerspektivenEV
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
- this.xrTableCell1.Text = "Angefall. Stunden";
+ this.xrTableCell1.Text = "Stunden";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.5735623787337335D;
//
@@ -441,8 +423,8 @@ namespace PerspektivenEV
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
- this.xrTableCell7.Text = "Abrechnungs-";
- this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell7.Text = "FLS-Satz";
+ this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell7.Weight = 0.48943419922473608D;
//
// xrTableCell36
@@ -458,7 +440,7 @@ namespace PerspektivenEV
this.xrTableCell36.StylePriority.UseFont = false;
this.xrTableCell36.StylePriority.UsePadding = false;
this.xrTableCell36.StylePriority.UseTextAlignment = false;
- this.xrTableCell36.Text = "POSITION GESAMT";
+ this.xrTableCell36.Text = "SUMME";
this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell36.Weight = 0.7165071187182579D;
//
@@ -512,7 +494,6 @@ namespace PerspektivenEV
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
- this.xrTableCell6.Text = "betrag";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.48943361515627437D;
//
@@ -605,7 +586,7 @@ namespace PerspektivenEV
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
- this.xrTableCell9.Text = "EUR GESAMT";
+ this.xrTableCell9.Text = "GESAMT";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.48943420169246943D;
//
@@ -695,7 +676,6 @@ namespace PerspektivenEV
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
- private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
diff --git a/ReportImp/PerspektivenEV/CollectiveBillingReport.cs b/ReportImp/PerspektivenEV/CollectiveBillingReport.cs
index 12e235d90..8e25c2cbd 100644
--- a/ReportImp/PerspektivenEV/CollectiveBillingReport.cs
+++ b/ReportImp/PerspektivenEV/CollectiveBillingReport.cs
@@ -37,8 +37,12 @@ namespace PerspektivenEV
{
sb.AppendLine(pRO.RecipientContactPerson);
}
+ if (!String.IsNullOrEmpty(pRO.RecipientPoBox))
+ {
+ sb.AppendLine(pRO.RecipientPoBox);
+ }
- if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+ if (!String.IsNullOrEmpty(pRO.RecipientStreet) && String.IsNullOrEmpty(pRO.RecipientPoBox))
{
sb.AppendLine(pRO.RecipientStreet);
}