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
28f3ba5
..
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) |;
}
@@
-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();
}