diff --git a/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegASL.cs b/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegASL.cs index fa3acc5e6..5ddbf0edb 100644 --- a/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegASL.cs +++ b/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegASL.cs @@ -31,10 +31,13 @@ namespace BeWo.BetreutesWohnenWoellReports if (s.IsBillable) { ServicesOverviewRO.CreateSignatureString(s); - total += s.Minutes; s.Notice5 = s.CustomerCount.ToString(); if (s.ServiceDescription.StartsWith("Fehlkontakt")) + { s.Notice5 = "FK"; + s.Minutes = Math.Round(0.8 * s.Minutes, 0); + } + total += s.Minutes; servicesBillable.Add(s); } } diff --git a/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegFLS.cs b/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegFLS.cs index e8ccb6b6a..6705f8a4a 100644 --- a/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegFLS.cs +++ b/ReportImp/BetreutesWohnenWoellReports/QuittierungsbelegFLS.cs @@ -31,10 +31,13 @@ namespace BeWo.BetreutesWohnenWoellReports if (s.IsBillable) { ServicesOverviewRO.CreateSignatureString(s); - total += s.Minutes; s.Notice5 = s.CustomerCount.ToString(); if (s.ServiceDescription.StartsWith("Fehlkontakt")) + { s.Notice5 = "FK"; + s.Minutes = Math.Round(0.8 * s.Minutes, 0); + } + total += s.Minutes; servicesBillable.Add(s); } } diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs b/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs index ca8800195..df2141f27 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs @@ -29,7 +29,6 @@ namespace PaSMoenchengladbach.Alt private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -46,8 +45,6 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -70,6 +67,7 @@ namespace PaSMoenchengladbach.Alt this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -97,26 +95,11 @@ namespace PaSMoenchengladbach.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -150,10 +133,10 @@ namespace PaSMoenchengladbach.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, 169F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(356.2502F, 242F); 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); + this.xrLabel8.SizeF = new System.Drawing.SizeF(234.375F, 16.99998F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -161,14 +144,14 @@ namespace PaSMoenchengladbach.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 395.1249F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 287.8333F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, this.xrTableRow10, this.xrTableRow11, this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F); + this.xrTable1.SizeF = new System.Drawing.SizeF(590.6251F, 68F); this.xrTable1.StylePriority.UseBorderColor = false; // // xrTableRow9 @@ -190,7 +173,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseFont = false; this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:"; - this.xrTableCell19.Weight = 0.78314100999098568D; + this.xrTableCell19.Weight = 0.69820509690504817D; // // xrTableCell6 // @@ -206,7 +189,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "[ApprovedFLS]"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell6.Weight = 0.21685899000901443D; + this.xrTableCell6.Weight = 0.21044884314903847D; // // xrTableRow10 // @@ -228,7 +211,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell20.StylePriority.UseBorders = false; this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]:"; - this.xrTableCell20.Weight = 0.78314100999098568D; + this.xrTableCell20.Weight = 0.69820509690504817D; // // ruleRateFactorNull // @@ -250,7 +233,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "[ApprovedFLSWithFactor]"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 0.21685899000901443D; + this.xrTableCell7.Weight = 0.21044884314903847D; // // xrTableRow11 // @@ -268,7 +251,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell21.StylePriority.UseBorderColor = false; this.xrTableCell21.StylePriority.UseBorders = false; - this.xrTableCell21.Weight = 1D; + this.xrTableCell21.Weight = 0.90865394005408651D; // // rowErbrachteLeistung // @@ -288,26 +271,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell22.StylePriority.UseBorders = false; this.xrTableCell22.StylePriority.UseFont = false; this.xrTableCell22.Text = "Erbrachte Leistungen:"; - this.xrTableCell22.Weight = 1D; - // - // xrLabel6 - // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 320.1249F); - this.xrLabel6.Multiline = true; - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); - // - // xrLabel5 - // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 287.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); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; + this.xrTableCell22.Weight = 0.90865394005408651D; // // xrLabel4 // @@ -318,7 +282,7 @@ namespace PaSMoenchengladbach.Alt this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(590.6251F, 17.00002F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; @@ -332,7 +296,7 @@ namespace PaSMoenchengladbach.Alt this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F); 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.SizeF = new System.Drawing.SizeF(590.6251F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; @@ -346,7 +310,7 @@ namespace PaSMoenchengladbach.Alt this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); 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(590.6251F, 17F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; @@ -431,13 +395,13 @@ namespace PaSMoenchengladbach.Alt // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, this.xrTableRow21, this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 42F); + this.xrTable3.SizeF = new System.Drawing.SizeF(590.6252F, 42F); this.xrTable3.StylePriority.UseFont = false; // // xrTableRow20 @@ -522,7 +486,6 @@ namespace PaSMoenchengladbach.Alt // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel7, - this.xrTable2, this.xrLabel1, this.xrLabel_RecipientContactPerson, this.xrLabel_RecipientDivision, @@ -531,15 +494,28 @@ namespace PaSMoenchengladbach.Alt this.xrLabel2, this.xrLabel3, this.xrLabel4, - this.xrLabel5, - this.xrLabel6, this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 463.125F; + this.GroupHeader1.HeightF = 355.8333F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 242F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(356.2501F, 16.99998F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "[AccountingPeriod]"; + this.xrLabel7.WordWrap = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); @@ -569,7 +545,7 @@ namespace PaSMoenchengladbach.Alt this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow15}); - this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrTable5.SizeF = new System.Drawing.SizeF(590.6251F, 17F); this.xrTable5.StylePriority.UseBorderColor = false; // // xrTableRow15 @@ -593,7 +569,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell17.StylePriority.UseBorders = false; this.xrTableCell17.StylePriority.UseFont = false; this.xrTableCell17.StylePriority.UsePadding = false; - this.xrTableCell17.Weight = 0.78314100999098546D; + this.xrTableCell17.Weight = 0.69820500300480759D; // // xrTableCell23 // @@ -612,7 +588,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell23.StylePriority.UseTextAlignment = false; this.xrTableCell23.Text = "xrTableCell23"; this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell23.Weight = 0.21685899000901443D; + this.xrTableCell23.Weight = 0.21044893704927886D; // // GroupFooter1 // @@ -636,7 +612,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableRow34, this.xrTableRow35, this.xrTableRow36}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F); + this.xrTable4.SizeF = new System.Drawing.SizeF(590.6251F, 132F); this.xrTable4.StylePriority.UseBorderColor = false; // // xrTableRow30 @@ -655,7 +631,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell48.StylePriority.UseBorderColor = false; this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.Weight = 1D; + this.xrTableCell48.Weight = 0.90865394005408651D; // // xrTableRow31 // @@ -674,7 +650,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.69820500300480759D; // // xrTableCell50 // @@ -690,7 +666,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "[AmountRecordedFLSString]"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.21044893704927886D; // // xrTableRow32 // @@ -705,7 +681,7 @@ namespace PaSMoenchengladbach.Alt | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell51.Name = "xrTableCell51"; this.xrTableCell51.StylePriority.UseBorders = false; - this.xrTableCell51.Weight = 1D; + this.xrTableCell51.Weight = 0.90865394005408651D; // // xrTableRow33 // @@ -725,7 +701,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.69820509690504817D; // // xrTableCell53 // @@ -740,7 +716,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "[AmountAdvancedPayments]"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; + this.xrTableCell53.Weight = 0.21044884314903847D; // // xrTableRow34 // @@ -758,7 +734,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UsePadding = false; this.xrTableCell54.Text = "abzüglich Eigenanteil:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.69820509690504817D; // // xrTableCell55 // @@ -773,7 +749,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell15"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.21044884314903847D; // // xrTableRow35 // @@ -791,7 +767,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell56.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell56.StylePriority.UseBorderColor = false; this.xrTableCell56.StylePriority.UseBorders = false; - this.xrTableCell56.Weight = 1D; + this.xrTableCell56.Weight = 0.90865394005408651D; // // xrTableRow36 // @@ -811,7 +787,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseFont = false; this.xrTableCell57.Text = "Restforderung:"; - this.xrTableCell57.Weight = 0.78314100999098568D; + this.xrTableCell57.Weight = 0.69820509690504817D; // // xrTableCell58 // @@ -827,143 +803,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell58.StylePriority.UseTextAlignment = false; this.xrTableCell58.Text = "[Claim]"; this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell58.Weight = 0.21685899000901443D; - // - // xrTable2 - // - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 0F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow5, - this.xrTableRow4, - this.xrTableRow3, - this.xrTableRow1, - this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 114F); - // - // xrTableRow5 - // - this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell13}); - this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.13245033112582783D; - // - // xrTableCell13 - // - this.xrTableCell13.CanShrink = true; - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell13.StylePriority.UseFont = false; - this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.Text = "[SenderContactPerson]"; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell13.Weight = 1D; - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell11}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.13245033112582783D; - // - // xrTableCell11 - // - this.xrTableCell11.CanShrink = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "[SenderContactPersonDivision]"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell11.Weight = 1D; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.13245033112582783D; - // - // xrTableCell8 - // - this.xrTableCell8.CanShrink = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "[SenderContactPersonMail]"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell8.Weight = 1D; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13245033112582783D; - // - // xrTableCell1 - // - this.xrTableCell1.CanShrink = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "[SenderContactPersonPhone]"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell1.Weight = 1D; - // - // xrTableRow6 - // - this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2}); - this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.11258278145695365D; - // - // xrTableCell2 - // - this.xrTableCell2.CanShrink = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "[SenderContactPersonFax]"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell2.Weight = 1D; - // - // xrTableRow8 - // - this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5}); - this.xrTableRow8.Name = "xrTableRow8"; - this.xrTableRow8.Weight = 0.11258278145695365D; - // - // xrTableCell5 - // - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.Weight = 1D; - // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 242F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[AccountingPeriod]"; - this.xrLabel7.WordWrap = false; + this.xrTableCell58.Weight = 0.21044884314903847D; // // Spitzabrechnung // @@ -990,7 +830,6 @@ namespace PaSMoenchengladbach.Alt ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1000,8 +839,6 @@ namespace PaSMoenchengladbach.Alt private DevExpress.XtraReports.UI.DetailBand Detail; private System.Windows.Forms.BindingSource bindingSource1; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; @@ -1064,19 +901,6 @@ namespace PaSMoenchengladbach.Alt private DevExpress.XtraReports.UI.XRTableRow xrTableRow36; private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; - private DevExpress.XtraReports.UI.XRTable xrTable2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport.resx b/ReportImp/PaSMoenchengladbach/SettlementReport.resx index 3b9821114..76cdda25e 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport.resx +++ b/ReportImp/PaSMoenchengladbach/SettlementReport.resx @@ -117,10 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: - - 17, 17 diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs b/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs index 8f9a419e4..0dfeead88 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs @@ -30,7 +30,6 @@ namespace PaSMoenchengladbach private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -39,32 +38,20 @@ namespace PaSMoenchengladbach this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -73,6 +60,7 @@ namespace PaSMoenchengladbach this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -101,12 +89,7 @@ namespace PaSMoenchengladbach this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -144,10 +127,10 @@ namespace PaSMoenchengladbach // 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(367.0001F, 169F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(436.7917F, 242F); 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); + this.xrLabel8.SizeF = new System.Drawing.SizeF(152.7916F, 16.99998F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -155,11 +138,11 @@ namespace PaSMoenchengladbach // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 391.9999F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0001589457F, 305.5416F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrTable1.SizeF = new System.Drawing.SizeF(589.5831F, 16.99997F); this.xrTable1.StylePriority.UseBorderColor = false; // // rowErbrachteLeistung @@ -189,27 +172,6 @@ namespace PaSMoenchengladbach this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.ruleRateFactorNull.Name = "ruleRateFactorNull"; // - // xrLabel6 - // - this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 316.9999F); - this.xrLabel6.Multiline = true; - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); - this.xrLabel6.StylePriority.UseBackColor = false; - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); - // - // xrLabel5 - // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 284F); - 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); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; - // // xrLabel4 // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; @@ -219,7 +181,7 @@ namespace PaSMoenchengladbach this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(589.5834F, 17.00002F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; @@ -233,7 +195,7 @@ namespace PaSMoenchengladbach this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F); 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.SizeF = new System.Drawing.SizeF(589.5833F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" + @@ -248,133 +210,12 @@ namespace PaSMoenchengladbach this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); 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(589.5833F, 17F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; this.xrLabel2.WordWrap = false; // - // xrTable2 - // - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(367.0001F, 0F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow5, - this.xrTableRow4, - this.xrTableRow3, - this.xrTableRow1, - this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 114F); - // - // xrTableRow5 - // - this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell13}); - this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.13245033112582783D; - // - // xrTableCell13 - // - this.xrTableCell13.CanShrink = true; - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell13.StylePriority.UseFont = false; - this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.Text = "[SenderContactPerson]"; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell13.Weight = 1D; - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell11}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.13245033112582783D; - // - // xrTableCell11 - // - this.xrTableCell11.CanShrink = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "[SenderContactPersonDivision]"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell11.Weight = 1D; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.13245033112582783D; - // - // xrTableCell8 - // - this.xrTableCell8.CanShrink = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "[SenderContactPersonMail]"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell8.Weight = 1D; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13245033112582783D; - // - // xrTableCell1 - // - this.xrTableCell1.CanShrink = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "[SenderContactPersonPhone]"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell1.Weight = 1D; - // - // xrTableRow6 - // - this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2}); - this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.11258278145695365D; - // - // xrTableCell2 - // - this.xrTableCell2.CanShrink = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "[SenderContactPersonFax]"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell2.Weight = 1D; - // - // xrTableRow8 - // - this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5}); - this.xrTableRow8.Name = "xrTableRow8"; - this.xrTableRow8.Weight = 0.11258278145695365D; - // - // xrTableCell5 - // - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.Weight = 1D; - // // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; @@ -443,6 +284,15 @@ namespace PaSMoenchengladbach this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel13 + // + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.0001589457F, 170.1251F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(225F, 17F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Ralf Lexen"; + // // xrLabel10 // this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 95.12501F); @@ -454,15 +304,32 @@ namespace PaSMoenchengladbach // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, this.xrTableRow21, this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 42F); + this.xrTable3.SizeF = new System.Drawing.SizeF(589.5834F, 42F); this.xrTable3.StylePriority.UseFont = false; // + // xrTableRow20 + // + this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell16}); + this.xrTableRow20.Name = "xrTableRow20"; + this.xrTableRow20.Weight = 0.38095238095238093D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.Text = "xrTableCell1"; + this.xrTableCell16.Weight = 3D; + // // xrTableRow21 // this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -522,19 +389,31 @@ namespace PaSMoenchengladbach this.xrLabel_RecipientDivision, this.xrLabel_RecipientStreet, this.RecipientPostCodeAndTown, - this.xrTable2, this.xrLabel2, this.xrLabel3, this.xrLabel4, - this.xrLabel5, - this.xrLabel6, this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 408.9999F; + this.GroupHeader1.HeightF = 322.5416F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0001589457F, 242F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(436.7916F, 16.99998F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "[AccountingPeriod]"; + this.xrLabel7.WordWrap = false; + // // fieldApprovedFLSWithFactor // this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]"; @@ -562,11 +441,11 @@ namespace PaSMoenchengladbach // xrTable4 // this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001589457F, 0F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow33}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrTable4.SizeF = new System.Drawing.SizeF(589.5833F, 17F); this.xrTable4.StylePriority.UseBorderColor = false; // // xrTableRow33 @@ -589,7 +468,7 @@ namespace PaSMoenchengladbach this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.67198706993689916D; // // xrTableCell53 // @@ -606,7 +485,7 @@ namespace PaSMoenchengladbach this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "xrTableCell10"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; + this.xrTableCell53.Weight = 0.23506403996394229D; // // bindingSource1 // @@ -634,7 +513,7 @@ namespace PaSMoenchengladbach this.xrTableRow35, this.xrTableRow36, this.xrTableRow37}); - this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 132F); + this.xrTable5.SizeF = new System.Drawing.SizeF(589.5833F, 132F); this.xrTable5.StylePriority.UseBorderColor = false; // // xrTableRow30 @@ -672,7 +551,7 @@ namespace PaSMoenchengladbach this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.74084831522600725D; // // xrTableCell50 // @@ -688,7 +567,7 @@ namespace PaSMoenchengladbach this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "xrTableCell9"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.25915168477399264D; // // xrTableRow32 // @@ -723,7 +602,7 @@ namespace PaSMoenchengladbach this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.74084821170346671D; // // xrTableCell55 // @@ -740,7 +619,7 @@ namespace PaSMoenchengladbach this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell10"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.25915178829653346D; // // xrTableRow35 // @@ -758,7 +637,7 @@ namespace PaSMoenchengladbach this.xrTableCell56.StylePriority.UseBorders = false; this.xrTableCell56.StylePriority.UsePadding = false; this.xrTableCell56.Text = "abzüglich Eigenanteil:"; - this.xrTableCell56.Weight = 0.78314100999098568D; + this.xrTableCell56.Weight = 0.74084821170346671D; // // xrTableCell57 // @@ -773,7 +652,7 @@ namespace PaSMoenchengladbach this.xrTableCell57.StylePriority.UseTextAlignment = false; this.xrTableCell57.Text = "xrTableCell15"; this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell57.Weight = 0.21685899000901443D; + this.xrTableCell57.Weight = 0.25915178829653346D; // // xrTableRow36 // @@ -811,7 +690,7 @@ namespace PaSMoenchengladbach this.xrTableCell59.StylePriority.UseBorders = false; this.xrTableCell59.StylePriority.UseFont = false; this.xrTableCell59.Text = "Restforderung:"; - this.xrTableCell59.Weight = 0.78314100999098568D; + this.xrTableCell59.Weight = 0.74084821170346671D; // // xrTableCell60 // @@ -828,48 +707,7 @@ namespace PaSMoenchengladbach this.xrTableCell60.StylePriority.UseTextAlignment = false; this.xrTableCell60.Text = "xrTableCell17"; this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell60.Weight = 0.21685899000901443D; - // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0001589457F, 242F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[AccountingPeriod]"; - this.xrLabel7.WordWrap = false; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.Weight = 3D; - // - // xrTableRow20 - // - this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell16}); - this.xrTableRow20.Name = "xrTableRow20"; - this.xrTableRow20.Weight = 0.38095238095238093D; - // - // xrLabel13 - // - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.0001589457F, 170.1251F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "Ralf Lexen"; + this.xrTableCell60.Weight = 0.25915178829653346D; // // Spitzabrechnung // @@ -894,7 +732,6 @@ namespace PaSMoenchengladbach this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -908,24 +745,9 @@ namespace PaSMoenchengladbach private DevExpress.XtraReports.UI.DetailBand Detail; private System.Windows.Forms.BindingSource bindingSource1; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRTable xrTable2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet; private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision; diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport2.resx b/ReportImp/PaSMoenchengladbach/SettlementReport2.resx index dac8c7ff8..d25f3eba2 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport2.resx +++ b/ReportImp/PaSMoenchengladbach/SettlementReport2.resx @@ -117,10 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 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 diff --git a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoBerechnung.cs b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoBerechnung.cs index f422cdd84..98045e9ed 100644 --- a/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/SozialeDiensteNiederrhein/MitarbeiterstundenkontoBerechnung.cs @@ -65,7 +65,7 @@ namespace BeWo.SozialeDiensteNiederrhein if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) { - if (item.ServiceDescription.ServiceCategory.Name == "FLS") + if (item.ServiceDescription.ServiceCategory.Name == "FLS" || item.ServiceDescription.ServiceCategory.Name == "Fehlkontakt") { flsGesamt += duration; }