From eb754cc60760304ecbf23137836bee3396f7325b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 3 Jul 2011 18:02:55 +0200
Subject: [PATCH] Remove support of Many2Many field in record XML

---
 line.xml      | 12 ++++++++++--
 timesheet.xml | 20 ++++++++++++++------
 work.xml      |  6 +++++-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/line.xml b/line.xml
index 228d3b4363..967f781633 100644
--- a/line.xml
+++ b/line.xml
@@ -74,7 +74,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model" search="[('model', '=', 'timesheet.line')]"/>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
-            <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+        </record>
+        <record model="ir.rule.group-res.group"
+            id="rule_group_line_admin_group_timesheet_admin">
+            <field name="rule_group" ref="rule_group_line_admin"/>
+            <field name="group" ref="group_timesheet_admin"/>
         </record>
 
         <record model="ir.ui.view" id="enter_lines_init_view_form">
@@ -161,7 +165,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
-            <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+        </record>
+        <record model="ir.rule.group-res.group"
+            id="rule_group_hours_employee_admin_group_timesheet_admin">
+            <field name="rule_group" ref="rule_group_hours_employee_admin"/>
+            <field name="group" ref="group_timesheet_admin"/>
         </record>
 
         <record model="ir.ui.view" id="open_hours_employee_init_view_form">
diff --git a/timesheet.xml b/timesheet.xml
index b57f5fd82c..94a98c8251 100644
--- a/timesheet.xml
+++ b/timesheet.xml
@@ -6,18 +6,26 @@ this repository contains the full copyright notices and license terms. -->
         <record model="res.group" id="group_timesheet_admin">
             <field name="name">Timesheet Administration</field>
         </record>
-        <record model="res.user" id="res.user_admin">
-            <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+        <record model="res.user-res.group"
+            id="user_admin_group_timesheet_admin">
+            <field name="user" ref="res.user_admin"/>
+            <field name="group" ref="group_timesheet_admin"/>
         </record>
-        <record model="res.user" id="res.user_trigger">
-            <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+        <record model="res.user-res.group"
+            id="user_trigger_group_timesheet_admin">
+            <field name="user" ref="res.user_trigger"/>
+            <field name="group" ref="group_timesheet_admin"/>
         </record>
 
         <menuitem name="Timesheet Management" sequence="6" id="menu_timesheet"
             icon="tryton-clock"/>
         <menuitem name="Configuration" parent="menu_timesheet"
-            id="menu_configuration" groups="group_timesheet_admin"
-            sequence="10" icon="tryton-preferences"/>
+            id="menu_configuration" sequence="10" icon="tryton-preferences"/>
+        <record model="ir.ui.menu-res.group"
+            id="menu_configuration_group_timesheet_admin">
+            <field name="menu" ref="menu_configuration"/>
+            <field name="group" ref="group_timesheet_admin"/>
+        </record>
         <menuitem name="Reporting" parent="menu_timesheet"
             id="menu_reporting" sequence="100"/>
     </data>
diff --git a/work.xml b/work.xml
index 6f50898dae..59bd619a21 100644
--- a/work.xml
+++ b/work.xml
@@ -272,7 +272,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model" search="[('model', '=', 'timesheet.work')]"/>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
-            <field name="groups" eval="[('add', ref('group_timesheet_admin'))]"/>
+        </record>
+        <record model="ir.rule.group-res.group"
+            id="rule_group_work_admin_group_timesheet_admin">
+            <field name="rule_group" ref="rule_group_work_admin"/>
+            <field name="group" ref="group_timesheet_admin"/>
         </record>
 
     </data>