Zu 47da14db generische LS-Mail: locales und Anhak-Option in Suche

[mfinanz.git] / bin / mozilla / is.pl

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 0b82cd0d5dfa8531f11c9bc40fa3314b3bdd0770..a9e2963de9e87008e9c5cbb5660797f531931017 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -615,6 +615,12 @@ sub form_footer {
 
   $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
+  my $shipto_cvars       = SL::DB::Shipto->new->cvars_by_config;
+  foreach my $var (@{ $shipto_cvars }) {
+    my $name = "shiptocvar_" . $var->config->name;
+    $var->value($form->{$name}) if exists $form->{$name};
+  }
+
   print $form->parse_html_template('is/form_footer', {
     is_type_credit_note => ($form->{type} eq "credit_note"),
     totalpaid           => $totalpaid,
@@ -626,6 +632,7 @@ sub form_footer {
                              : ($::instance_conf->get_is_changeable == 1),
     today               => DateTime->today,
     vc_obj              => $form->{customer_id} ? SL::DB::Customer->load_cached($form->{customer_id}) : undef,
+    shipto_cvars        => $shipto_cvars,
   });
 ##print $form->parse_html_template('is/_payments'); # parser
 ##print $form->parse_html_template('webdav/_list'); # parser
@@ -784,10 +791,6 @@ sub update {
 
       } else {
         $form->{"id_$i"}   = 0;
-        if ( $form->{is_wrong_ptype} > 0 ) {
-          $form->{"partnumber_$i"}  = "";
-          $form->{"description_$i"} = "";
-        }
         new_item();
       }
     }