From: Niclas Zimmermann <niclas@lx-office-hosting.de>
Date: Thu, 13 Sep 2012 12:49:02 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~238
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/ffac48200e07de28e9efcb20c668ba3f1e3ed12e?hp=-c

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

ffac48200e07de28e9efcb20c668ba3f1e3ed12e
diff --combined bin/mozilla/oe.pl
index cac445036,683801aaa..51b3c77ca
--- a/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'), },