projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kosmetik
[kivitendo-erp.git]
/
bin
/
mozilla
/
oe.pl
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
bef2317
..
20bb0fd
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-50,8
+50,7
@@
require "bin/mozilla/reportgenerator.pl";
use strict;
use strict;
-my $print_post;
-my %TMPL_VAR;
+our %TMPL_VAR;
1;
1;
@@
-302,7
+301,7
@@
sub form_header {
check_oe_access();
# Container for template variables. Unfortunately this has to be
check_oe_access();
# Container for template variables. Unfortunately this has to be
- # visible in form_footer too, so
my at package level and not
here.
+ # visible in form_footer too, so
package local level and not my
here.
%TMPL_VAR = ();
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
%TMPL_VAR = ();
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
@@
-563,7
+562,7
@@
sub update {
if ($rows > 1) {
&select_item;
if ($rows > 1) {
&select_item;
-
exit
;
+
::end_of_request()
;
} else {
} else {
@@
-1010,7
+1009,7
@@
sub save_and_close {
$form->{payment_id} = $payment_id;
}
&update;
$form->{payment_id} = $payment_id;
}
&update;
-
exit
;
+
::end_of_request()
;
}
$form->{id} = 0 if $form->{saveasnew};
}
$form->{id} = 0 if $form->{saveasnew};
@@
-1064,7
+1063,7
@@
sub save_and_close {
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "SAVED";
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "SAVED";
- $form->save_history
($form->dbconnect(\%myconfig))
;
+ $form->save_history;
}
# /saving the history
}
# /saving the history
@@
-1119,7
+1118,7
@@
sub save {
$form->{payment_id} = $payment_id;
}
&update;
$form->{payment_id} = $payment_id;
}
&update;
-
exit
;
+
::end_of_request()
;
}
$form->{id} = 0 if $form->{saveasnew};
}
$form->{id} = 0 if $form->{saveasnew};
@@
-1172,7
+1171,7
@@
sub save {
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "SAVED";
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "SAVED";
- $form->save_history
($form->dbconnect(\%myconfig))
;
+ $form->save_history;
}
# /saving the history
}
# /saving the history
@@
-1180,7
+1179,7
@@
sub save {
if(!$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])};
edit();
if(!$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])};
edit();
-
exit
;
+
::end_of_request()
;
}
$main::lxdebug->leave_sub();
}
}
$main::lxdebug->leave_sub();
}
@@
-1260,11
+1259,11
@@
sub delete_order_quotation {
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "DELETED";
if(!exists $form->{addition}) {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
$form->{addition} = "DELETED";
- $form->save_history
($form->dbconnect(\%myconfig))
;
+ $form->save_history;
}
# /saving the history
$form->info($msg);
}
# /saving the history
$form->info($msg);
-
exi
t();
+
::end_of_reques
t();
}
$form->error($err);
}
$form->error($err);
@@
-1310,7
+1309,7
@@
sub invoice {
if (&check_name($form->{vc})) {
$form->{payment_id} = $payment_id if $form->{payment_id} eq "";
&update;
if (&check_name($form->{vc})) {
$form->{payment_id} = $payment_id if $form->{payment_id} eq "";
&update;
-
exit
;
+
::end_of_request()
;
}
$form->{cp_id} *= 1;
}
$form->{cp_id} *= 1;
@@
-1333,7
+1332,7
@@
sub invoice {
if (!$exchangerate) {
&backorder_exchangerate($orddate, $buysell);
if (!$exchangerate) {
&backorder_exchangerate($orddate, $buysell);
-
exit
;
+
::end_of_request()
;
}
}
}
}
@@
-1681,7
+1680,7
@@
sub check_for_direct_delivery {
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
-
exit 0
;
+
::end_of_request()
;
}
sub purchase_order {
}
sub purchase_order {
@@
-1858,8
+1857,6
@@
sub e_mail {
$form->{print_and_save} = 1;
$form->{print_and_save} = 1;
- $print_post = 1;
-
my $saved_form = save_form();
save();
my $saved_form = save_form();
save();
@@
-1899,9
+1896,7
@@
sub display_form {
}
$form->{"taxaccounts"} = "";
}
$form->{"taxaccounts"} = "";
- for my $i (1 .. $form->{"rowcount"}) {
- IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1) if $form->{"id_$i"};
- }
+ IC->retrieve_accounts(\%myconfig, $form, map { $_ => $form->{"id_$_"} } 1 .. $form->{rowcount});
$form->{rowcount}++;
$form->{"project_id_$form->{rowcount}"} = $form->{globalproject_id};
$form->{rowcount}++;
$form->{"project_id_$form->{rowcount}"} = $form->{globalproject_id};