From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 26 Sep 2014 13:58:34 +0000 (+0200)
Subject: PriceRule: Bei Mengen statt "<", ">" die ">=" und "<=" anbieten.
X-Git-Tag: release-3.2.0beta~134
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=49eebab7bf88d196d5e8f92f43e09d9ee8eaea9d;p=kivitendo-erp.git

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

diff --git a/SL/DB/Manager/PriceRuleItem.pm b/SL/DB/Manager/PriceRuleItem.pm
index 7bd8840df..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 => '>' },
 );
 
diff --git a/locale/de/all b/locale/de/all
index 172c4c08b..54d2061fc 100755
--- 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 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.',
diff --git a/templates/webpages/price_rule/item.html b/templates/webpages/price_rule/item.html
index 1bff4b9b9..78515e87a 100644
--- 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') ],
-  [ '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') ],