Revert "Bugfix 1760 - Bei einem Lieferschein wird die Abteilung nicht mitgespeichert"

[kivitendo-erp.git] / bin / mozilla / do.pl

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index b9cfc02..7924b05 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -364,10 +364,13 @@ sub update_delivery_order {
 
   } else {
 
+    my $mode;
     if ($form->{type} eq 'purchase_delivery_order') {
       IR->retrieve_item(\%myconfig, $form);
+      $mode = 'IR';
     } else {
       IS->retrieve_item(\%myconfig, $form);
+      $mode = 'IS';
     }
 
     my $rows = scalar @{ $form->{item_list} };
@@ -377,7 +380,7 @@ sub update_delivery_order {
 
       if ($rows > 1) {
 
-        select_item();
+        select_item(mode => $mode);
         ::end_of_request();
 
       } else {
@@ -451,7 +454,7 @@ sub orders {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
-  my $cgi      = $main::cgi;
+  my $cgi      = $::request->{cgi};
 
   ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
 
@@ -883,7 +886,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);