From 602d5908d394bfa3d9169f9d6dd0ed95a52fdccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 27 Dec 2012 22:06:04 +0100
Subject: [PATCH] Replace (Field, Operator, Operand) by Domain in Rule

review599002
---
 line.xml | 8 ++------
 work.xml | 5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/line.xml b/line.xml
index 8cd92c788f..e05e287f4b 100644
--- a/line.xml
+++ b/line.xml
@@ -65,9 +65,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="default_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_line1">
-            <field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.line')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Employee</field>
+            <field name="domain">[('employee', '=', user.employee.id if user.employee else None)]</field>
             <field name="rule_group" ref="rule_group_line"/>
         </record>
         <record model="ir.rule.group" id="rule_group_line_admin">
@@ -156,9 +154,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="default_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_hours_employee1">
-            <field name="field" search="[('name', '=', 'employee'), ('model.model', '=', 'timesheet.hours_employee')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Employee</field>
+            <field name="domain">[('employee', '=', user.employee.id if user.employee else None)]</field>
             <field name="rule_group" ref="rule_group_hours_employee"/>
         </record>
         <record model="ir.rule.group" id="rule_group_hours_employee_admin">
diff --git a/work.xml b/work.xml
index 90625e4113..93a6fab09e 100644
--- a/work.xml
+++ b/work.xml
@@ -243,10 +243,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="default_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work1">
-            <field name="field" search="[('name', '=', 'company'),
-                                        ('model.model', '=', 'timesheet.work')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_work"/>
         </record>
         <record model="ir.rule.group" id="rule_group_work_admin">