BDVs für abweichende Lieferadresse auch in Verkaufsrechnungen anzeigen

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 15105d31d97cbc9fd2ea8260970ffe438ded23fa..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();
 
 
   $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,
   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,
                              : ($::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
   });
 ##print $form->parse_html_template('is/_payments'); # parser
 ##print $form->parse_html_template('webdav/_list'); # parser

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 23646f105c1823d7c5a9427dd02d006a47d1a12c..c5bb70cf818930a791dedcbb425f1a87e5adb9c8 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -152,7 +152,7 @@
 <input type="hidden" name="gldate" value="[% gldate %]">
 
 <div id="shipto_inputs" class="hidden">
 <input type="hidden" name="gldate" value="[% gldate %]">
 
 <div id="shipto_inputs" class="hidden">

- [%- PROCESS 'common/_ship_to_dialog.html' %]
+ [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]

 </div>
 
 <div id="email_inputs" style="display: none"></div>
 </div>
 
 <div id="email_inputs" style="display: none"></div>