From 1b4946a763499335d0cfdd3e4817a16c8d3ca122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 31 May 2011 10:54:53 +0200
Subject: [PATCH] Use all operators in ir.rule operator for issue2029

---
 trytond/ir/rule.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/trytond/ir/rule.py b/trytond/ir/rule.py
index cce65203ad..c8f8867790 100644
--- a/trytond/ir/rule.py
+++ b/trytond/ir/rule.py
@@ -8,6 +8,7 @@ from trytond.tools import safe_eval
 from trytond.pyson import Eval, Get
 from trytond.transaction import Transaction
 from trytond.cache import Cache
+from trytond.const import OPERATORS
 
 
 class RuleGroup(ModelSQL, ModelView):
@@ -90,18 +91,22 @@ class Rule(ModelSQL, ModelView):
     field = fields.Many2One('ir.model.field', 'Field',
        domain=[('model', '=', Get(Eval('_parent_rule_group', {}), 'model'))],
        select=1, required=True)
-    operator = fields.Selection([
-       ('=', '='),
-       ('<>', '<>'),
-       ('<=', '<='),
-       ('>=', '>='),
-       ('in', 'in'),
-       ('child_of', 'child_of'),
-       ], 'Operator', required=True, translate=False)
+    operator = fields.Selection([(x, x) for x in OPERATORS], 'Operator',
+        required=True, translate=False)
     operand = fields.Selection('get_operand','Operand', required=True)
     rule_group = fields.Many2One('ir.rule.group', 'Group', select=2,
        required=True, ondelete="CASCADE")
 
+    def init(self, module_name):
+        cursor = Transaction().cursor
+
+        # Migration from 2.0: rename operator '<>' into '!='
+        cursor.execute('UPDATE "%s" '
+            'SET operator = %%s '
+            'WHERE operator = %%s' % self._table, ('!=', '<>'))
+
+        super(Rule, self).init(module_name)
+
     def _operand_get(self, obj_name='', level=3, recur=None, root_tech='', root=''):
         res = {}
         if not obj_name:
@@ -191,11 +196,8 @@ class Rule(ModelSQL, ModelView):
         with contextlib.nested(Transaction().set_user(0),
                 Transaction().set_context(user=0)):
             for rule in self.browse(ids):
-                operator = rule.operator
-                if operator == '<>':
-                    operator = '!='
                 dom = safe_eval("[('%s', '%s', %s)]" % \
-                        (rule.field.name, operator,
+                        (rule.field.name, rule.operator,
                             operand2query[rule.operand]), {
                                 'user': self.pool.get('res.user').browse(user),
                                 'time': time,