projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
PE.pm
diff --git
a/SL/PE.pm
b/SL/PE.pm
index
31a8bd5
..
4d7176d
100644
(file)
--- a/
SL/PE.pm
+++ b/
SL/PE.pm
@@
-59,6
+59,9
@@
sub partsgroups {
$where .=
qq| AND id NOT IN | .
qq| (SELECT DISTINCT partsgroup_id FROM parts | .
$where .=
qq| AND id NOT IN | .
qq| (SELECT DISTINCT partsgroup_id FROM parts | .
+ qq| WHERE NOT partsgroup_id ISNULL | .
+ qq| UNION | .
+ qq| SELECT DISTINCT partsgroup_id FROM custom_variable_config_partsgroups | .
qq| WHERE NOT partsgroup_id ISNULL) |;
}
qq| WHERE NOT partsgroup_id ISNULL) |;
}
@@
-96,7
+99,7
@@
sub save_partsgroup {
if ($form->{id}) {
$query = qq|UPDATE partsgroup SET partsgroup = ? WHERE id = ?|;
if ($form->{id}) {
$query = qq|UPDATE partsgroup SET partsgroup = ? WHERE id = ?|;
-
push(@values, $form->{id});
+ push(@values, $form->{id});
} else {
$query = qq|INSERT INTO partsgroup (partsgroup) VALUES (?)|;
}
} else {
$query = qq|INSERT INTO partsgroup (partsgroup) VALUES (?)|;
}
@@
-129,6
+132,12
@@
sub get_partsgroup {
$dbh->disconnect;
$dbh->disconnect;
+ # also not orphaned if partsgroup is selected for a cvar filter
+ if ($form->{orphaned}) {
+ my $cvar_count = scalar( @{ SL::DB::PartsGroup->new(id => $form->{id})->custom_variable_configs } );
+ $form->{orphaned} = !$cvar_count;
+ }
+
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
@@
-172,7
+181,7
@@
sub pricegroups {
my $first = 1;
$where .= qq| AND id NOT IN (|;
my $first = 1;
$where .= qq| AND id NOT IN (|;
- foreach my $table (qw(invoice orderitems prices
rmaitems
)) {
+ foreach my $table (qw(invoice orderitems prices)) {
$where .= "UNION " unless ($first);
$first = 0;
$where .=
$where .= "UNION " unless ($first);
$first = 0;
$where .=
@@
-219,7
+228,7
@@
sub save_pricegroup {
if ($form->{id}) {
$query = qq|UPDATE pricegroup SET pricegroup = ? WHERE id = ? |;
if ($form->{id}) {
$query = qq|UPDATE pricegroup SET pricegroup = ? WHERE id = ? |;
-
push(@values, $form->{id});
+ push(@values, $form->{id});
} else {
$query = qq|INSERT INTO pricegroup (pricegroup) VALUES (?)|;
}
} else {
$query = qq|INSERT INTO pricegroup (pricegroup) VALUES (?)|;
}
@@
-253,7
+262,7
@@
sub get_pricegroup {
my @values = ();
$query = qq|SELECT |;
my @values = ();
$query = qq|SELECT |;
- foreach my $table (qw(invoice orderitems prices
rmaitems
)) {
+ foreach my $table (qw(invoice orderitems prices)) {
$query .= " + " unless ($first);
$first = 0;
$query .= qq|(SELECT COUNT(*) FROM $table WHERE pricegroup_id = ?) |;
$query .= " + " unless ($first);
$first = 0;
$query .= qq|(SELECT COUNT(*) FROM $table WHERE pricegroup_id = ?) |;