From 48396c171b2fd85615a7e58368e01d78447f8dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 17 Feb 2008 15:56:53 +0100
Subject: [PATCH] Rename child_id, parent_id, groups_id into childs, parent,
 groups

---
 trytond/ir/action.xml            | 10 +++++-----
 trytond/ir/attachment.xml        |  2 +-
 trytond/ir/cron.xml              |  2 +-
 trytond/ir/default.xml           |  2 +-
 trytond/ir/export.xml            |  2 +-
 trytond/ir/fr_FR.csv             |  4 ++--
 trytond/ir/ir.xml                |  2 +-
 trytond/ir/lang.xml              |  2 +-
 trytond/ir/model.xml             |  6 +++---
 trytond/ir/module/category.xml   |  2 +-
 trytond/ir/module/module.xml     |  8 ++++----
 trytond/ir/module/repository.xml |  2 +-
 trytond/ir/property.xml          |  4 ++--
 trytond/ir/rule.xml              |  2 +-
 trytond/ir/sequence.xml          |  4 ++--
 trytond/ir/translation.xml       |  6 +++---
 trytond/ir/ui/menu.py            | 14 +++++++-------
 trytond/ir/ui/menu.xml           | 16 ++++++++--------
 trytond/ir/ui/ui.xml             |  2 +-
 trytond/ir/ui/view.xml           |  4 ++--
 trytond/res/request.xml          |  2 +-
 trytond/res/res.xml              |  2 +-
 trytond/res/user.xml             |  4 ++--
 trytond/tools/convert.py         |  6 +++---
 trytond/webdav/webdav.xml        |  7 ++++---
 trytond/workflow/workflow.xml    | 13 +++++++------
 26 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/trytond/ir/action.xml b/trytond/ir/action.xml
index 0042bcf436..8f0e03dba2 100644
--- a/trytond/ir/action.xml
+++ b/trytond/ir/action.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tryton>
     <data>
-        <menuitem name="Actions" id="menu_action" parent_id="ir.menu_ir"/>
+        <menuitem name="Actions" id="menu_action" parent="ir.menu_ir"/>
         <record model="ir.ui.view" id="action_view_form">
             <field name="model">ir.action</field>
             <field name="type">form</field>
@@ -55,7 +55,7 @@
             <field name="view" ref="action_view_form"/>
             <field name="act_window" ref="act_action_form"/>
         </record>
-        <menuitem parent_id="menu_action"
+        <menuitem parent="menu_action"
             action="act_action_form" id="menu_act_action"/>
         <record model="ir.ui.view" id="action_report_view_form">
             <field name="model">ir.action.report</field>
@@ -120,7 +120,7 @@
             <field name="view" ref="action_report_view_form"/>
             <field name="act_window" ref="act_action_report_form"/>
         </record>
-        <menuitem parent_id="menu_action"
+        <menuitem parent="menu_action"
             action="act_action_report_form" id="menu_action_report_form"/>
         <record model="ir.ui.view" id="action_act_window_view_form">
             <field name="model">ir.action.act_window</field>
@@ -205,7 +205,7 @@
             <field name="view" ref="action_act_window_view_form"/>
             <field name="act_window" ref="act_action_act_window_form"/>
         </record>
-        <menuitem parent_id="menu_action"
+        <menuitem parent="menu_action"
             action="act_action_act_window_form" id="menu_action_act_window"/>
         <record model="ir.ui.view" id="action_wizard_view_form">
             <field name="model">ir.action.wizard</field>
@@ -264,7 +264,7 @@
             <field name="view" ref="action_wizard_view_form"/>
             <field name="act_window" ref="act_action_wizard_form"/>
         </record>
-        <menuitem parent_id="menu_action"
+        <menuitem parent="menu_action"
             action="act_action_wizard_form" id="menu_action_wizard"/>
     </data>
 </tryton>
