Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

This commit is contained in:
Christian
2024-09-17 23:14:38 +02:00
291 changed files with 43919 additions and 26028 deletions

View File

@@ -257,9 +257,12 @@ namespace BeWo.Report.ReportObjects
{
foreach (var ii in pDC.InvoiceItems)
{
if (ii.RateFactor.HasValue && !pDC.RateFactor.HasValue)
if (ii.RateFactor.HasValue)
{
pDC.RateFactor = ii.RateFactor.Value;
if (!pDC.RateFactor.HasValue || pDC.RateFactor < ii.RateFactor)
{
pDC.RateFactor = ii.RateFactor.Value;
}
}
if (ii.UnitCount.HasValue)
{