X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=f05bcfb85151c2021cce8eb97565c29f8399eadd;hb=fdfd7f203f3ff64a86e232a8fe30b865d5a8d9bb;hp=5965bf59cc849943c1c84a11161e87d16b269634;hpb=9aa0d477fce0ad1a9b573df01912095b312a17b6;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 5965bf59c..f05bcfb85 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -745,7 +745,8 @@ sub orders { "shipvia", "globalprojectnumber", "transaction_description", "open", "delivered", "marge_total", "marge_percent", - "country", "ustid", + "vcnumber", "ustid", + "country", ); # only show checkboxes if gotten here via sales_order form. @@ -782,7 +783,7 @@ sub orders { my @hidden_variables = map { "l_${_}" } @columns; push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber transaction_description transdatefrom transdateto type vc employee_id salesman_id - reqdatefrom reqdateto); + reqdatefrom reqdateto projectnumber project_id); my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); @@ -807,6 +808,7 @@ sub orders { 'delivered' => { 'text' => $locale->text('Delivered'), }, 'marge_total' => { 'text' => $locale->text('Ertrag'), }, 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), }, + 'vcnumber' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), }, 'country' => { 'text' => $locale->text('Country'), }, 'ustid' => { 'text' => $locale->text('USt-IdNr.'), }, ); @@ -1367,7 +1369,8 @@ sub invoice { $form->{type} = "invoice"; # locale messages - $locale = new Locale "$myconfig{countrycode}", "$script"; + $main::locale = new Locale "$myconfig{countrycode}", "$script"; + $locale = $main::locale; require "bin/mozilla/$form->{script}";