diff --git a/trytond/ir/attachment.xml b/trytond/ir/attachment.xml
index 3740f5099d..7db7c57ee9 100644
--- a/trytond/ir/attachment.xml
+++ b/trytond/ir/attachment.xml
@@ -52,7 +52,7 @@
             <field name="view" ref="attachment_view_form"/>
             <field name="act_window" ref="act_attachment_form"/>
         </record>
-        <menuitem name="Attachments" parent_id="ir.menu_ir"
+        <menuitem name="Attachments" parent="ir.menu_ir"
             action="act_attachment_form" id="menu_attachment_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/cron.xml b/trytond/ir/cron.xml
index 6af1a5a906..0704c884bc 100644
--- a/trytond/ir/cron.xml
+++ b/trytond/ir/cron.xml
@@ -72,7 +72,7 @@
             <field name="view" ref="cron_view_form"/>
             <field name="act_window" ref="act_cron_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_cron_form" id="menu_cron_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/default.xml b/trytond/ir/default.xml
index e911584543..95f0eca361 100644
--- a/trytond/ir/default.xml
+++ b/trytond/ir/default.xml
@@ -53,7 +53,7 @@
             <field name="view" ref="default_view_form"/>
             <field name="act_window" ref="act_default_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_default_form" id="menu_default_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/export.xml b/trytond/ir/export.xml
index c68530c9d2..6ea7a718e3 100644
--- a/trytond/ir/export.xml
+++ b/trytond/ir/export.xml
@@ -46,7 +46,7 @@
             <field name="view" ref="export_view_form"/>
             <field name="act_window" ref="act_export_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_export_form" id="menu_export_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/fr_FR.csv b/trytond/ir/fr_FR.csv
index c361ae8dc9..adc0186e2c 100644
--- a/trytond/ir/fr_FR.csv
+++ b/trytond/ir/fr_FR.csv
@@ -150,12 +150,12 @@ field,"ir.translation,src",0,Source,Source,0
 field,"ir.translation,type",0,Type,Type,0
 field,"ir.translation,value",0,Translation Value,Valeur de traduction,0
 field,"ir.ui.menu,action",0,Action,Action,0
-field,"ir.ui.menu,child_id",0,Child ids,Ids enfants,0
+field,"ir.ui.menu,childs",0,Childs,Enfants,0
 field,"ir.ui.menu,complete_name",0,Complete Name,Nom complet,0
 field,"ir.ui.menu,groups_id",0,Groups,Groupes,0
 field,"ir.ui.menu,icon",0,Icon,Icône,0
 field,"ir.ui.menu,name",0,Menu,Menu,0
-field,"ir.ui.menu,parent_id",0,Parent Menu,Menu parent,0
+field,"ir.ui.menu,parent",0,Parent Menu,Menu parent,0
 field,"ir.ui.menu,sequence",0,Sequence,Séquence,0
 field,"ir.ui.view,arch",0,View Architecture,Architecture de la vue,0
 field,"ir.ui.view,field_parent",0,Childs Field,Champs enfants,0
diff --git a/trytond/ir/ir.xml b/trytond/ir/ir.xml
index 8fce1df812..e635f1318d 100644
--- a/trytond/ir/ir.xml
+++ b/trytond/ir/ir.xml
@@ -2,6 +2,6 @@
 <tryton>
     <data>
         <menuitem name="Administration" id="menu_administration"/>
-        <menuitem name="IR" id="menu_ir" parent_id="menu_administration"/>
+        <menuitem name="IR" id="menu_ir" parent="menu_administration"/>
     </data>
 </tryton>
diff --git a/trytond/ir/lang.xml b/trytond/ir/lang.xml
index ac4f35d791..7f240f4114 100644
--- a/trytond/ir/lang.xml
+++ b/trytond/ir/lang.xml
@@ -36,7 +36,7 @@
             <field name="view" ref="lang_view_tree"/>
             <field name="act_window" ref="act_lang_form"/>
         </record>
-        <menuitem name="Languages" parent_id="ir.menu_ir"
+        <menuitem name="Languages" parent="ir.menu_ir"
             action="act_lang_form" id="menu_lang_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/model.xml b/trytond/ir/model.xml
