CVars über die Warenmaske auch in Belegen suchen.

Fix für Bug 1209.

diff --git a/SL/CVar.pm b/SL/CVar.pm
index 4d9b6a700b846e9a1192c5296a4b47529f88aec1..cdc05b5abf183825cb9045529333fbb702f315b5 100644 (file)
--- a/SL/CVar.pm
+++ b/SL/CVar.pm
@@ -490,8 +490,7 @@ sub build_filter_query {
     }
 
     if (@sub_where) {
     }
 
     if (@sub_where) {

-      push @sub_where,  qq|cvar.sub_module = ?|;
-      push @sub_values, "$params{sub_module}";
+      add_token(\@sub_where, \@sub_values, col => 'cvar.sub_module', val => $params{sub_module} || '');

 
       push @where,
         qq|$not EXISTS(
 
       push @where,
         qq|$not EXISTS(

diff --git a/SL/IC.pm b/SL/IC.pm
index 080aedffef7692194d174c99122cfa154c16407b..bce0debe7955d160541779084c42d9bb49cd567b 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -35,7 +35,7 @@
 package IC;
 
 use Data::Dumper;
 package IC;
 
 use Data::Dumper;

-use List::MoreUtils qw(all any);
+use List::MoreUtils qw(all any uniq);

 use YAML;
 
 use SL::CVar;
 use YAML;
 
 use SL::CVar;


@@ -1005,9 +1005,23 @@ sub all_parts {
   my $where_clause  = join ' AND ', map { "($_)" } @where_tokens;
   my $group_clause  = ' GROUP BY ' . join ', ',    map { $token_builder->($_) } @group_tokens if scalar @group_tokens;
 
   my $where_clause  = join ' AND ', map { "($_)" } @where_tokens;
   my $group_clause  = ' GROUP BY ' . join ', ',    map { $token_builder->($_) } @group_tokens if scalar @group_tokens;
 

-  my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'IC',
-                                                            'trans_id_field' => 'p.id',
-                                                            'filter'         => $form);
+  my %oe_flag_to_cvar = (
+    bought   => 'invoice',
+    sold     => 'invoice',
+    onorder  => 'orderitems',
+    ordered  => 'orderitems',
+    rfq      => 'orderitems',
+    quoted   => 'orderitems',
+  );
+
+  my ($cvar_where, @cvar_values) = CVar->build_filter_query(
+    module         => 'IC',
+    trans_id_field => $bsooqr ? 'ioi.id': 'p.id',
+    filter         => $form,
+    sub_module     => $bsooqr ? [ uniq grep { $oe_flag_to_cvar{$form->{$_}} } @oe_flags ] : undef,
+  );
+
+  $::lxdebug->dump(0,  "\@cvar_val", \@cvar_values);

 
   if ($cvar_where) {
     $where_clause .= qq| AND ($cvar_where)|;
 
   if ($cvar_where) {
     $where_clause .= qq| AND ($cvar_where)|;