From 03b808f52ab6c62c6a1d8933ef044854110fa741 Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 19 Apr 2024 20:10:48 +0200 Subject: [PATCH] BellaDonna: Darstellung der FLS/Fehlkontakte und ihrer Zwischensummen korrigiert --- ReportImp/BellaDonna/Properties/licenses.licx | 1 + .../BellaDonna/SettlementReport2.Designer.cs | 74 ++++---- ReportImp/BellaDonna/SettlementReport2.cs | 166 +----------------- ReportImp/BellaDonna/SettlementReport2.resx | 3 - 4 files changed, 48 insertions(+), 196 deletions(-) diff --git a/ReportImp/BellaDonna/Properties/licenses.licx b/ReportImp/BellaDonna/Properties/licenses.licx index e69de29bb..f98ef57fd 100644 --- a/ReportImp/BellaDonna/Properties/licenses.licx +++ b/ReportImp/BellaDonna/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/BellaDonna/SettlementReport2.Designer.cs b/ReportImp/BellaDonna/SettlementReport2.Designer.cs index 2e16870cc..7f825309e 100644 --- a/ReportImp/BellaDonna/SettlementReport2.Designer.cs +++ b/ReportImp/BellaDonna/SettlementReport2.Designer.cs @@ -146,7 +146,7 @@ namespace BellaDonna.Neu // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 336.4445F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325.4445F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -182,7 +182,7 @@ namespace BellaDonna.Neu this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell6.StylePriority.UseBorderColor = false; @@ -225,7 +225,7 @@ namespace BellaDonna.Neu // this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -277,17 +277,17 @@ namespace BellaDonna.Neu // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 275.6945F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 264.6945F); 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, 60.75F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(649.9999F, 60.74997F); this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242.6945F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 241.6945F); 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); @@ -298,8 +298,8 @@ namespace BellaDonna.Neu // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 214.2361F); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.2361F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -313,8 +313,8 @@ namespace BellaDonna.Neu // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.2361F); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.2361F); 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); @@ -327,8 +327,8 @@ namespace BellaDonna.Neu // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 181.2361F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.2361F); 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); @@ -400,15 +400,16 @@ namespace BellaDonna.Neu this.xrTable3, this.xrLabel11, this.lblNotice}); - this.ReportFooter.HeightF = 225.0416F; + this.ReportFooter.HeightF = 216.0416F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel14 // - this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 208.0416F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 199.0416F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -426,7 +427,7 @@ namespace BellaDonna.Neu // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 28.99999F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, @@ -544,7 +545,7 @@ namespace BellaDonna.Neu // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 208.0416F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 199.0416F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); @@ -556,8 +557,8 @@ namespace BellaDonna.Neu // lblNotice // this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); + this.lblNotice.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Italic); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3.999992F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); @@ -573,7 +574,7 @@ namespace BellaDonna.Neu // // xrRichText2 // - this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); @@ -601,13 +602,13 @@ namespace BellaDonna.Neu this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.HeightF = 404.4445F; + this.GroupHeader1.HeightF = 393.4445F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // // xrRichText1 // - this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(476.33F, 0F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); @@ -631,6 +632,8 @@ namespace BellaDonna.Neu this.xrTable5}); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; + this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.Detail1.StylePriority.UseFont = false; // // xrTable5 @@ -657,7 +660,7 @@ namespace BellaDonna.Neu this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell17.CanShrink = true; this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AbrechnungsText")}); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UseBorderColor = false; @@ -689,7 +692,7 @@ namespace BellaDonna.Neu // this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable6}); - this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.HeightF = 26F; this.Zwischensumme.Name = "Zwischensumme"; this.Zwischensumme.Visible = false; // @@ -700,7 +703,7 @@ namespace BellaDonna.Neu this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow12, this.xrTableRow3}); - this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F); + this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 26F); this.xrTable6.StylePriority.UseFont = false; // // xrTableRow12 @@ -749,14 +752,15 @@ namespace BellaDonna.Neu this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3}); this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.40476190476190466D; + this.xrTableRow3.Weight = 0.21428571428571425D; // // xrTableCell3 // this.xrTableCell3.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell3.StylePriority.UseBorderColor = false; @@ -768,7 +772,7 @@ namespace BellaDonna.Neu // GroupHeader2 // this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); this.GroupHeader2.HeightF = 0F; this.GroupHeader2.Name = "GroupHeader2"; // @@ -780,7 +784,7 @@ namespace BellaDonna.Neu // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.GroupFooter1.HeightF = 132F; + this.GroupFooter1.HeightF = 128F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -797,7 +801,7 @@ namespace BellaDonna.Neu this.xrTableRow34, this.xrTableRow35, this.xrTableRow36}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F); + this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 128F); this.xrTable4.StylePriority.UseBorderColor = false; // // xrTableRow30 @@ -961,7 +965,7 @@ namespace BellaDonna.Neu this.cellRestforderung, this.xrTableCell58}); this.xrTableRow36.Name = "xrTableRow36"; - this.xrTableRow36.Weight = 0.15D; + this.xrTableRow36.Weight = 0.13D; // // cellRestforderung // @@ -982,7 +986,7 @@ namespace BellaDonna.Neu | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrTableCell58.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell58.Name = "xrTableCell58"; this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell58.StylePriority.UseBorderColor = false; @@ -1004,14 +1008,14 @@ namespace BellaDonna.Neu this.GroupFooter1}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Arial", 11F); + this.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(80, 40, 200, 50); + this.Margins = new DevExpress.Drawing.DXMargins(80F, 40F, 200F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); diff --git a/ReportImp/BellaDonna/SettlementReport2.cs b/ReportImp/BellaDonna/SettlementReport2.cs index bd240e0c3..a6ea9ca7f 100644 --- a/ReportImp/BellaDonna/SettlementReport2.cs +++ b/ReportImp/BellaDonna/SettlementReport2.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using BeWo.Data.Access; -using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; -using BS.Shared.DataContracts; - +using BS.Shared.Extensions; + namespace BellaDonna.Neu { public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport @@ -18,11 +14,8 @@ namespace BellaDonna.Neu public void SetReportDataSource(Settlement2RO pRO) { - bool hasRatefactor = false; - if (!String.IsNullOrWhiteSpace(pRO.RateFactorText2)) { - hasRatefactor = true; if (pRO.RateFactorText2 == "1,2") { pRO.RateFactorText2 = "1,20"; @@ -33,21 +26,16 @@ namespace BellaDonna.Neu { foreach (var ii in pRO.InvoiceItems) { - ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}", - ii.PeriodStartDate, ii.PeriodEndDate, - ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ", - ii.AmountPerUnit); - if (pRO.FehlkontakteString != null && ii.RateFactor == 0) { Zwischensumme.Visible = true; - if (ii.ItemDescription != null) - { - ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); - } + ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); ii.ItemDescription = "Fehlkontakte"; - } - + } + else if (ii.ItemDescription.IsNullOrEmpty() || ii.ItemDescription.Equals("Fachleistungsstunde")) + { + ii.ItemDescription = "Fachleistungsstunden"; + } } } @@ -60,147 +48,9 @@ namespace BellaDonna.Neu { cellRestforderung.Text = "Rückforderung"; pRO.FinalSentence = ""; - } this.bindingSource1.DataSource = pRO; } - - private String GetCustomerId(SettlementRO pRO) - { - var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); - return cb2sc.CostBearer.ID; - } - - private IList CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO) - { - IList itemList = new List(); - if (pRO.DifferentHourlyRateCount == 3) - { - itemList.Add(new InvoiceItemDC - { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", - pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString, - pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3), - - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3 - }); - - itemList.Add(new InvoiceItemDC - { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", - pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString, - pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld), - - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld - }); - - itemList.Add(new InvoiceItemDC - { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", - pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString, - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew), - - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew - }); - - } - else if (pRO.DifferentHourlyRateCount == 2) - { - itemList.Add(new InvoiceItemDC - { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", - pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString, - pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld), - - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld - }); - - itemList.Add(new InvoiceItemDC - { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", - pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString, - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew), - - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew - }); - - } - else - { - itemList.Add(new InvoiceItemDC - { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", - pRO.AccountingStartDateString, pRO.AccountingEndDateString, - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew), - - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew - }); - - } - - return itemList; - } - - private void UpdateAbrechnungsFelder(SettlementRO pRO) - { - if (pRO.DifferentHourlyRateCount == 3) - { - //Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] € - - pRO.Abrechnungstext1 = String.Format("{0} bis {1}", - pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString); - - pRO.Abrechnungstext1 += String.Format(": {0:0.##} FLS {1}x {2:c}", - pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3); - - //[AccountingStartDateString] - [HourlyRate3EndDateString] sind [RecordedFLSWithHourlyRate3String] Std. x [HourlyRate3String] € ="; - - pRO.Betrag1 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatz3 * (decimal)pRO.RateFactor * pRO.HourlyRate3); - - - pRO.Abrechnungstext2 = String.Format("{0} bis {1}", - pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString); - pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}", - pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld); - - pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld); - - - pRO.Abrechnungstext3 = String.Format("{0} bis {1}", - pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString); - pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}", - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew); - - pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew); - } - else if (pRO.DifferentHourlyRateCount == 2) - { - - pRO.Abrechnungstext2 = String.Format("{0} bis {1}", - pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString); - pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}", - pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld); - - pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld); - - - pRO.Abrechnungstext3 = String.Format("{0} bis {1}", - pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString); - pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}", - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew); - - pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew); - } - else - { - pRO.Abrechnungstext3 = String.Format("{0} bis {1}", - pRO.AccountingStartDateString, pRO.AccountingEndDateString); - pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}", - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew); - - pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew); - } - } } } diff --git a/ReportImp/BellaDonna/SettlementReport2.resx b/ReportImp/BellaDonna/SettlementReport2.resx index 4f97e9dd0..12d354ffc 100644 --- a/ReportImp/BellaDonna/SettlementReport2.resx +++ b/ReportImp/BellaDonna/SettlementReport2.resx @@ -127,7 +127,4 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAAgAE4AYQByAHIAbwB3ADsAfQB9AHsAXABjAG8AbABvAHIAdABiAGwAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABzAGwAMgA4ADgAXABzAGwAbQB1AGwAdAAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAAWwBOAG8AIABwAGEAcgBhAGcAcgBhAHAAaAAgAHMAdAB5AGwAZQBdADsAfQB7AFwAKgBcAGMAcwAyAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAAgAFAAYQByAGEAZwByAGEAcABoACAARgBvAG4AdAA7AH0AewBcACoAXABjAHMAMwBcAHMAYgBhAHMAZQBkAG8AbgAyAFwAZgAxAFwAZgBzADIANABcAGMAZgAxACAATABpAG4AZQAgAE4AdQBtAGIAZQByADsAfQB7AFwAKgBcAGMAcwA0AFwAdQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAyACAASAB5AHAAZQByAGwAaQBuAGsAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAdAAzAFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABOAG8AcgBtAGEAbAAgAFQAYQBiAGwAZQA7AH0AewBcACoAXAB0AHMANgBcAHQAcwByAG8AdwBkAFwAcwBiAGEAcwBlAGQAbwBuADUAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdAByAGIAcgBkAHIAdABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBsAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAcgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBoAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHYAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgByADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAHIAMQAwADgAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAFQAYQBiAGwAZQAgAFMAaQBtAHAAbABlACAAMQA7AH0AfQB7AFwAKgBcAGwAaQBzAHQAbwB2AGUAcgByAGkAZABlAHQAYQBiAGwAZQB9AFwAbgBvAHUAaQBjAG8AbQBwAGEAdABcAHMAcABsAHkAdAB3AG4AaQBuAGUAXABoAHQAbQBhAHUAdABzAHAAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAcwBsADIANgA0AFwAcwBsAG0AdQBsAHQAMQBcAHQAeAAyADgANAB7AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAEQAcgBvAGcAZQBuAGIAZQByAGEAdAB1AG4AZwAgAGYAXAB1ADIANQAyAFwAJwBmAGMAcgAgAE0AXAB1ADIAMgA4AFwAJwBlADQAZABjAGgAZQBuACAAdQBuAGQAIABGAHIAYQB1AGUAbgB9AFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAfQB7AFwAZgAyAFwAZgBzADEAOABcAGMAZgAxACAAcABvAHMAdABAAGIAZQBsAGwAYQBkAG8AbgBuAGEALQBlAHMAcwBlAG4ALgBkAGUAfQBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAVABlAGwAZQBmAG8AbgAgADAAMgAwADEALQAyADQAMAA4ADgAOAAtADMALwAtADQAfQBcAGwAYQBuAGcAMQAwADQAMABcAGwAYQBuAGcAZgBlADEAMAA0ADAAXABmADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABzAGwAMgA2ADQAXABzAGwAbQB1AGwAdAAxAFwAdAB4ADIAOAA0AHsAXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAEEAbQBiAHUAbABhAG4AdABlACAARgBsAGUAeABpAGIAbABlACAASABpAGwAZgBlAG4AfQBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAcwBsADIANgA0AFwAcwBsAG0AdQBsAHQAMQBcAHQAeAAyADgANAB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAfQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAHMALgBiAG8AZQBjAGsAZQByAEAAYgBlAGwAbABhAGQAbwBuAG4AYQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABcAHQAYQBiACAAVABlAGwAZQBmAG8AbgAgADAAMQA3ADgALQA5ADMANwAwADQAMwA5AH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAZgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAcwBsADIANgA0AFwAcwBsAG0AdQBsAHQAMQBcAHQAeAAyADgANAB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABCAGUAdAByAGUAdQB0AGUAcwAgAFcAbwBoAG4AZQBuAH0AXABsAGEAbgBnADEAMAAzADMAXABsAGEAbgBnAGYAZQAxADAAMwAzAFwAYgBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHMAbAAyADYANABcAHMAbABtAHUAbAB0ADEAXAB0AHgAMgA4ADQAewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABiAFwAZgAyAFwAZgBzADEAOABcAGMAZgAxACAAXAB0AGEAYgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMwBcAGwAYQBuAGcAZgBlADEAMAAzADMAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABuAC4AbQBlAGkAZQByAEAAYgBlAGwAbABhAGQAbwBuAG4AYQAtAGUAcwBzAGUAbgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgACAAIAAgACAAIAAgACAAfQB7AFwAbABhAG4AZwAxADAAMwAzAFwAbABhAG4AZwBmAGUAMQAwADMAMwBcAGYAMgBcAGYAcwAxADgAXABjAGYAMQAgAFQAZQBsAGUAZgBvAG4AIAAwADEANgAzAC0AOAA4ADAANAAzADcAMQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A - - 17, 17 - \ No newline at end of file