ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Sammelrechnung Fehlkontakte + AdikKleve Sammelrechnung

Browse Source
This commit is contained in:
Marcel Hirschle
2023-05-08 14:45:41 +02:00
parent 35b1b35717
commit 8e8e88cd40
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReportImp/AdikKleve/Invoicing/CustomInvoiceCreation.cs
View File

@@ -49,6 +49,9 @@ namespace AdikKleve.Invoicing
}
}
}
public override string GetSummaryItemKey(SupportConceptApprovalPeriod scap, InvoiceItem iitem, bool summaryPerMonth)
{
return String.Format("{0}_{1}_{2}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription);
}
}
}

6
Service/Invoicing/InvoiceCreation.cs
View File

@@ -745,7 +745,11 @@ namespace BeWo.Service.Invoicing
invoiceItem.ServiceRecord = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(iServiceRecord.ServiceRecordOid.Value);
if (scap != null)
invoiceItem.SupportConceptApprovalPeriodOid = scap.Oid;
if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iServiceRecord.ServiceDescription.ProzentAbrechnung.HasValue && iServiceRecord.ServiceDescription.ProzentAbrechnung.Value < 100))
{
invoiceItem.RateFactor = null;
invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
}
//var crs = iServiceRecord.CostBearer.CostRatePeriods;
//List<long> costRatePeriodOids = new List<long>();