From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Thu, 22 Nov 2012 10:14:30 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta2~10^2~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4486e3bc8eb00c37cf8029e663eb94b4b9c5346a;p=kivitendo-erp.git

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

4486e3bc8eb00c37cf8029e663eb94b4b9c5346a
diff --cc bin/mozilla/vk.pl
index dd0a9b6b1,70c048207..148fec02d
--- a/bin/mozilla/vk.pl
+++ b/bin/mozilla/vk.pl
@@@ -428,27 -389,21 +389,21 @@@ sub invoice_transactions 
      # wird laufend bei jeder Position neu berechnet
      $totals{marge_percent}    = $totals{sellprice_total}    ? ( ($totals{sellprice_total} - $totals{lastcost_total}) / $totals{sellprice_total}   ) * 100 : 0;
  
 -    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(marge_total marge_percent qty);
 +    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(marge_total marge_percent qty sellprice_total lastcost_total);
      map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 3) } qw(weight);
 -    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, $form->{"decimalplaces"} )} qw(lastcost sellprice sellprice_total lastcost_total);
 +    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, $form->{"decimalplaces"} )} qw(lastcost sellprice);
  
-     my $row = { };
- 
-     foreach my $column (@columns) {
-       $row->{$column} = {
-         'data'  => $ar->{$column},
-         'align' => $column_alignment{$column},
-       };
-     }
- 
-    $row->{description}->{class} = 'listsortdescription';
- 
-     $row->{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit')
-       . "&id=" . E($ar->{id}) . "&callback=${callback}";
- 
      # Einzelzeilen nur zeigen wenn l_parts gesetzt ist, nützlich, wenn man nur
      # Subtotals und Totals sehen möchte
-     my $row_set = $form->{l_parts} ? [ $row ] : [ ];
+     if ($form->{l_parts}) {
+       my %row = (
+         map { ($_ => { data => $ar->{$_}, align => $column_alignment{$_} }) } @columns
+       );
+ 
+       $row{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit') . "&id=" . E($ar->{id}) . "&callback=${callback}";
+ 
+       $report->add_data(\%row);
+     }
  
      # hier wird bei l_subtotal nicht differenziert zwischen mainsort und subsort
      # macht man l_subtotal_mainsort aus wird l_subtotal_subsort auch nicht ausgeführt