X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=297abd2f3a172670aa5e5d2444c5408091296167;hb=fe950b4fbe00b393eb91889633992e7eb56d21e9;hp=ea96bcae97459f00889922df4b291cb6a1b6397d;hpb=519f43a20addf13a264c270f3a4d442f2c187be5;p=kivitendo-erp.git

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index ea96bcae9..297abd2f3 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -327,6 +327,11 @@ sub form_header {
 
   $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
 
+  my @custom_hidden;
+  push @custom_hidden, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
+
+  $::form->{HIDDENS} = [ map { +{ name => $_, value => $::form->{$_} } } (@custom_hidden) ];
+
   $form->header();
   # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
   # und Erweiterung für Bug 1760:
@@ -958,7 +963,8 @@ sub invoice_multi {
     IS->get_customer(\%myconfig, \%$form);
     $vc_discount = $form->{customer_discount};
   }
-  restore_form($saved_form);
+  # use payment terms from customer or vendor
+  restore_form($saved_form,0,qw(payment_id));
 
   $form->{rowcount} = 0;
   foreach my $ref (@{ $form->{form_details} }) {