index 806d04738a..0ce99570c2 100644
--- a/trytond/ir/model.xml
+++ b/trytond/ir/model.xml
@@ -62,7 +62,7 @@
             <field name="view" ref="model_view_form"/>
             <field name="act_window" ref="act_model_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_model_form" id="menu_model_form"/>
         <record model="ir.ui.view" id="model_fields_view_form">
             <field name="model">ir.model.field</field>
@@ -117,7 +117,7 @@
             <field name="view" ref="model_fields_view_form"/>
             <field name="act_window" ref="act_model_fields_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_model_fields_form" id="model_model_fields_form"/>
         <record model="ir.ui.view" id="model_access_view_tree">
             <field name="model">ir.model.access</field>
@@ -174,7 +174,7 @@
             <field name="view" ref="model_access_view_form"/>
             <field name="act_window" ref="act_model_access_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_model_access_form" id="menu_model_access_form"/>
 
     </data>
diff --git a/trytond/ir/module/category.xml b/trytond/ir/module/category.xml
index 67d8244da0..27a3220238 100644
--- a/trytond/ir/module/category.xml
+++ b/trytond/ir/module/category.xml
@@ -40,7 +40,7 @@
             <field name="view" ref="category_view_tree"/>
             <field name="act_window" ref="act_category_tree"/>
         </record>
-        <menuitem parent_id="menu_modules"
+        <menuitem parent="menu_modules"
             action="act_category_tree" id="menu_category_tree"/>
     </data>
 </tryton>
diff --git a/trytond/ir/module/module.xml b/trytond/ir/module/module.xml
index 7ceabec591..2a5fd03e69 100644
--- a/trytond/ir/module/module.xml
+++ b/trytond/ir/module/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tryton>
     <data>
-        <menuitem name="Modules" parent_id="menu_ir" id="menu_modules"/>
+        <menuitem name="Modules" parent="menu_ir" id="menu_modules"/>
         <record model="ir.ui.view" id="module_view_form">
             <field name="model">ir.module.module</field>
             <field name="type">form</field>
@@ -107,7 +107,7 @@
             <field name="keyword">tree_open</field>
             <field name="model">ir.module.category,0</field>
         </record>
-        <menuitem parent_id="menu_modules"
+        <menuitem parent="menu_modules"
             action="act_module_form" id="menu_module_form"/>
         <record model="ir.action.wizard" id="act_module_update_list">
             <field name="name">Update Module List</field>
@@ -141,7 +141,7 @@
             </field>
         </record>
 
-        <menuitem name="Update Module List" parent_id="menu_modules"
+        <menuitem name="Update Module List" parent="menu_modules"
             action="act_module_update_list"
             type="wizard"
             id="menu_module_update_list"/>
@@ -195,7 +195,7 @@
             </field>
         </record>
         <menuitem name="Install \ Upgrade Modules"
-            parent_id="menu_modules"
+            parent="menu_modules"
             action="act_module_install_upgrade"
             type="wizard"
             id="menu_module_install_upgrade"/>
diff --git a/trytond/ir/module/repository.xml b/trytond/ir/module/repository.xml
index 0c8740e1ce..701e776f87 100644
--- a/trytond/ir/module/repository.xml
+++ b/trytond/ir/module/repository.xml
@@ -53,7 +53,7 @@
             <field name="view" ref="repository_view_form"/>
             <field name="act_window" ref="act_repository_form"/>
         </record>
-        <menuitem parent_id="menu_modules"
+        <menuitem parent="menu_modules"
             action="act_repository_form" id="menu_repository_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/property.xml b/trytond/ir/property.xml
index b7a1cd8c35..698cc16b4f 100644
--- a/trytond/ir/property.xml
+++ b/trytond/ir/property.xml
@@ -52,7 +52,7 @@
             <field name="view" ref="property_view_form"/>
             <field name="act_window" ref="act_property_form_default"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_property_form_default" id="menu_property_form_default"/>
         <record model="ir.action.act_window" id="act_property_form">
             <field name="name">Properties</field>
