X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/78df36d13721e785efbfcc6c17e400bb87cdc6e7..49eebab7bf88d196d5e8f92f43e09d9ee8eaea9d:/SL/DB/Manager/PriceRuleItem.pm

diff --git a/SL/DB/Manager/PriceRuleItem.pm b/SL/DB/Manager/PriceRuleItem.pm
index 60e5d8248..a96a8b3d3 100644
--- a/SL/DB/Manager/PriceRuleItem.pm
+++ b/SL/DB/Manager/PriceRuleItem.pm
@@ -19,7 +19,7 @@ my @types = qw(
 );
 
 my %ops = (
-  'num'  => { eq => '=', lt => '<', gt => '>' },
+  'num'  => { eq => '=', le => '<=', ge => '>=' },
   'date' => { eq => '=', lt => '<', gt => '>' },
 );
 
@@ -28,7 +28,7 @@ my %types = (
   'vendor'              => { description => t8('Vendor'),             customer => 0, vendor => 1, data_type => 'int',  data => sub { $_[0]->vendor->id }, },
   'business'            => { description => t8('Type of Business'),   customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[0]->customervendor->business_id }, exclude_nulls => 1 },
   'reqdate'             => { description => t8('Reqdate'),            customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->reqdate }, ops => 'date' },
-  'part'                => { description => t8('Part'),               customer => 1, vendor => 0, data_type => 'int',  data => sub { $_[1]->part->id }, },
+  'part'                => { description => t8('Part'),               customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->id }, },
   'pricegroup'          => { description => t8('Pricegroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->pricegroup_id }, exclude_nulls => 1 },
   'partsgroup'          => { description => t8('Group'),              customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 },
   'qty'                 => { description => t8('Qty'),                customer => 1, vendor => 1, data_type => 'num',  data => sub { $_[1]->qty }, ops => 'num' },
@@ -56,7 +56,7 @@ sub not_matching_sql_and_values {
         my $ops = $ops{$def->{ops}};
 
         for (keys %$ops) {
-          push @sub_tokens, "op = '$_' AND NOT value_$def->{data_type} $ops->{$_} ?";
+          push @sub_tokens, "op = '$_' AND NOT ? $ops->{$_} value_$def->{data_type}";
           push @values, $value;
         }
       } else {