X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=ec287aa61219f7a58d69c2f42a4b6b99e4f236a0;hb=5c3437e5b742d646d573f3c52fb68de010e7cdd0;hp=4b0e9e34f7ff7ca6da48ab59fa5bbac9defbf746;hpb=a5bebed4cd880e6f6fc5497f7b183f25586342ba;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 4b0e9e34f..ec287aa61 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1123,6 +1123,7 @@ sub generate_report {
     drawing       => $locale->text('Drawing')          . ": '$form->{drawing}'",
     microfiche    => $locale->text('Microfiche')       . ": '$form->{microfiche}'",
     l_soldtotal   => $locale->text('soldtotal'),
+    ean           => $locale->text('EAN')              . ": '$form->{ean}'",
   );
 
   my @itemstatus_keys = qw(active obsolete orphaned onhand short);
@@ -1144,12 +1145,10 @@ sub generate_report {
 
   # special case for lastcost
   if ($form->{ledgerchecks}){
-    # zumindestens für den haken 'gekauft' muss das verhalten
-    # so sein, das der Verkaufspreis nicht angezeigt
-    # wird. In der Backend-Funktion all_parts wird nur mit
-    # price gearbeitet
+    # ledgerchecks don't know about sellprice or lastcost. they just return a
+    # price. so rename sellprice to price, and drop lastcost.
     $column_defs{sellprice}{text} = $locale->text('Price');
-    $form->{l_lastcost} = "" 
+    $form->{l_lastcost} = ""
   }
 
   if ($form->{description}) {
@@ -1191,7 +1190,7 @@ sub generate_report {
     partnumber description partsgroup bin onhand rop unit listprice
     linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
     priceupdate weight image drawing microfiche invnumber ordnumber quonumber
-    transdate name serialnumber soldtotal deliverydate
+    transdate name serialnumber soldtotal deliverydate ean
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
@@ -1201,8 +1200,7 @@ sub generate_report {
   push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
 
   %column_defs = (%column_defs,%column_defs_cvars); # nochmal die cvars als überschrift hinzufügen
-
-  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
+    map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
   map { $column_defs{$_}->{align}   = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal);
 
   my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, @searchable_custom_variables, map { "l_$_" } @columns);
@@ -1873,7 +1871,7 @@ sub save {
       $form->{creditremaining} -= $amount;
 
       # redo number formatting, because invoice parse them!
-      map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } qw(weight listprice sellprice rop);
+      map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } qw(weight listprice sellprice lastcost rop);
     }
 
     $form->{"id_$i"} = $parts_id;