@@ -72,7 +72,7 @@
             <field name="view" ref="property_view_form"/>
             <field name="act_window" ref="act_property_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_property_form" id="menu_property_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml
index 6c1a3978fe..54a0e46afe 100644
--- a/trytond/ir/rule.xml
+++ b/trytond/ir/rule.xml
@@ -52,7 +52,7 @@
             <field name="view" ref="rule_group_view_form"/>
             <field name="act_window" ref="act_rule_group_form"/>
         </record>
-        <menuitem parent_id="ir.menu_ir"
+        <menuitem parent="ir.menu_ir"
             action="act_rule_group_form" id="menu_rule_group_form"/>
         <record model="ir.ui.view" id="rule_view_form">
             <field name="model">ir.rule</field>
diff --git a/trytond/ir/sequence.xml b/trytond/ir/sequence.xml
index c1623e1090..7736edd89b 100644
--- a/trytond/ir/sequence.xml
+++ b/trytond/ir/sequence.xml
@@ -67,7 +67,7 @@
             <field name="view" ref="sequence_view_form"/>
             <field name="act_window" ref="act_sequence_form"/>
         </record>
-        <menuitem parent_id="menu_ir"
+        <menuitem parent="menu_ir"
             action="act_sequence_form" id="menu_sequence_form"/>
         <record model="ir.ui.view" id="sequence_type_view_form">
             <field name="model">ir.sequence.type</field>
@@ -114,7 +114,7 @@
             <field name="view" ref="sequence_type_view_form"/>
             <field name="act_window" ref="act_sequence_type_form"/>
         </record>
-        <menuitem parent_id="menu_ir"
+        <menuitem parent="menu_ir"
             action="act_sequence_type_form" id="menu_ir_sequence_type"/>
     </data>
 </tryton>
diff --git a/trytond/ir/translation.xml b/trytond/ir/translation.xml
index d9c6a1c4d1..faca9bd8c9 100644
--- a/trytond/ir/translation.xml
+++ b/trytond/ir/translation.xml
@@ -64,14 +64,14 @@
             <field name="view" ref="translation_view_form"/>
             <field name="act_window" ref="act_translation_form"/>
         </record>
-        <menuitem name="Translations" parent_id="ir.menu_ir"
+        <menuitem name="Translations" parent="ir.menu_ir"
             action="act_translation_form" id="menu_translation_form"/>
         <record model="ir.action.wizard" id="act_translation_update">
             <field name="name">Update Translations</field>
             <field name="wiz_name">ir.translation.update</field>
         </record>
         <menuitem name="Update Translations"
-            parent_id="menu_translation_form"
+            parent="menu_translation_form"
             action="act_translation_update"
             type="wizard"
             id="menu_translation_update"/>
@@ -80,7 +80,7 @@
             <field name="wiz_name">ir.translation.export</field>
         </record>
         <menuitem name="Export Translations"
-            parent_id="menu_translation_form"
+            parent="menu_translation_form"
             action="act_translation_export"
             type="wizard"
             id="menu_translation_export"/>
