From 26ae178f70e8f0b44493ec7f501ec9eb28342229 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 12 May 2011 16:09:04 +0200 Subject: [PATCH] =?utf8?q?Bei=20Umwandlung=20Angebot=20->=20Auftrag=20ausg?= =?utf8?q?ew=C3=A4hlte=20Lieferadresse=20beibehalten?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/oe.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 1d98eabc0..14340d3f8 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -238,14 +238,14 @@ 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)); + $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id)); $form->{shipto} = 1 if $form->{id}; # get customer / vendor IR->get_vendor(\%myconfig, \%$form) if $form->{type} =~ /(purchase_order|request_quotation)/; IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/; - $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id)); + $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id)); $form->restore_vars(qw(taxincluded)) if $form->{id}; $form->restore_vars(qw(salesman_id)) if $editing; $form->{forex} = $form->{exchangerate}; @@ -1767,6 +1767,8 @@ sub sales_order { sub poso { $main::lxdebug->enter_sub(); + $::form->{"Watchdog::shipto_id"} = 2; + my $form = $main::form; my %myconfig = %main::myconfig; -- 2.20.1