PerspektiveSelbstständigesLeben/SettlementReport2 - Nacharbeiten

ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.cs

@@ -87,7 +87,7 @@ namespace PerspektiveSL
 			}
 
 			if (!HatGruppen(pRO))
-				lblGruppe.Text = String.Format("{0} {1} hat nicht an Gruppenangeboten teilgenommen.", pRO.Salutation2, pRO.CustomerLastName);
+				lblGruppe.Text = String.Format("{0} {1} hat nicht an Gruppenangeboten teilgenommen.", pRO.Salutation1, pRO.CustomerLastName);
 
 			if (pRO.FehlkontakteString != null && pRO.FehlkontakteString.Length > 0)
 				pRO.FehlkontakteString += " - Fehlkontakte werden von uns mit 80% des Stundensatzes abgerechnet.";

ReportImp/PerspektiveSelbstständigesLeben/SettlementReport2.designer.cs

@@ -91,6 +91,7 @@ namespace PerspektiveSL
             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.fieldApprovedWithFactor = new DevExpress.XtraReports.UI.CalculatedField();
             this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
@@ -112,15 +113,15 @@ namespace PerspektiveSL
             this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -156,7 +157,7 @@ namespace PerspektiveSL
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel9.SizeF = new System.Drawing.SizeF(387.5F, 23.95833F);
             this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.Text = "perspektive Selständiges Leben · \r\nVenloer Straße 341   /   50823 Köln";
+            this.xrLabel9.Text = "perspektive - Selbständiges Leben - GmbH · \r\nVenloer Straße 341   /   50823 Köln";
             // 
             // xrLabel8
             // 
@@ -175,7 +176,7 @@ namespace PerspektiveSL
             // xrTable1
             // 
             this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 391.2498F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 404.7914F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.rowErbrachteLeistung});
@@ -213,7 +214,7 @@ namespace PerspektiveSL
             // xrLabel6
             // 
             this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.6665F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 324.2081F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -224,7 +225,7 @@ namespace PerspektiveSL
             // lblAnrede
             // 
             this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.6666F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 291.2083F);
             this.lblAnrede.Name = "lblAnrede";
             this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -236,7 +237,7 @@ namespace PerspektiveSL
             this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel4.CanShrink = true;
             this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.3333F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 248.875F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -251,7 +252,7 @@ namespace PerspektiveSL
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
             this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.3332F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 232.8749F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(617F, 16F);
@@ -266,7 +267,7 @@ namespace PerspektiveSL
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
             this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 202.3332F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215.8749F);
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel2.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
@@ -370,7 +371,7 @@ namespace PerspektiveSL
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(291.9999F, 17F);
             this.xrLabel5.StylePriority.UseFont = false;
-            this.xrLabel5.Text = "Im Voraus vielen Dank für Ihre Bemühungen";
+            this.xrLabel5.Text = "Im Voraus vielen Dank für Ihre Bemühungen.";
             // 
             // lblGruppe
             // 
@@ -520,7 +521,7 @@ namespace PerspektiveSL
             // xrLabel11
             // 
             this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 8.5F);
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 284.6666F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -531,7 +532,7 @@ namespace PerspektiveSL
             // 
             // xrLabel14
             // 
-            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 8.5F);
             this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.6666F);
             this.xrLabel14.Name = "xrLabel14";
             this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -572,6 +573,7 @@ namespace PerspektiveSL
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel13,
             this.xrRichText3,
             this.xrLabel1,
             this.xrLabel_RecipientContactPerson,
@@ -587,7 +589,7 @@ namespace PerspektiveSL
             this.xrLabel8,
             this.xrLabel9});
             this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.GroupHeader1.HeightF = 408.2498F;
+            this.GroupHeader1.HeightF = 421.7914F;
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
             // 
@@ -616,6 +618,8 @@ namespace PerspektiveSL
             this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
             this.Detail1.HeightF = 17F;
             this.Detail1.Name = "Detail1";
+            this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
             this.Detail1.StylePriority.UseFont = false;
             // 
             // xrTable2
@@ -762,6 +766,10 @@ namespace PerspektiveSL
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.Weight = 3D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
             // fieldApprovedWithFactor
             // 
             this.fieldApprovedWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]";
@@ -991,9 +999,19 @@ namespace PerspektiveSL
             this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell21.Weight = 0.21685899000901443D;
             // 
-            // bindingSource1
+            // xrLabel13
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            this.xrLabel13.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel13.CanShrink = true;
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.8749F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(403.4583F, 17F);
+            this.xrLabel13.StylePriority.UseBackColor = false;
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.Text = "Fachdienst-Nr. 2000159950";
+            this.xrLabel13.WordWrap = false;
             // 
             // Spitzabrechnung
             // 
@@ -1023,9 +1041,9 @@ namespace PerspektiveSL
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1114,5 +1132,6 @@ namespace PerspektiveSL
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
     }
 }