diff --git a/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs b/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs index fc66a1c32..04a668bb0 100644 --- a/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs +++ b/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs @@ -60,8 +60,8 @@ namespace SozialeDiensteNiederrhein.Alt { foreach (var ii in pRO.InvoiceItems) { - ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS x {3:c}", - ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit); + ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:c} FLS x {3:0.##}", + ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.AmountPerUnit, ii.UnitCount); } } } @@ -71,10 +71,9 @@ namespace SozialeDiensteNiederrhein.Alt { 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.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", ii.ItemPeriodStart, ii.ItemPeriodEnd, - ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ", - ii.AmountPerUnit); + ii.UnitCount, ii.AmountPerUnit, ii.RateFactor == 0 ? "" : pRO.RateFactorText2 + " "); } } } @@ -125,27 +124,27 @@ namespace SozialeDiensteNiederrhein.Alt { itemList.Add(new InvoiceItemDC { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", + ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString, - pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3), + pRO.GeleisteteFLSMitStundensatz3, pRO.HourlyRate3, pRO.RateFactor == 1 ? "" : pRO.RateFactorText2 + " "), GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3 }); itemList.Add(new InvoiceItemDC { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", + ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString, - pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld), + pRO.GeleisteteFLSMitStundensatzAlt, pRO.HourlyRateOld, pRO.RateFactor == 1 ? "" : pRO.RateFactorText2 + " "), GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld }); itemList.Add(new InvoiceItemDC { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", + ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString, - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew), + pRO.GeleisteteFLSMitStundensatzAktuell, pRO.HourlyRateNew, pRO.RateFactor == 1 ? "" : pRO.RateFactorText2 + " "), GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew }); @@ -155,18 +154,18 @@ namespace SozialeDiensteNiederrhein.Alt { itemList.Add(new InvoiceItemDC { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", + ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString, - pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld), + pRO.GeleisteteFLSMitStundensatzAlt, pRO.HourlyRateOld, pRO.RateFactor == 1 ? "" : pRO.RateFactorText2 + " "), 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}", + ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString, - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew), + pRO.GeleisteteFLSMitStundensatzAktuell, pRO.HourlyRateNew, pRO.RateFactor == 1 ? "" : pRO.RateFactorText2 + " "), GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew }); @@ -176,9 +175,9 @@ namespace SozialeDiensteNiederrhein.Alt { itemList.Add(new InvoiceItemDC { - ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}", + ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS x {3:0.00} € x {4:0.00}", pRO.AccountingStartDateString, pRO.AccountingEndDateString, - pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew), + pRO.GeleisteteFLSMitStundensatzAktuell, pRO.HourlyRateNew, pRO.RateFactor == 1 ? "" : pRO.RateFactorText2 + " "), GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew });