In Berichten ar und oe auch die prozentuale Marge bei Zwischensummen und Gesammtsumme...

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 305b6aaade5245bac75ae6ea1e70ad5abea8ea1e..161dde9a01803165409f124cc9ae591895cd5ae2 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1518,7 +1518,7 @@ sub ar_transactions {
   # escape callback for href
   $callback = $form->escape($href);
 
   # escape callback for href
   $callback = $form->escape($href);
 

-  my @subtotal_columns = qw(netamount amount paid due marge_total);
+  my @subtotal_columns = qw(netamount amount paid due marge_total marge_percent);

 
   my %totals    = map { $_ => 0 } @subtotal_columns;
   my %subtotals = map { $_ => 0 } @subtotal_columns;
 
   my %totals    = map { $_ => 0 } @subtotal_columns;
   my %subtotals = map { $_ => 0 } @subtotal_columns;


@@ -1532,6 +1532,9 @@ sub ar_transactions {
     map { $subtotals{$_} += $ar->{$_};
           $totals{$_}    += $ar->{$_} } @subtotal_columns;
 
     map { $subtotals{$_} += $ar->{$_};
           $totals{$_}    += $ar->{$_} } @subtotal_columns;
 

+    $subtotals{marge_percent} = $subtotals{marge_total} / $subtotals{netamount} * 100;
+    $totals{marge_percent} = $totals{marge_total} / $totals{netamount} * 100;
+

     map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
 
     my $is_storno  = $ar->{storno} && !$ar->{storno_id};
     map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
 
     my $is_storno  = $ar->{storno} && !$ar->{storno_id};

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 92cfb69f9ad6db04dccab44a32ac1b3c2872d5c4..c64edef77f00d6c230557ad337ccf207a3fb7016 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1761,7 +1761,7 @@ sub orders {
   # escape callback for href
   $callback = $form->escape($href);
 
   # escape callback for href
   $callback = $form->escape($href);
 

-  my @subtotal_columns = qw(netamount amount marge_total);
+  my @subtotal_columns = qw(netamount amount marge_total marge_percent);

 
   my %totals    = map { $_ => 0 } @subtotal_columns;
   my %subtotals = map { $_ => 0 } @subtotal_columns;
 
   my %totals    = map { $_ => 0 } @subtotal_columns;
   my %subtotals = map { $_ => 0 } @subtotal_columns;


@@ -1779,6 +1779,8 @@ sub orders {
 
     map { $subtotals{$_} += $oe->{$_};
           $totals{$_}    += $oe->{$_} } @subtotal_columns;
 
     map { $subtotals{$_} += $oe->{$_};
           $totals{$_}    += $oe->{$_} } @subtotal_columns;

+    $subtotals{marge_percent} = $subtotals{marge_total} / $subtotals{netamount} * 100;
+    $totals{marge_percent} = $totals{marge_total} / $totals{netamount} * 100;

 
     map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent);
 
 
     map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent);