From 5bafcdd75fe8da638a141cfd42e3cd450a675cd2 Mon Sep 17 00:00:00 2001
From: Bernd Blessmann <bibi@online.de>
Date: Wed, 11 Jan 2012 11:31:50 +0100
Subject: [PATCH] =?utf8?q?Fix=20f=C3=BCr=20Bug=201708=20-=20Fehlender=20?=
 =?utf8?q?=C3=9Cbertrag=20der=20Lieferadresse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Lieferadresse wird beim Umwandeln von Angebote/Anfragen zu Aufträgen,
von Aufträgen zu Lieferscheinen und von Lieferscheinen zu Rechnungen
nicht mehr mit den Stammdaten überschrieben.
---
 bin/mozilla/do.pl | 3 ++-
 bin/mozilla/oe.pl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 45d807e2b..37353dcca 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -174,7 +174,7 @@ sub order_links {
                'ids' => $form->{id});
 
   $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes currency));
-  $form->{shipto} = 1 if $form->{id};
+  $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
 
   # get customer / vendor
   if ($form->{vc} eq 'vendor') {
@@ -782,6 +782,7 @@ sub invoice {
   require "bin/mozilla/$form->{script}";
 
   my $currency = $form->{currency};
+  $form->{shipto} = 1 if $form->{convert_from_do_ids};
   invoice_links();
 
   if ($form->{ordnumber}) {
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index dd1d8e2c7..40a9b4e02 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -240,7 +240,7 @@ sub order_links {
   $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"};
 
   $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id currency));
-  $form->{shipto} = 1 if $form->{id};
+  $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
 
   # get customer / vendor
   IR->get_vendor(\%myconfig, \%$form)   if $form->{type} =~ /(purchase_order|request_quotation)/;
-- 
2.20.1