From: Niclas Zimmermann Date: Thu, 18 Oct 2012 12:28:21 +0000 (+0200) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-3.0.0beta1~109^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/fc41222c61dbee590005f04c50e8603581462543?ds=inline;hp=-c Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- fc41222c61dbee590005f04c50e8603581462543 diff --combined bin/mozilla/ic.pl index 2dc3366d6,95fbbdeec..2cbad4f62 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@@ -288,7 -288,6 +288,6 @@@ sub update_prices # $form->header; # # print qq| - # #
# # @@@ -388,8 -387,6 +387,6 @@@ # . $locale->text('TOP100') . qq|"> # # - # - # #|; # $lxdebug->leave_sub(); #} #end list() @@@ -725,8 -722,6 +722,6 @@@ sub addtop100 my $colspan = $#column_index + 1; print qq| - -
@@@ -981,9 -976,6 +976,6 @@@ . $locale->text('choice') . qq|"> - - - |; $lxdebug->leave_sub(); @@@ -1032,7 -1024,6 +1024,7 @@@ sub generate_report 'bin' => { 'text' => $locale->text('Bin'), }, 'deliverydate' => { 'text' => $locale->text('deliverydate'), }, 'description' => { 'text' => $locale->text('Part Description'), }, + 'notes' => { 'text' => $locale->text('Notes'), }, 'drawing' => { 'text' => $locale->text('Drawing'), }, 'ean' => { 'text' => $locale->text('EAN'), }, 'image' => { 'text' => $locale->text('Image'), }, @@@ -1215,7 -1206,7 +1207,7 @@@ IC->all_parts(\%myconfig, \%$form); my @columns = qw( - partnumber description partsgroup bin onhand rop soldtotal unit listprice + partnumber description notes partsgroup bin onhand rop soldtotal unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber transdate name serialnumber deliverydate ean projectnumber projectdescription diff --combined templates/webpages/ic/search.html index c00b22a9f,aa9efa203..ffdf29bc2 --- a/templates/webpages/ic/search.html +++ b/templates/webpages/ic/search.html @@@ -2,7 -2,6 +2,6 @@@ [%- USE HTML %] [%- USE LxERP %] [%- USE L %] - @@@ -286,13 -285,6 +285,13 @@@ + + + + [% CUSTOM_VARIABLES_INCLUSION_CODE %]
$form->{title}
+ + +
@@@ -309,5 -301,3 +308,3 @@@

- -