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 @@
-
+
ir.action
form
@@ -55,7 +55,7 @@
-
ir.action.report
@@ -120,7 +120,7 @@
-
ir.action.act_window
@@ -205,7 +205,7 @@
-
ir.action.wizard
@@ -264,7 +264,7 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
+
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 @@
-
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 @@
-
ir.model.field
@@ -117,7 +117,7 @@
-
ir.model.access
@@ -174,7 +174,7 @@
-
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 @@
-
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 @@
-
+
ir.module.module
form
@@ -107,7 +107,7 @@
tree_open
ir.module.category,0
-
Update Module List
@@ -141,7 +141,7 @@
-
@@ -195,7 +195,7 @@
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 @@
-
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 @@
-
Properties
@@ -72,7 +72,7 @@
-
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 @@
-
ir.rule
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 @@
-
ir.sequence.type
@@ -114,7 +114,7 @@
-
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 @@
-
Update Translations
ir.translation.update
@@ -80,7 +80,7 @@
ir.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 @@
-
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 @@
-
+
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 @@
-
ir.ui.view_sc
@@ -105,7 +105,7 @@
-
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 @@
-
res.request.link
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 @@
-
+
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 @@
-
res.group
@@ -147,7 +147,7 @@
-
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 @@
-
+
webdav.directory
tree
@@ -46,7 +47,7 @@
-
Directory
@@ -66,7 +67,7 @@
-
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 @@
-
+
workflow
form
@@ -49,7 +50,7 @@
-
workflow.activity
@@ -167,7 +168,7 @@
-
workflow.transition
@@ -227,7 +228,7 @@
-
workflow.instance
@@ -281,7 +282,7 @@
-
workflow.workitem
@@ -332,7 +333,7 @@
-