Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --combined bin/mozilla/oe.pl
index cac4450364597f9ba655751fe31f9de56dcfe7ba,683801aaa3e1268b673ead58a6ac404960bb54e1..51b3c77cab65b9b522cf4a6aeefdd0e57be91c2c
--- 1/bin/mozilla/oe.pl
--- 2/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@@ -153,6 -153,8 +153,8 @@@ sub edit 
  
    check_oe_access();
  
+   $form->{taxincluded_changed_by_user} = 1;
+ 
    # show history button
    $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
    #/show hhistory button
@@@ -777,7 -779,6 +779,7 @@@ sub orders 
    my @columns = (
      "transdate",               "reqdate",
      "id",                      $ordnumber,
 +    "customernumber", 
      "name",                    "netamount",
      "tax",                     "amount",
      "curr",                    "employee",
@@@ -837,7 -838,6 +839,7 @@@
      'ordnumber'               => { 'text' => $locale->text('Order'), },
      'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
      'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
 +    'customernumber'          => { 'text' => $locale->text('Customer Number'), },
      'netamount'               => { 'text' => $locale->text('Amount'), },
      'tax'                     => { 'text' => $locale->text('Tax'), },
      'amount'                  => { 'text' => $locale->text('Total'), },