projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gelöschte Benutzer in ar/search ausblenden
[kivitendo-erp.git]
/
bin
/
mozilla
/
do.pl
diff --git
a/bin/mozilla/do.pl
b/bin/mozilla/do.pl
index
37353dc
..
39cba4a
100644
(file)
--- a/
bin/mozilla/do.pl
+++ b/
bin/mozilla/do.pl
@@
-266,8
+266,7
@@
sub form_header {
if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
- $form->get_lists("contacts" => "ALL_CONTACTS",
- "shipto" => "ALL_SHIPTO",
+ $form->get_lists("shipto" => "ALL_SHIPTO",
"projects" => {
"key" => "ALL_PROJECTS",
"all" => 0,
"projects" => {
"key" => "ALL_PROJECTS",
"all" => 0,
@@
-280,6
+279,15
@@
sub form_header {
"departments" => "ALL_DEPARTMENTS",
"business_types" => "ALL_BUSINESS_TYPES",
);
"departments" => "ALL_DEPARTMENTS",
"business_types" => "ALL_BUSINESS_TYPES",
);
+ $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all(query => [
+ or => [
+ cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
+ and => [
+ cp_cv_id => undef,
+ cp_id => $::form->{cp_id} * 1
+ ]
+ ]
+ ]);
map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} };
map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} };
map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} };
map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} };
@@
-831,7
+839,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};
@@
-937,7
+945,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};