projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Angleichung Verkaufsbericht an Verkauf-Berichte-Rechnungen
[kivitendo-erp.git]
/
bin
/
mozilla
/
oe.pl
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
51b3c77
..
3908f74
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-402,19
+402,18
@@
sub form_header {
}
}
}
}
- my $
onload = ""
;
+ my $
dispatch_to_popup = ''
;
if ($form->{resubmit} && ($form->{format} eq "html")) {
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
} 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;
} elsif ($creditwarning) {
} 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};
$TMPL_VAR{dateformat} = $myconfig{dateformat};
$TMPL_VAR{numberformat} = $myconfig{numberformat};
@@
-477,7
+476,9
@@
sub form_footer {
$TMPL_VAR{notes} = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
$TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
$TMPL_VAR{notes} = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
$TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
- 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};
if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
$form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
@@
-779,7
+780,7
@@
sub orders {
my @columns = (
"transdate", "reqdate",
"id", $ordnumber,
my @columns = (
"transdate", "reqdate",
"id", $ordnumber,
- "customernumber",
+ "customernumber",
"name", "netamount",
"tax", "amount",
"curr", "employee",
"name", "netamount",
"tax", "amount",
"curr", "employee",
@@
-1223,7
+1224,7
@@
sub save {
$form->{simple_save} = 1;
if(!$form->{print_and_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();
}
edit();
::end_of_request();
}
@@
-1457,8
+1458,6
@@
sub backorder_exchangerate {
$form->header;
print qq|
$form->header;
print qq|
-<body>
-
<form method=post action=$form->{script}>
|;
<form method=post action=$form->{script}>
|;
@@
-1510,9
+1509,6
@@
sub backorder_exchangerate {
. $locale->text('Continue') . qq|">
</form>
. $locale->text('Continue') . qq|">
</form>
-
-</body>
-</html>
|;
$main::lxdebug->leave_sub();
|;
$main::lxdebug->leave_sub();
@@
-2002,7
+1998,7
@@
sub edit_periodic_invoices_config {
$::form->{AR} = [ grep { $_->{link} =~ m/(?:^|:)AR(?::|$)/ } @{ $::form->{ALL_CHARTS} } ];
$::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
$::form->{AR} = [ grep { $_->{link} =~ m/(?:^|:)AR(?::|$)/ } @{ $::form->{ALL_CHARTS} } ];
$::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
- $::form->header();
+ $::form->header(
no_layout => 1
);
print $::form->parse_html_template('oe/edit_periodic_invoices_config', $config);
$::lxdebug->leave_sub();
print $::form->parse_html_template('oe/edit_periodic_invoices_config', $config);
$::lxdebug->leave_sub();