Finanzcontrollingbericht: bezahlte Beträge als Netto und nicht Brutto berechnen

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

diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm
index 2e62e0f7e4551f3148c44f6d3cbca6fa09e08fb5..165a649c7b4ff8cefc579023dd90068091a887ba 100644 (file)
--- 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->{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};
     my $billed_amount           = sum map { $_->netamount                                                          } @invoices;
     $order->{other_amount}      = $billed_amount             - $order->{billed_amount};
     $order->{billable_amount}   = $order->{delivered_amount} - $order->{billed_amount};