From cde3f2bc8de5b8431ccd08775d5bd898df8d800e Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 29 Jan 2024 15:59:28 +0100 Subject: [PATCH] MH: BAW Aachen Differenzrechnung --- ...etreuungsserviceFuerAlltagUndWohnen.csproj | 1 + .../ServiceInvoiceReport.Designer.cs | 42 ++-- .../ServiceInvoiceReport.cs | 4 + .../SettlementReport.Designer.cs | 193 +++++++++++------- .../SettlementReport.cs | 15 +- .../SettlementReport2.Designer.cs | 193 +++++++++++------- .../SettlementReport2.cs | 11 + 7 files changed, 295 insertions(+), 164 deletions(-) diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/BetreuungsserviceFuerAlltagUndWohnen.csproj b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/BetreuungsserviceFuerAlltagUndWohnen.csproj index 2d12db234..b6137f838 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/BetreuungsserviceFuerAlltagUndWohnen.csproj +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/BetreuungsserviceFuerAlltagUndWohnen.csproj @@ -90,6 +90,7 @@ ServiceInvoiceReport.cs + Component diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs index c8f077bfa..dafd29d06 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.Designer.cs @@ -34,6 +34,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -51,7 +52,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); @@ -68,7 +69,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -99,6 +99,16 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.topMarginBand1.HeightF = 158F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrLabel14 + // + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.7083F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(317F, 55.29167F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "BAW Aachen GmbH\r\nWilhelmstraße 50/52\r\n52070 Aachen"; + // // bottomMarginBand1 // this.bottomMarginBand1.HeightF = 153.1667F; @@ -122,7 +132,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrLabel20, this.xrLabel19, this.xrLabel17, - this.xrLabel18, + this.lblAktenzeichen, this.xrLabel13, this.xrLabel16, this.xrLabel12, @@ -316,14 +326,14 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrLabel17.StylePriority.UseBorderWidth = false; this.xrLabel17.StylePriority.UseFont = false; // - // xrLabel18 + // lblAktenzeichen // - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(77.79163F, 286.375F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(387.8334F, 17.00003F); - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.Text = "Aktenzeichen des Landschaftsverbandes Rheinland"; + this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(77.79163F, 286.375F); + this.lblAktenzeichen.Name = "lblAktenzeichen"; + this.lblAktenzeichen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(387.8334F, 17.00003F); + this.lblAktenzeichen.StylePriority.UseFont = false; + this.lblAktenzeichen.Text = "Aktenzeichen des Landschaftsverbandes Rheinland"; // // xrLabel13 // @@ -485,16 +495,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrLabel14 - // - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.7083F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(317F, 55.29167F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "BAW Aachen GmbH\r\nWilhelmstraße 50/52\r\n52070 Aachen"; - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -541,7 +541,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel xrLabel17; - private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRLabel lblAktenzeichen; private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.XRLabel xrLabel21; private DevExpress.XtraReports.UI.XRLabel xrLabel20; diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.cs index 1580a7d29..e7676e1a3 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/ServiceInvoiceReport.cs @@ -15,6 +15,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen public void SetReportDataSource(ServiceInvoiceRO pRO) { + if (pRO.RecipientOrganisation.ToLower().Contains("würselen")) + lblAktenzeichen.Text = "Aktenzeichen des Sozialamts Würselen"; + + var flsGesamt = 0.0m; var hourlyRate = 0.0m; foreach (var period in pRO.ServiceInvoicePeriods) diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs index 5587e137c..b5350229d 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs @@ -62,7 +62,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblSpitzabrechnung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); @@ -89,9 +89,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); 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.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -99,12 +96,22 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.summeUnitCount = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.lblAbschlagszahlungenText = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblAbschlagszahlungen = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.lblDifferenzrechnungText = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblDifferenzrechnung = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -248,7 +255,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel28, this.xrLabel27, this.xrLabel26, - this.xrLabel25, + this.lblSpitzabrechnung, this.xrLabel24, this.xrLabel23, this.xrLabel22, @@ -486,19 +493,19 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel26.StylePriority.UseFont = false; this.xrLabel26.Text = "Abrechnungszeitraum:"; // - // xrLabel25 + // lblSpitzabrechnung // - this.xrLabel25.BackColor = System.Drawing.Color.Transparent; - this.xrLabel25.CanShrink = true; - this.xrLabel25.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.5834F); - this.xrLabel25.Name = "xrLabel25"; - this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(685.9999F, 28.45834F); - this.xrLabel25.StylePriority.UseBackColor = false; - this.xrLabel25.StylePriority.UseFont = false; - this.xrLabel25.Text = "Spitzabrechnung"; - this.xrLabel25.WordWrap = false; + this.lblSpitzabrechnung.BackColor = System.Drawing.Color.Transparent; + this.lblSpitzabrechnung.CanShrink = true; + this.lblSpitzabrechnung.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.lblSpitzabrechnung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.5834F); + this.lblSpitzabrechnung.Name = "lblSpitzabrechnung"; + this.lblSpitzabrechnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSpitzabrechnung.SizeF = new System.Drawing.SizeF(685.9999F, 28.45834F); + this.lblSpitzabrechnung.StylePriority.UseBackColor = false; + this.lblSpitzabrechnung.StylePriority.UseFont = false; + this.lblSpitzabrechnung.Text = "Spitzabrechnung"; + this.lblSpitzabrechnung.WordWrap = false; // // xrLabel24 // @@ -811,13 +818,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel6, - this.xrLabel5, - this.xrLabel4, - this.xrLabel3, this.xrTable5, - this.xrLabel2}); + this.xrTable3}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupFooter1.HeightF = 161.7083F; + this.GroupFooter1.HeightF = 205.4582F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -826,7 +830,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 103.0416F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 146.7916F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -836,39 +840,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel6.StylePriority.UsePadding = false; this.xrLabel6.Text = "Abwesenheiten:\r\n[AbsenceTimes]"; // - // xrLabel5 - // - this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(538.0419F, 70.74998F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(147.9581F, 22.20834F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // xrLabel4 - // - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 70.74998F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(481.25F, 22.20834F); - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "Differenzbetrag"; - // - // xrLabel3 - // - this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(538.0419F, 48.54164F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(147.9581F, 22.20834F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // // xrTable5 // this.xrTable5.BorderColor = System.Drawing.Color.Black; @@ -968,20 +939,93 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell12.Weight = 0.26974305884298722D; // - // xrLabel2 - // - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 48.54164F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(481.25F, 22.20834F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Höhe der erhaltenen Abschlagszahlungen im Abrechnungszeitraum:"; - // // summeUnitCount // this.summeUnitCount.Expression = "Sum([InvoiceItems.UnitCount])"; this.summeUnitCount.Name = "summeUnitCount"; // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57.20825F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4, + this.xrTableRow5, + this.xrTableRow6}); + this.xrTable3.SizeF = new System.Drawing.SizeF(686F, 75F); + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.lblAbschlagszahlungenText, + this.lblAbschlagszahlungen}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // lblAbschlagszahlungenText + // + this.lblAbschlagszahlungenText.CanShrink = true; + this.lblAbschlagszahlungenText.Name = "lblAbschlagszahlungenText"; + this.lblAbschlagszahlungenText.Text = "Höhe der erhaltenen Abschlagszahlungen im Abrechnungszeitraum:"; + this.lblAbschlagszahlungenText.Weight = 4.8125D; + // + // lblAbschlagszahlungen + // + this.lblAbschlagszahlungen.CanShrink = true; + this.lblAbschlagszahlungen.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments")}); + this.lblAbschlagszahlungen.Name = "lblAbschlagszahlungen"; + this.lblAbschlagszahlungen.StylePriority.UseTextAlignment = false; + this.lblAbschlagszahlungen.Text = "lblAbschlagszahlungen"; + this.lblAbschlagszahlungen.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblAbschlagszahlungen.Weight = 2.0474999999999994D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.lblDifferenzrechnungText, + this.lblDifferenzrechnung}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 1D; + // + // lblDifferenzrechnungText + // + this.lblDifferenzrechnungText.CanShrink = true; + this.lblDifferenzrechnungText.Name = "lblDifferenzrechnungText"; + this.lblDifferenzrechnungText.Weight = 4.8125D; + // + // lblDifferenzrechnung + // + this.lblDifferenzrechnung.CanShrink = true; + this.lblDifferenzrechnung.Name = "lblDifferenzrechnung"; + this.lblDifferenzrechnung.StylePriority.UseTextAlignment = false; + this.lblDifferenzrechnung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblDifferenzrechnung.Weight = 2.0474999999999994D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell19, + this.xrTableCell20}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 1D; + // + // xrTableCell19 + // + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Text = "Differenzbetrag"; + this.xrTableCell19.Weight = 4.8125D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell20.Weight = 2.0474999999999994D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); @@ -1013,6 +1057,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1054,7 +1099,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.XRLabel xrLabel23; private DevExpress.XtraReports.UI.XRLabel xrLabel24; - private DevExpress.XtraReports.UI.XRLabel xrLabel25; + private DevExpress.XtraReports.UI.XRLabel lblSpitzabrechnung; private DevExpress.XtraReports.UI.XRLabel xrLabel26; private DevExpress.XtraReports.UI.XRLabel xrLabel27; private DevExpress.XtraReports.UI.XRLabel xrLabel28; @@ -1076,21 +1121,27 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable5; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel35; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell tcSummeUnitCount; private DevExpress.XtraReports.UI.CalculatedField summeUnitCount; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell lblAbschlagszahlungenText; + private DevExpress.XtraReports.UI.XRTableCell lblAbschlagszahlungen; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell lblDifferenzrechnungText; + private DevExpress.XtraReports.UI.XRTableCell lblDifferenzrechnung; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; } } diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs index e15355d68..3fa93afd0 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs @@ -23,7 +23,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt DateTime bewilligungStart = cb2sc.ApprovedStartDate.HasValue ? cb2sc.ApprovedStartDate.Value : pRO.AccountingStartDate; DateTime bewilligungEnde = cb2sc.ApprovedEndDate.HasValue ? cb2sc.ApprovedEndDate.Value : pRO.AccountingEndDate; - lblFLSBewilligtProWoche.Text = string.Format("Vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00} FLS pro Woche", bewilligungStart, bewilligungEnde, pRO.ApprovedFLSWeekly); + if (pRO.TerminationDate.HasValue) + bewilligungEnde = pRO.TerminationDate.Value; + + lblFLSBewilligtProWoche.Text = string.Format("Vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00} FLS pro Woche", bewilligungStart, bewilligungEnde, pRO.ApprovedFLSWeekly); bool isDefaultSpitzabrechnung = false; if (!String.IsNullOrEmpty(pRO.AbsenceTimes)) @@ -92,6 +95,16 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt summeUnitCount += ii.UnitCount.Value; } tcSummeUnitCount.Text = string.Format("{0:0.00}", summeUnitCount); + + var summeAbschlaege = pRO.AmountTotalAdvancedPaidWithOldHourlyRate + pRO.AmountTotalAdvancedPaidWithNewHourlyRate + pRO.AmountTotalAdvancedPaidWithHourlyRate3; + + if (pRO.AmountRecordedFLS - (pRO.ClaimWithEigenbeteiligung + summeAbschlaege) != 0) + { + lblSpitzabrechnung.Text = "Spitzabrechnung (Differenzrechnung)"; + + lblDifferenzrechnungText.Text = "Höhe der bereits gestellten Rechnung vor Stundensatzanpassung:"; + lblDifferenzrechnung.Text = string.Format("{0:c}", pRO.AmountRecordedFLS - pRO.ClaimWithEigenbeteiligung - summeAbschlaege); + } this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs index 9b1d5d9d6..08bacb734 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs @@ -54,7 +54,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblSpitzabrechnung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel(); @@ -90,10 +90,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -103,10 +99,21 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.summeUnitCount = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.lblAbschlagszahlungenText = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblAbschlagszahlungen = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.lblDifferenzrechnungText = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblDifferenzrechnung = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -241,7 +248,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable2, this.xrLabel35, - this.xrLabel8, + this.lblSpitzabrechnung, this.xrLabel26, this.xrLabel27, this.xrLabel32, @@ -390,19 +397,19 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrLabel35.Text = "[InvoiceDate!dd.MM.yyyy]"; this.xrLabel35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // xrLabel8 + // lblSpitzabrechnung // - this.xrLabel8.BackColor = System.Drawing.Color.Transparent; - this.xrLabel8.CanShrink = true; - this.xrLabel8.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.3336F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(691.0005F, 28.45834F); - this.xrLabel8.StylePriority.UseBackColor = false; - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "Spitzabrechnung"; - this.xrLabel8.WordWrap = false; + this.lblSpitzabrechnung.BackColor = System.Drawing.Color.Transparent; + this.lblSpitzabrechnung.CanShrink = true; + this.lblSpitzabrechnung.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.lblSpitzabrechnung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.3336F); + this.lblSpitzabrechnung.Name = "lblSpitzabrechnung"; + this.lblSpitzabrechnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSpitzabrechnung.SizeF = new System.Drawing.SizeF(691.0005F, 28.45834F); + this.lblSpitzabrechnung.StylePriority.UseBackColor = false; + this.lblSpitzabrechnung.StylePriority.UseFont = false; + this.lblSpitzabrechnung.Text = "Spitzabrechnung"; + this.lblSpitzabrechnung.WordWrap = false; // // xrLabel26 // @@ -817,65 +824,20 @@ namespace BetreuungsserviceFuerAlltagUndWohnen // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel2, - this.xrLabel3, - this.xrLabel4, - this.xrLabel5, + this.xrTable3, this.xrLabel6, this.xrTable4}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 153.3125F; + this.GroupFooter1.HeightF = 209.5625F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // - // xrLabel2 - // - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.56248F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(481.25F, 22.20834F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Höhe der erhaltenen Abschlagszahlungen im Abrechnungszeitraum:"; - // - // xrLabel3 - // - this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(543.0424F, 50.56248F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(147.9581F, 22.20834F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // xrLabel4 - // - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 72.77082F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(481.25F, 22.20834F); - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "Differenzbetrag"; - // - // xrLabel5 - // - this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(543.0424F, 72.77082F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(147.9581F, 22.20834F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // // xrLabel6 // this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110.2708F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 166.5208F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -989,6 +951,88 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.summeUnitCount.Expression = "Sum([InvoiceItems.UnitCount])"; this.summeUnitCount.Name = "summeUnitCount"; // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.000778834F, 64.67705F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4, + this.xrTableRow5, + this.xrTableRow6}); + this.xrTable3.SizeF = new System.Drawing.SizeF(686F, 75F); + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.lblAbschlagszahlungenText, + this.lblAbschlagszahlungen}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // lblAbschlagszahlungenText + // + this.lblAbschlagszahlungenText.CanShrink = true; + this.lblAbschlagszahlungenText.Name = "lblAbschlagszahlungenText"; + this.lblAbschlagszahlungenText.Text = "Höhe der erhaltenen Abschlagszahlungen im Abrechnungszeitraum:"; + this.lblAbschlagszahlungenText.Weight = 4.8125D; + // + // lblAbschlagszahlungen + // + this.lblAbschlagszahlungen.CanShrink = true; + this.lblAbschlagszahlungen.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); + this.lblAbschlagszahlungen.Name = "lblAbschlagszahlungen"; + this.lblAbschlagszahlungen.StylePriority.UseTextAlignment = false; + this.lblAbschlagszahlungen.Text = "lblAbschlagszahlungen"; + this.lblAbschlagszahlungen.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblAbschlagszahlungen.Weight = 2.0474999999999994D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.lblDifferenzrechnungText, + this.lblDifferenzrechnung}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 1D; + // + // lblDifferenzrechnungText + // + this.lblDifferenzrechnungText.CanShrink = true; + this.lblDifferenzrechnungText.Name = "lblDifferenzrechnungText"; + this.lblDifferenzrechnungText.Weight = 4.8125D; + // + // lblDifferenzrechnung + // + this.lblDifferenzrechnung.CanShrink = true; + this.lblDifferenzrechnung.Name = "lblDifferenzrechnung"; + this.lblDifferenzrechnung.StylePriority.UseTextAlignment = false; + this.lblDifferenzrechnung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblDifferenzrechnung.Weight = 2.0474999999999994D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell19, + this.xrTableCell20}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 1D; + // + // xrTableCell19 + // + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Text = "Differenzbetrag"; + this.xrTableCell19.Weight = 4.8125D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell20.Weight = 2.0474999999999994D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); @@ -1021,6 +1065,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1067,7 +1112,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen private DevExpress.XtraReports.UI.XRLabel xrLabel29; private DevExpress.XtraReports.UI.XRLabel xrLabel30; private DevExpress.XtraReports.UI.XRLabel xrLabel31; - private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel lblSpitzabrechnung; private DevExpress.XtraReports.UI.XRLabel xrLabel26; private DevExpress.XtraReports.UI.XRLabel xrLabel27; private DevExpress.XtraReports.UI.XRLabel xrLabel32; @@ -1085,10 +1130,6 @@ namespace BetreuungsserviceFuerAlltagUndWohnen private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel35; private DevExpress.XtraReports.UI.XRTable xrTable2; @@ -1101,5 +1142,15 @@ namespace BetreuungsserviceFuerAlltagUndWohnen private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell tcSummeUnitCount; private DevExpress.XtraReports.UI.CalculatedField summeUnitCount; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell lblAbschlagszahlungenText; + private DevExpress.XtraReports.UI.XRTableCell lblAbschlagszahlungen; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell lblDifferenzrechnungText; + private DevExpress.XtraReports.UI.XRTableCell lblDifferenzrechnung; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; } } diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.cs index aefbd7fb3..5339ca4be 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.cs @@ -27,6 +27,9 @@ namespace BetreuungsserviceFuerAlltagUndWohnen DateTime bewilligungStart = sc.ApprovedStartDate.HasValue ? sc.ApprovedStartDate.Value : pRO.AccountingStartDate; DateTime bewilligungEnde = sc.ApprovedEndDate.HasValue ? sc.ApprovedEndDate.Value : pRO.AccountingEndDate; + if (pRO.TerminationDate.HasValue) + bewilligungEnde = pRO.TerminationDate.Value; + lblFLSBewilligtProWoche.Text = string.Format("Vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00} FLS pro Woche", bewilligungStart, bewilligungEnde, pRO.ApprovedFLSWeekly); var bewilligung = sc.ApprovalPeriodList.FirstOrDefault(ap => ap.StartDate.Value.Date == pRO.AccountingStartDate.Date && ap.EndDate.Value.Date == pRO.AccountingEndDate.Date); @@ -58,6 +61,14 @@ namespace BetreuungsserviceFuerAlltagUndWohnen pRO.RateFactor = (double)rateFactor; + if (pRO.AmountBillableTotal - (pRO.Claim + pRO.AmountAdvancedPayments) != 0) + { + lblSpitzabrechnung.Text = "Spitzabrechnung (Differenzrechnung)"; + + lblDifferenzrechnungText.Text = "Höhe der bereits gestellten Rechnung vor Stundensatzanpassung:"; + lblDifferenzrechnung.Text = string.Format("{0:c}", pRO.AmountBillableTotal - (pRO.AmountAdvancedPayments + pRO.Claim)); + } + this.bindingSource1.DataSource = pRO; } }