X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=0bcb897bf98c446facfb361ab7fe7d92a46b4e8c;hb=5d0aec66f1d31f99c14944f6405c7fb712f99756;hp=683801aaa3e1268b673ead58a6ac404960bb54e1;hpb=ad1c22fa55d817038eba258ca9c29d43522416aa;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 683801aaa..0bcb897bf 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -402,19 +402,19 @@ sub form_header {
}
}
- my $onload = "";
+ my $dispatch_to_popup = '';
if ($form->{resubmit} && ($form->{format} eq "html")) {
- $onload = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
- $onload .= "document.do.submit();";
+ $dispatch_to_popup = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
+ $dispatch_to_popup .= "document.do.submit();";
} elsif ($form->{resubmit}) {
# emulate click for resubmitting actions
- $onload = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
- $onload .= "document.oe.submit();";
+ $dispatch_to_popup = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
+ $dispatch_to_popup .= "document.oe.submit();";
} elsif ($creditwarning) {
- $onload = "alert('$credittext')";
+ $::request->{layout}->add_javascripts_inline("alert('$credittext')");
}
- $TMPL_VAR{onload} = $onload;
+ $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
$TMPL_VAR{dateformat} = $myconfig{dateformat};
$TMPL_VAR{numberformat} = $myconfig{numberformat};
@@ -477,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};
@@ -779,6 +781,7 @@ sub orders {
my @columns = (
"transdate", "reqdate",
"id", $ordnumber,
+ "customernumber",
"name", "netamount",
"tax", "amount",
"curr", "employee",
@@ -838,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'), },
@@ -1221,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();
}
@@ -1455,8 +1459,6 @@ sub backorder_exchangerate {
$form->header;
print qq|
-
-
-
-
-