X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/49556f01cfe6a395cf5554e1a00dc61d6da0493e..a2bab345aedcfbb03bdf0e0aa1f28a5c57a5d02b:/SL/PE.pm

diff --git a/SL/PE.pm b/SL/PE.pm
index 28f3ba5c1..4d7176dd2 100644
--- 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 | .
+      qq|   WHERE NOT partsgroup_id ISNULL | .
+      qq| UNION | .
+      qq|   SELECT DISTINCT partsgroup_id FROM custom_variable_config_partsgroups | .
       qq|   WHERE NOT partsgroup_id ISNULL) |;
   }
 
@@ -129,6 +132,12 @@ sub get_partsgroup {
 
   $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();
 }