From 285578d375248bccf0f244d4835d7972bd0a4a88 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo.de>
Date: Thu, 18 Oct 2018 09:44:06 +0200
Subject: [PATCH] =?utf8?q?BDVs=20f=C3=BCr=20abweichende=20Lieferadresse=20?=
 =?utf8?q?auch=20in=20Verkaufsrechnungen=20anzeigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/is.pl                      | 7 +++++++
 templates/webpages/is/form_footer.html | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 15105d31d..a9e2963de 100644
--- 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
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 23646f105..c5bb70cf8 100644
--- 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">
- [%- PROCESS 'common/_ship_to_dialog.html' %]
+ [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]
 </div>
 
 <div id="email_inputs" style="display: none"></div>
-- 
2.20.1