diff --git a/trytond/ir/ui/menu.py b/trytond/ir/ui/menu.py
index 7a0a558473..dbe9a5ca93 100644
--- a/trytond/ir/ui/menu.py
+++ b/trytond/ir/ui/menu.py
@@ -143,9 +143,9 @@ class UIMenu(OSV):
     _columns = {
         'name': fields.Char('Menu', size=64, required=True, translate=True),
         'sequence': fields.Integer('Sequence'),
-        'child_id' : fields.One2Many('ir.ui.menu', 'parent_id','Child ids'),
-        'parent_id': fields.Many2One('ir.ui.menu', 'Parent Menu', select=True),
-        'groups_id': Many2ManyUniq('res.group', 'ir_ui_menu_group_rel',
+        'childs' : fields.One2Many('ir.ui.menu', 'parent','Childs'),
+        'parent': fields.Many2One('ir.ui.menu', 'Parent Menu', select=1),
+        'groups': Many2ManyUniq('res.group', 'ir_ui_menu_group_rel',
             'menu_id', 'gid', 'Groups'),
         'complete_name': fields.Function('get_full_name',
             string='Complete Name', type='char', size=128),
@@ -174,8 +174,8 @@ class UIMenu(OSV):
     def _get_one_full_name(self, menu, level=6):
         if level <= 0:
             return '...'
-        if menu.parent_id:
-            parent_path = self._get_one_full_name(menu.parent_id, level-1) + "/"
+        if menu.parent:
+            parent_path = self._get_one_full_name(menu.parent, level-1) + "/"
         else:
             parent_path = ''
         return parent_path + menu.name
@@ -250,10 +250,10 @@ class UIMenu(OSV):
         user_groups = res_user_obj.read(cursor, user, [user])[0]['groups_id']
         result = []
         for menu in self.browse(cursor, user, ids):
-            if not len(menu.groups_id):
+            if not len(menu.groups):
                 result.append(menu.id)
                 continue
-            for group in menu.groups_id:
+            for group in menu.groups:
                 if group.id in user_groups:
                     result.append(menu.id)
                     break
diff --git a/trytond/ir/ui/menu.xml b/trytond/ir/ui/menu.xml
index 6757c5852c..88a42d4e4b 100644
--- a/trytond/ir/ui/menu.xml
+++ b/trytond/ir/ui/menu.xml
@@ -4,6 +4,7 @@
         <record model="ir.ui.view" id="menu_view_tree_tree">
             <field name="model">ir.ui.menu</field>
             <field name="type">tree</field>
+            <field name="field_parent">childs</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Menu" toolbar="1">
@@ -11,14 +12,13 @@
                 </tree>
                 ]]>
             </field>
-            <field name="field_parent">child_id</field>
         </record>
         <record model="ir.action.act_window" id="act_menu_tree">
             <field name="name">Menu</field>
             <field name="res_model">ir.ui.menu</field>
             <field name="view_type">tree</field>
             <field name="usage">menu</field>
-            <field name="domain" eval="'[(\'parent_id\',\'=\',False)]'"/>
+            <field name="domain" eval="'[(\'parent\', \'=\', False)]'"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_menu_tree_view1">
@@ -35,7 +35,7 @@
                 <tree string="Menu">
                     <field name="complete_name" icon="icon"/>
                     <field name="name" invisible="1" select="1"/>
-                    <field name="parent_id" invisible="1" select="1"/>
+                    <field name="parent" invisible="1" select="1"/>
                 </tree>
                 ]]>
             </field>
@@ -48,8 +48,8 @@
                 <form string="Menu">
                     <label name="name"/>
                     <field name="name" invisible="0" colspan="3"/>
-                    <label name="parent_id"/>
-                    <field name="parent_id" invisible="0"/>
+                    <label name="parent"/>
+                    <field name="parent" invisible="0"/>
                     <label name="icon"/>
                     <field name="icon"/>
                     <label name="action"/>
@@ -58,8 +58,8 @@
                     <field name="sequence"/>
                     <label name="complete_name"/>
                     <field name="complete_name" colspan="3"/>
-                    <separator name="groups_id" colspan="4"/>
-                    <field name="groups_id" colspan="4"/>
+                    <separator name="groups" colspan="4"/>
+                    <field name="groups" colspan="4"/>
                 </form>
                 ]]>
             </field>
@@ -81,7 +81,7 @@
             <field name="view" ref="menu_view_form"/>
             <field name="act_window" ref="act_menu_form"/>
         </record>
-        <menuitem parent_id="menu_ui"
+        <menuitem parent="menu_ui"
             action="act_menu_form" id="menu_menu_form"/>
     </data>
 </tryton>
diff --git a/trytond/ir/ui/ui.xml b/trytond/ir/ui/ui.xml
index 18aae7c6cd..bc51676fdd 100644
--- a/trytond/ir/ui/ui.xml
+++ b/trytond/ir/ui/ui.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tryton>
     <data>
