projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge von 588 aus unstable:
[kivitendo-erp.git]
/
SL
/
IS.pm
diff --git
a/SL/IS.pm
b/SL/IS.pm
index
b74a794
..
eac4440
100644
(file)
--- a/
SL/IS.pm
+++ b/
SL/IS.pm
@@
-1357,7
+1357,7
@@
sub get_customer {
# get shipto if we did not converted an order or invoice
if (!$form->{shipto}) {
map { delete $form->{$_} }
# get shipto if we did not converted an order or invoice
if (!$form->{shipto}) {
map { delete $form->{$_} }
- qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
+ qw(shiptoname shipto
department_1 shiptodepartment_2 shipto
street shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
$query = qq|SELECT s.* FROM shipto s
WHERE s.trans_id = $form->{customer_id}|;
$query = qq|SELECT s.* FROM shipto s
WHERE s.trans_id = $form->{customer_id}|;