From 7a452195542fca0d82b74763fbc1eb97770d60a6 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 31 Jan 2013 12:41:49 +0100 Subject: [PATCH] =?utf8?q?Finanzcontrollingbericht:=20bezahlte=20Betr?= =?utf8?q?=C3=A4ge=20als=20Netto=20und=20nicht=20Brutto=20berechnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/FinancialControllingReport.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm index 2e62e0f7e..165a649c7 100644 --- a/SL/Controller/FinancialControllingReport.pm +++ b/SL/Controller/FinancialControllingReport.pm @@ -148,7 +148,7 @@ sub calculate_data { $order->{delivered_amount} = sum map { $self->sum_relevant_items(order => $order, other => $_, by_order => 1) } @delivery_orders; $order->{billed_amount} = sum map { $self->sum_relevant_items(order => $order, other => $_) } @invoices; - $order->{paid_amount} = sum map { $_->paid } @invoices; + $order->{paid_amount} = sum map { $_->paid * $_->netamount / (($_->amount * 1) || ($_->netamount * 1) || 1) } @invoices; my $billed_amount = sum map { $_->netamount } @invoices; $order->{other_amount} = $billed_amount - $order->{billed_amount}; $order->{billable_amount} = $order->{delivered_amount} - $order->{billed_amount}; -- 2.20.1