-        <menuitem name="UI" parent_id="menu_ir" id="menu_ui"/>
+        <menuitem name="UI" parent="menu_ir" id="menu_ui"/>
     </data>
 </tryton>
diff --git a/trytond/ir/ui/view.xml b/trytond/ir/ui/view.xml
index 556aa2a545..fb21eba37b 100644
--- a/trytond/ir/ui/view.xml
+++ b/trytond/ir/ui/view.xml
@@ -55,7 +55,7 @@
             <field name="view" ref="view_view_form"/>
             <field name="act_window" ref="act_view_form"/>
         </record>
-        <menuitem parent_id="menu_ui"
+        <menuitem parent="menu_ui"
             action="act_view_form" id="menu_view"/>
         <record model="ir.ui.view" id="view_sc_view_form">
             <field name="model">ir.ui.view_sc</field>
@@ -105,7 +105,7 @@
             <field name="view" ref="view_sc_view_form"/>
             <field name="act_window" ref="act_view_sc_form"/>
         </record>
-        <menuitem parent_id="menu_ui"
+        <menuitem parent="menu_ui"
             action="act_view_sc_form" id="menu_view_sc"/>
     </data>
 </tryton>
diff --git a/trytond/res/request.xml b/trytond/res/request.xml
index 15cfe3fedd..ae6d38577c 100644
--- a/trytond/res/request.xml
+++ b/trytond/res/request.xml
@@ -90,7 +90,7 @@
             <field name="view" ref="request_view_form"/>
             <field name="act_window" ref="act_request_form"/>
         </record>
-        <menuitem parent_id="res.menu_res" 
+        <menuitem parent="res.menu_res" 
             action="act_request_form" id="menu_request_form"/>
         <record model="ir.ui.view" id="request_link_view_form">
             <field name="model">res.request.link</field>
diff --git a/trytond/res/res.xml b/trytond/res/res.xml
index 7600ca808d..e25da33030 100644
--- a/trytond/res/res.xml
+++ b/trytond/res/res.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tryton>
     <data>
-        <menuitem name="Res" id="menu_res" parent_id="ir.menu_administration"/>
+        <menuitem name="Res" id="menu_res" parent="ir.menu_administration"/>
     </data>
 </tryton>
diff --git a/trytond/res/user.xml b/trytond/res/user.xml
index caf0d90881..8b88cbc70b 100644
--- a/trytond/res/user.xml
+++ b/trytond/res/user.xml
@@ -90,7 +90,7 @@
             <field name="view" ref="user_view_form"/>
             <field name="act_window" ref="act_user_form"/>
         </record>
-        <menuitem parent_id="res.menu_res"
+        <menuitem parent="res.menu_res"
             action="act_user_form" id="menu_user_form"/>
         <record model="ir.ui.view" id="group_view_form">
             <field name="model">res.group</field>
@@ -147,7 +147,7 @@
             <field name="view" ref="group_view_form"/>
             <field name="act_window" ref="act_group_form"/>
         </record>
-        <menuitem parent_id="res.menu_res"
+        <menuitem parent="res.menu_res"
             action="act_group_form" id="menu_group_form"/>
     </data>
 </tryton>
diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py
index 1fe3a1a8d1..93e864e97b 100644
--- a/trytond/tools/convert.py
+++ b/trytond/tools/convert.py
@@ -48,13 +48,13 @@ class MenuitemTagHandler:
 
         self.xml_id = attributes['id']
 
-        for attr in ('name', 'icon', 'sequence', 'parent_id', 'action',):
+        for attr in ('name', 'icon', 'sequence', 'parent', 'action',):
             if attributes.get(attr):
                 values[attr] = attributes.get(attr).encode('utf8')
 
 
-        if values.get('parent_id'):
-            values['parent_id'] = self.mh.get_id(values['parent_id'])
+        if values.get('parent'):
+            values['parent'] = self.mh.get_id(values['parent'])
 
         action_name = False
         if values.get('action'):
