projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc/skr04-update-3804 nach DocBook gewandelt
[kivitendo-erp.git]
/
bin
/
mozilla
/
do.pl
diff --git
a/bin/mozilla/do.pl
b/bin/mozilla/do.pl
index
45d807e
..
9d28bbb
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}) {
@@
-830,7
+831,7
@@
sub invoice {
# show pricegroup in newly loaded invoice when creating invoice from delivery order
for my $i (1 .. $form->{rowcount}) {
# show pricegroup in newly loaded invoice when creating invoice from delivery order
for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_pg_$i"} = join
/--/
, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
+ $form->{"sellprice_pg_$i"} = join
'--'
, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
}
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};
}
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};
@@
-936,7
+937,7
@@
sub invoice_multi {
# show pricegroup in newly loaded invoice when creating invoice from delivery order
for my $i (1 .. $form->{rowcount}) {
# show pricegroup in newly loaded invoice when creating invoice from delivery order
for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_pg_$i"} = join
/--/
, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
+ $form->{"sellprice_pg_$i"} = join
'--'
, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
}
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};
}
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};