Finanzcontrollingbericht: kosmetik

[mfinanz.git] / SL / Controller / FinancialControllingReport.pm

diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm
index 2e62e0f7e4551f3148c44f6d3cbca6fa09e08fb5..5b99ed262fb033d5fefe267df3a8e4c35c4d220d 100644 (file)
--- 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),
     );
 
       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->{paid_amount}       = sum map { $_->paid                                                               } @invoices;
-    my $billed_amount           = sum map { $_->netamount                                                          } @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;

     $order->{other_amount}      = $billed_amount             - $order->{billed_amount};
     $order->{billable_amount}   = $order->{delivered_amount} - $order->{billed_amount};
 
     $order->{other_amount}      = $billed_amount             - $order->{billed_amount};
     $order->{billable_amount}   = $order->{delivered_amount} - $order->{billed_amount};