PriceRule: Bei Mengen statt "<", ">" die ">=" und "<=" anbieten.

diff --git a/SL/DB/Manager/PriceRuleItem.pm b/SL/DB/Manager/PriceRuleItem.pm
index 7bd8840df071757ba612ca04c79cce4e14b972a3..a96a8b3d3c4d493abda9278ef3066f72c61f1d0b 100644 (file)
--- a/SL/DB/Manager/PriceRuleItem.pm
+++ b/SL/DB/Manager/PriceRuleItem.pm
@@ -19,7 +19,7 @@ my @types = qw(
 );
 
 my %ops = (
 );
 
 my %ops = (

-  'num'  => { eq => '=', lt => '<', gt => '>' },
+  'num'  => { eq => '=', le => '<=', ge => '>=' },

   'date' => { eq => '=', lt => '<', gt => '>' },
 );
 
   'date' => { eq => '=', lt => '<', gt => '>' },
 );
 

diff --git a/locale/de/all b/locale/de/all
index 172c4c08b761cbd4dcbbcc90fafd59574de16068..54d2061fc73ce500d52a0212c28fc9ec7475c467 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3094,8 +3094,8 @@ $self->{texts} = {
   'is after'                    => 'ist nach dem',
   'is before'                   => 'ist vor dem',
   'is equal to'                 => 'ist gleich',
   'is after'                    => 'ist nach dem',
   'is before'                   => 'ist vor dem',
   'is equal to'                 => 'ist gleich',

-  'is greater than'             => 'ist größer als',
-  'is lower than'               => 'ist kleiner als',
+  'is greater than or equal'    => 'ist größer oder gleich',
+  'is lower than or equal'      => 'ist kleiner oder gleich',

   'kivitendo'                   => 'kivitendo',
   'kivitendo Homepage'          => 'Infos zu kivitendo',
   'kivitendo can fix these problems automatically.' => 'kivitendo kann solche Probleme automatisch beheben.',
   'kivitendo'                   => 'kivitendo',
   'kivitendo Homepage'          => 'Infos zu kivitendo',
   'kivitendo can fix these problems automatically.' => 'kivitendo kann solche Probleme automatisch beheben.',

diff --git a/templates/webpages/price_rule/item.html b/templates/webpages/price_rule/item.html
index 1bff4b9b9b286286d7c4ba7fa62952b955b95c51..78515e87a7d07fa81091dd9b37f3de54d05f6b8a 100644 (file)
--- a/templates/webpages/price_rule/item.html
+++ b/templates/webpages/price_rule/item.html
@@ -4,8 +4,8 @@
 [%- USE LxERP %]
 [% SET num_compare_ops = [
   [ 'eq', LxERP.t8('is equal to') ],
 [%- USE LxERP %]
 [% SET num_compare_ops = [
   [ 'eq', LxERP.t8('is equal to') ],

-  [ 'lt', LxERP.t8('is lower than') ],
-  [ 'gt', LxERP.t8('is greater than') ],
+  [ 'le', LxERP.t8('is lower than or equal') ],
+  [ 'ge', LxERP.t8('is greater than or equal') ],

 ] %]
 [% SET date_compare_ops = [
   [ 'eq', LxERP.t8('is equal to') ],
 ] %]
 [% SET date_compare_ops = [
   [ 'eq', LxERP.t8('is equal to') ],