Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

	bin/mozilla/ic.pl

diff --combined bin/mozilla/ic.pl
index 4b0e9e34f7ff7ca6da48ab59fa5bbac9defbf746,29a39ed65cb503a92fc4208b64c2af40c9343097..ebdaba52f894cb45900ae10184a63d5e951aac00
--- 1/bin/mozilla/ic.pl
--- 2/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@@ -1023,35 -1023,6 +1023,35 @@@ sub generate_report 
    $form->{title} =~ s/ys$/ies/;
    $form->{title} = $locale->text($form->{title});
  
 +  my %column_defs = (
 +    'bin'                => { 'text' => $locale->text('Bin'), },
 +    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
 +    'description'        => { 'text' => $locale->text('Part Description'), },
 +    'drawing'            => { 'text' => $locale->text('Drawing'), },
 +    'image'              => { 'text' => $locale->text('Image'), },
 +    'invnumber'          => { 'text' => $locale->text('Invoice Number'), },
 +    'lastcost'           => { 'text' => $locale->text('Last Cost'), },
 +    'linetotallastcost'  => { 'text' => $locale->text('Extended'), },
 +    'linetotallistprice' => { 'text' => $locale->text('Extended'), },
 +    'linetotalsellprice' => { 'text' => $locale->text('Extended'), },
 +    'listprice'          => { 'text' => $locale->text('List Price'), },
 +    'microfiche'         => { 'text' => $locale->text('Microfiche'), },
 +    'name'               => { 'text' => $locale->text('Name'), },
 +    'onhand'             => { 'text' => $locale->text('Qty'), },
 +    'ordnumber'          => { 'text' => $locale->text('Order Number'), },
 +    'partnumber'         => { 'text' => $locale->text('Part Number'), },
 +    'partsgroup'         => { 'text' => $locale->text('Group'), },
 +    'priceupdate'        => { 'text' => $locale->text('Updated'), },
 +    'quonumber'          => { 'text' => $locale->text('Quotation'), },
 +    'rop'                => { 'text' => $locale->text('ROP'), },
 +    'sellprice'          => { 'text' => $locale->text('Sell Price'), },
 +    'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
 +    'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
 +    'transdate'          => { 'text' => $locale->text('Transdate'), },
 +    'unit'               => { 'text' => $locale->text('Unit'), },
 +    'weight'             => { 'text' => $locale->text('Weight'), },
 +  );
 +
    $revers     = $form->{revers};
    $lastsort   = $form->{lastsort};
  
@@@ -1123,6 -1094,7 +1123,7 @@@
      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);
@@@ -1143,14 -1115,7 +1144,14 @@@
    }
  
    # special case for lastcost
 -  $form->{l_lastcost} = "" if $form->{ledgerchecks};
 +  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
 +    $column_defs{sellprice}{text} = $locale->text('Price');
 +    $form->{l_lastcost} = "" 
 +  }
  
    if ($form->{description}) {
      $description = $form->{description};
@@@ -1191,7 -1156,7 +1192,7 @@@
      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 };
@@@ -1200,9 -1165,38 +1201,8 @@@
  
    push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
  
 -  my %column_defs = (
 -    'bin'                => { 'text' => $locale->text('Bin'), },
 -    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
 -    'description'        => { 'text' => $locale->text('Part Description'), },
 -    'drawing'            => { 'text' => $locale->text('Drawing'), },
 -    'image'              => { 'text' => $locale->text('Image'), },
 -    'invnumber'          => { 'text' => $locale->text('Invoice Number'), },
 -    'lastcost'           => { 'text' => $locale->text('Last Cost'), },
 -    'linetotallastcost'  => { 'text' => $locale->text('Extended'), },
 -    'linetotallistprice' => { 'text' => $locale->text('Extended'), },
 -    'linetotalsellprice' => { 'text' => $locale->text('Extended'), },
 -    'listprice'          => { 'text' => $locale->text('List Price'), },
 -    'microfiche'         => { 'text' => $locale->text('Microfiche'), },
 -    'name'               => { 'text' => $locale->text('Name'), },
 -    'onhand'             => { 'text' => $locale->text('Qty'), },
 -    'ordnumber'          => { 'text' => $locale->text('Order Number'), },
 -    'partnumber'         => { 'text' => $locale->text('Part Number'), },
 -    'partsgroup'         => { 'text' => $locale->text('Group'), },
 -    'priceupdate'        => { 'text' => $locale->text('Updated'), },
 -    'quonumber'          => { 'text' => $locale->text('Quotation'), },
 -    'rop'                => { 'text' => $locale->text('ROP'), },
 -    'sellprice'          => { 'text' => $locale->text('Sell Price'), },
 -    'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
 -    'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
 -    'transdate'          => { 'text' => $locale->text('Transdate'), },
 -    'unit'               => { 'text' => $locale->text('Unit'), },
 -    'weight'             => { 'text' => $locale->text('Weight'), },
 -    'ean'                => { 'text' => $locale->text('EAN'), },
 -    %column_defs_cvars,
 -  );
 -
 -  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
 +  %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);