Fix für Bug 1708 - Fehlender Übertrag der Lieferadresse

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.

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));
                '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') {
 
   # get customer / vendor
   if ($form->{vc} eq 'vendor') {


@@ -782,6 +782,7 @@ sub invoice {
   require "bin/mozilla/$form->{script}";
 
   my $currency = $form->{currency};
   require "bin/mozilla/$form->{script}";
 
   my $currency = $form->{currency};

+  $form->{shipto} = 1 if $form->{convert_from_do_ids};

   invoice_links();
 
   if ($form->{ordnumber}) {
   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->{"$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)/;
 
   # get customer / vendor
   IR->get_vendor(\%myconfig, \%$form)   if $form->{type} =~ /(purchase_order|request_quotation)/;