From 6637a9e9f04f27fa9baf4e91a7b3549a7d649b8d Mon Sep 17 00:00:00 2001
From: Martin Helmling <MartinHelmling@octo-soft.de>
Date: Mon, 6 Jan 2014 18:50:17 +0100
Subject: [PATCH] =?utf8?q?Die=20Lieferadresse=20des=20Kunden=20wird=20nun?=
 =?utf8?q?=20bei=20Lieferantenauftr=C3=A4gen=20auch=20nach=20Wechsel=20des?=
 =?utf8?q?=20Lieferanten=20als=20Lieferadresse=20=C3=BCbernommen=20:=20che?=
 =?utf8?q?ck=5Ffor=5Fdirect=5Fdelivery.=20Falls=20ein=20Lieferant=20eine?=
 =?utf8?q?=20extra=20Lieferantenadresse=20besitzt,=20wird=20jedoch=20aus?=
 =?utf8?q?=20Kompatibilit=C3=A4tsgr=C3=BCnden=20diese=20Adresse=20eingeset?=
 =?utf8?q?zt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/oe.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f08a5249a..3ee71e67f 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -434,12 +434,14 @@ sub form_header {
   $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
 
   $form->header;
-
+  if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
+      $form->{shipto_id} = $form->{CFDD_shipto_id};
+  }
   $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
      qw(id action type vc formname media format proforma queued printed emailed
         title creditlimit creditremaining tradediscount business
         max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
-        shiptocity shiptocountry shiptocontact shiptophone shiptofax
+        CFDD_shipto shipto_id CFDD_shipto_id shiptocity shiptocountry shiptocontact shiptophone shiptofax
         shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
         message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus
         show_details),
@@ -1670,6 +1672,7 @@ sub check_for_direct_delivery_yes {
   delete @{$form}{grep /^shipto/, keys %{ $form }};
   map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form };
   $form->{shipto} = 1;
+  $form->{CFDD_shipto} = 1;
   purchase_order();
   $main::lxdebug->leave_sub();
 }
@@ -1683,6 +1686,7 @@ sub check_for_direct_delivery_no {
 
   $form->{direct_delivery_checked} = 1;
   delete @{$form}{grep /^shipto/, keys %{ $form }};
+  $form->{CFDD_shipto} = 0;
   purchase_order();
 
   $main::lxdebug->leave_sub();
-- 
2.20.1