From 17536e15b1bcaea827f2093f746c116cbb74a64e Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 31 Jan 2013 12:42:05 +0100 Subject: [PATCH] Finanzcontrollingbericht: kosmetik --- SL/Controller/FinancialControllingReport.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm index 165a649c7..5b99ed262 100644 --- a/SL/Controller/FinancialControllingReport.pm +++ b/SL/Controller/FinancialControllingReport.pm @@ -146,10 +146,10 @@ sub calculate_data { map({ @{ $_->storno_invoices } } grep { $_->storno && !$_->storno_id } @invoices), ); - $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->{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 * $_->netamount / (($_->amount * 1) || ($_->netamount * 1) || 1) } @invoices; - my $billed_amount = sum map { $_->netamount } @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