X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=e95aaf82c634dda5b3c86a8187505319bc35cfda;hb=9e152755a340c813514eb132de27349ae7a9e028;hp=10deb0cc1bf336b3267540fb0fa7e7ec536d998b;hpb=9e0b2baff3315e53a0e0aa9e66cae85e474def7a;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 10deb0cc1..e95aaf82c 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -883,7 +883,7 @@ sub invoice_multi { $vc_discount = $form->{vendor_discount}; } else { IS->get_customer(\%myconfig, \%$form); - $vc_discount = $form->parse_amount(\%myconfig, $form->{customer_discount}); + $vc_discount = $form->{customer_discount}; } restore_form($saved_form); @@ -1248,16 +1248,16 @@ sub set_stock_out { sub transfer_in { $main::lxdebug->enter_sub(); - save(no_redirect => 1); - my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - if (DO->is_marked_as_delivered('id' => $form->{id})) { + if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) { $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.'), 'back_button' => 1); } + save(no_redirect => 1); + my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount}); my @all_requests; @@ -1316,16 +1316,16 @@ sub transfer_in { sub transfer_out { $main::lxdebug->enter_sub(); - save(no_redirect => 1); - my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - if (DO->is_marked_as_delivered('id' => $form->{id})) { + if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) { $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.'), 'back_button' => 1); } + save(no_redirect => 1); + my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount}); my @all_requests;