From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 5 Mar 2010 10:10:55 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~23^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2e8ce008611246347f9682d81e8fabf015765bf5;p=kivitendo-erp.git

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

Conflicts:

	bin/mozilla/ic.pl
---

2e8ce008611246347f9682d81e8fabf015765bf5
diff --cc bin/mozilla/ic.pl
index 4b0e9e34f,29a39ed65..ebdaba52f
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@@ -1200,9 -1165,38 +1201,8 @@@ sub generate_report 
  
    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);