Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 45d807e2b0c695a077f124a8d1c6558e3a57c73b..37353dccabc536427219f8d5963db355658965aa 100644 (file)
--- 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 dd1d8e2c7c372fe08c3c12b647ffa4f38849ddc5..40a9b4e024ac31f32836d09006a7babf77953927 100644 (file)
--- 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)/;

diff --git a/doc/changelog b/doc/changelog
index 632922c423bd0e171aded331c7646f494a9e5b0f..28cb78637852edd6d87d07d74f5dde43fb61904b 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -85,8 +85,7 @@
   - Bugfix 1756: Ertrag in Bruttorechnungen korrekt berechnen
   - Bugfix 1760 - 1760: Bei einem Lieferschein wird die Abteilung nicht mitgespeichert
   - Bugfix 1752: Rechnung -> Druckvorschau ignoriert Änderung des Steuersatz beim Beleg
-
-
+  - Bugfix 1708: Fehlender Übertrag der Lieferadresse von Angebot -> Auftragsbestätigung
 
 
 2011-06-15 - Release 2.6.3