X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7f596996a8925fb6fa32c51f9dd4c32a24728c99..f7f03503cfc22a15f5497d09dd9215c10c1d39b1:/bin/mozilla/oe.pl
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 4eab4dce3..f73c43776 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -153,6 +153,8 @@ sub edit {
check_oe_access();
+ $form->{taxincluded_changed_by_user} = 1;
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
@@ -475,7 +477,9 @@ sub form_footer {
$TMPL_VAR{notes} = qq||;
$TMPL_VAR{intnotes} = qq||;
- IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
+ my $paymet_id = $::form->{payment_id};
+ IS->get_customer(\%myconfig, $::form) if $form->{type} =~ /sales_(order|quotation)/;
+ $::form->{payment_id} = $paymet_id;
if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
$form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
@@ -777,6 +781,7 @@ sub orders {
my @columns = (
"transdate", "reqdate",
"id", $ordnumber,
+ "customernumber",
"name", "netamount",
"tax", "amount",
"curr", "employee",
@@ -836,6 +841,7 @@ sub orders {
'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'), },
@@ -1219,7 +1225,7 @@ sub save {
$form->{simple_save} = 1;
if(!$form->{print_and_save}) {
- delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])};
+ delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
edit();
::end_of_request();
}
@@ -1453,8 +1459,6 @@ sub backorder_exchangerate {
$form->header;
print qq|
-
-
-
-
-