diff --git a/ReportImp/DieDueneReports/DieDueneReports.csproj b/ReportImp/DieDueneReports/DieDueneReports.csproj index 16ac492cb..efa9e1c02 100644 --- a/ReportImp/DieDueneReports/DieDueneReports.csproj +++ b/ReportImp/DieDueneReports/DieDueneReports.csproj @@ -71,6 +71,8 @@ InvoiceCustomerReport.cs + + Component diff --git a/ReportImp/DieDueneReports/Invoicing/CustomInvoiceCreation.cs b/ReportImp/DieDueneReports/Invoicing/CustomInvoiceCreation.cs new file mode 100644 index 000000000..74f815a15 --- /dev/null +++ b/ReportImp/DieDueneReports/Invoicing/CustomInvoiceCreation.cs @@ -0,0 +1,24 @@ +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DieDueneReports.Invoicing +{ + public class CustomInvoiceCreation : InvoiceCreation + { + public override string GetSummaryItemKey(SupportConceptApprovalPeriod scap, InvoiceItem iitem, bool summaryPerMonth) + { + String key = String.Format("{0:0.0000}_{1}_{2}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription); + if (summaryPerMonth) + { + key = String.Format("{0:0.0000}_{1}_{2:yyyyMM}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemPeriodStart); + } + + return key; + } + } +} diff --git a/ReportImp/DieDueneReports/Invoicing/CustomInvoiceFactory.cs b/ReportImp/DieDueneReports/Invoicing/CustomInvoiceFactory.cs new file mode 100644 index 000000000..2c9db1cc1 --- /dev/null +++ b/ReportImp/DieDueneReports/Invoicing/CustomInvoiceFactory.cs @@ -0,0 +1,19 @@ +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DieDueneReports.Invoicing +{ + public class CustomInvoiceFactory : InvoiceFactory + { + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + return new CustomInvoiceCreation(); + } + } +} diff --git a/ReportImp/DieDueneReports/Properties/licenses.licx b/ReportImp/DieDueneReports/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/DieDueneReports/Properties/licenses.licx +++ b/ReportImp/DieDueneReports/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a