X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fvk.pl;h=a60d430ea6c6166543f8494555bc97ef69294c2f;hb=61cdba5d566357f3beabe0e7f3f0cb2d7bdccd73;hp=c6296e90bafad4958493a5c04819170f5579ce71;hpb=7321146cf5a08364a9db2ddddbb0b74a5d3fc4c9;p=kivitendo-erp.git

diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl
index c6296e90b..a60d430ea 100644
--- a/bin/mozilla/vk.pl
+++ b/bin/mozilla/vk.pl
@@ -104,6 +104,11 @@ sub invoice_transactions {
 
   # can't currently be configured from report, empty line between main sortings
   my $addemptylines = 1;
+  
+  # don't add empty lines between mainsort subtotals when only subtotal_mainsort is selected
+  if ($form->{l_subtotal_mainsort} eq "Y" and not defined $form->{l_headers_mainsort} and not defined $form->{l_headers_subsort} and not defined $form->{l_subtotal_subsort} ) {
+    $addemptylines = 0 
+  };
 
   if ( $form->{customer} =~ /--/ ) {
     # Felddaten kommen aus Dropdownbox
@@ -119,12 +124,12 @@ sub invoice_transactions {
 
     &check_name('customer', no_select => 1);
 
-    # $form->{customer_id} wurde schon von check_name gesetzt
+    # $form->{customer_id} was already set by check_name
     $form->{customername} = $form->{customer};
   };
-  # ist $form->{customer} leer passiert hier nichts weiter
+  # if $form->{customer} is empty nothing further happens here
 
-  # decimalplaces überprüfen oder auf Default 2 setzen
+  # test for decimalplaces or set to default of 2
   $form->{decimalplaces} = 2 unless $form->{decimalplaces} > 0 && $form->{decimalplaces} < 6;
 
   my $cvar_configs_ct = CVar->get_configs('module' => 'CT');
@@ -281,9 +286,9 @@ sub invoice_transactions {
   $callback = $form->escape($href);
 
   my @subtotal_columns = qw(qty weight sellprice sellprice_total lastcost lastcost_total marge_total marge_percent discount);
-  # Gesamtsumme:
-  # Summe von sellprice_total, lastcost_total und marge_total
-  # Durchschnitt von marge_percent
+  # Total sum:
+  # sum of sellprice_total, lastcost_total and marge_total
+  # average of marge_percent
   my @total_columns = qw(sellprice_total lastcost_total marge_total marge_percent );
 
   my %totals     = map { $_ => 0 } @total_columns;
@@ -402,6 +407,9 @@ sub invoice_transactions {
 
       $row{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit') . "&id=" . E($ar->{id}) . "&callback=${callback}";
 
+      # use partdescription according to invoice in article mode
+      $row{description}->{data} = $ar->{invoice_description};
+
       $report->add_data(\%row);
     }