diff --git a/trytond/webdav/webdav.xml b/trytond/webdav/webdav.xml
index 32d8df1557..c754247fb1 100644
--- a/trytond/webdav/webdav.xml
+++ b/trytond/webdav/webdav.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <tryton>
     <data>
-        <menuitem name="WebDAV" id="menu_webdav" parent_id="ir.menu_administration"/>
+        <menuitem name="WebDAV" id="menu_webdav"
+            parent="ir.menu_administration"/>
         <record model="ir.ui.view" id="directory_view_tree">
             <field name="model">webdav.directory</field>
             <field name="type">tree</field>
@@ -46,7 +47,7 @@
             <field name="view" ref="directory_view_tree"/>
             <field name="act_window" ref="act_directory_tree"/>
         </record>
-        <menuitem parent_id="menu_webdav"
+        <menuitem parent="menu_webdav"
             action="act_directory_tree" id="menu_directory_tree"/>
         <record model="ir.action.act_window" id="act_directory_form">
             <field name="name">Directory</field>
@@ -66,7 +67,7 @@
             <field name="view" ref="directory_view_tree"/>
             <field name="act_window" ref="act_directory_form"/>
         </record>
-        <menuitem name="New Directory" parent_id="menu_directory_tree"
+        <menuitem name="New Directory" parent="menu_directory_tree"
             action="act_directory_form" id="menu_directory_form"/>
     </data>
 </tryton>
diff --git a/trytond/workflow/workflow.xml b/trytond/workflow/workflow.xml
index 776b2275c9..46258cd1dd 100644
--- a/trytond/workflow/workflow.xml
+++ b/trytond/workflow/workflow.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <tryton>
     <data>
-        <menuitem name="Workflow" id="menu_workflow" parent_id="ir.menu_administration"/>
+        <menuitem name="Workflow" id="menu_workflow"
+            parent="ir.menu_administration"/>
         <record model="ir.ui.view" id="workflow_view_form">
             <field name="model">workflow</field>
             <field name="type">form</field>
@@ -49,7 +50,7 @@
             <field name="view" ref="workflow_view_form"/>
             <field name="act_window" ref="act_workflow_form"/>
         </record>
-        <menuitem parent_id="menu_workflow"
+        <menuitem parent="menu_workflow"
             action="act_workflow_form" id="menu_workflow_form"/>
         <record model="ir.ui.view" id="activity_view_form">
             <field name="model">workflow.activity</field>
@@ -167,7 +168,7 @@
             <field name="view" ref="activity_view_form"/>
             <field name="act_window" ref="act_activity_form"/>
         </record>
-        <menuitem parent_id="menu_workflow"
+        <menuitem parent="menu_workflow"
             action="act_activity_form" id="menu_activity_form"/>
         <record model="ir.ui.view" id="transition_view_form">
             <field name="model">workflow.transition</field>
@@ -227,7 +228,7 @@
             <field name="view" ref="transition_view_form"/>
             <field name="act_window" ref="act_transition_form"/>
         </record>
-        <menuitem parent_id="menu_workflow"
+        <menuitem parent="menu_workflow"
             action="act_transition_form" id="menu_transition_form"/>
         <record model="ir.ui.view" id="instance_view_form">
             <field name="model">workflow.instance</field>
@@ -281,7 +282,7 @@
             <field name="view" ref="instance_view_form"/>
             <field name="act_window" ref="act_instance_form"/>
         </record>
-        <menuitem parent_id="menu_workflow"
+        <menuitem parent="menu_workflow"
             action="act_instance_form" id="menu_instance_form"/>
         <record model="ir.ui.view" id="workitem_view_form">
             <field name="model">workflow.workitem</field>
@@ -332,7 +333,7 @@
             <field name="view" ref="workitem_view_form"/>
             <field name="act_window" ref="act_workitem_form"/>
         </record>
-        <menuitem parent_id="menu_workflow"
+        <menuitem parent="menu_workflow"
             action="act_workitem_form" id="menu_workitem_form"/>
     </data>
 </tryton>