X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=0d5941cb0b4f5c9ed812891b6ae2e98c71ff9e5b;hb=08b6539d1b4a06760bd12208b76f15e767d336d4;hp=f7e859e5b66ad2f8853805144191eab47e8e5b01;hpb=831f10968e839d686e9d10881211ecdc578de613;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index f7e859e5b..0d5941cb0 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -48,8 +48,6 @@ require "bin/mozilla/reportgenerator.pl"; use strict; -my $print_post; - 1; # end of main @@ -367,7 +365,7 @@ sub update_delivery_order { if ($rows > 1) { select_item(); - exit; + ::end_of_request(); } else { @@ -619,7 +617,7 @@ sub save { # if the name changed get new values if (check_name($form->{vc})) { update(); - exit; + ::end_of_request(); } $form->{id} = 0 if $form->{saveasnew}; @@ -639,7 +637,7 @@ sub save { if(!exists $form->{addition}) { $form->{snumbers} = qq|donumber_| . $form->{donumber}; $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history; } # /saving the history @@ -647,7 +645,7 @@ sub save { if(!$form->{print_and_save}) { set_headings("edit"); update(); - exit; + ::end_of_request(); } $main::lxdebug->leave_sub(); } @@ -685,12 +683,12 @@ sub delete_delivery_order { if(!exists $form->{addition}) { $form->{snumbers} = qq|donumber_| . $form->{donumber}; $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history; } # /saving the history $form->info($locale->text('Delivery Order deleted!')); - exit(); + ::end_of_request(); } $form->error($locale->text('Cannot delete delivery order!')); @@ -734,7 +732,7 @@ sub invoice { for my $i (1 .. $form->{rowcount}) { # für bug 1284 - if ($form->{discount}){ # Falls wir einen Kundenrabatt haben + if ($form->{discount}){ # Falls wir einen Kundenrabatt haben # und keinen anderen discount wert an $i ... $form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt } @@ -905,8 +903,6 @@ sub e_mail { $form->{print_and_save} = 1; - $print_post = 1; - my $saved_form = save_form(); save(); @@ -1232,7 +1228,7 @@ sub transfer_in { update(); $main::lxdebug->leave_sub(); - exit 0; + ::end_of_request(); } } @@ -1346,7 +1342,7 @@ sub transfer_out { update(); $main::lxdebug->leave_sub(); - exit 0; + ::end_of_request(); } }