From 9c06ee017fe5ba2c6df0742fe95396931dd76af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 17 Feb 2008 14:16:18 +0100
Subject: [PATCH] Rename view_id into view

---
 trytond/ir/action.py             |  6 +++---
 trytond/ir/action.xml            | 24 ++++++++++++------------
 trytond/ir/attachment.xml        |  4 ++--
 trytond/ir/cron.xml              |  4 ++--
 trytond/ir/default.xml           |  4 ++--
 trytond/ir/export.xml            |  4 ++--
 trytond/ir/fr_FR.csv             |  2 +-
 trytond/ir/lang.xml              |  2 +-
 trytond/ir/model.xml             | 12 ++++++------
 trytond/ir/module/category.xml   |  2 +-
 trytond/ir/module/module.xml     |  4 ++--
 trytond/ir/module/repository.xml |  4 ++--
 trytond/ir/property.xml          |  8 ++++----
 trytond/ir/rule.xml              |  4 ++--
 trytond/ir/sequence.xml          |  8 ++++----
 trytond/ir/translation.xml       |  4 ++--
 trytond/ir/ui/menu.xml           |  6 +++---
 trytond/ir/ui/view.xml           |  8 ++++----
 trytond/res/request.xml          |  4 ++--
 trytond/res/user.xml             |  8 ++++----
 trytond/tools/convert.py         |  2 +-
 trytond/webdav/webdav.xml        |  6 +++---
 trytond/workflow/workflow.xml    | 20 ++++++++++----------
 23 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/trytond/ir/action.py b/trytond/ir/action.py
index 8a019ca9ff..ccce5d1dbd 100644
--- a/trytond/ir/action.py
+++ b/trytond/ir/action.py
@@ -245,7 +245,7 @@ class ActionActWindow(OSV):
     def views_get_fnc(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for act in self.browse(cursor, user, ids, context=context):
-            res[act.id] = [(view.view_id.id, view.view_id.type) \
+            res[act.id] = [(view.view.id, view.view.type) \
                     for view in act.act_window_views]
         return res
 
@@ -255,11 +255,11 @@ ActionActWindow()
 class ActionActWindowView(OSV):
     "Action act window view"
     _name = 'ir.action.act_window.view'
-    _rec_name = 'view_id'
+    _rec_name = 'view'
     _description = __doc__
     _columns = {
         'sequence': fields.Integer('Sequence'),
-        'view_id': fields.Many2One('ir.ui.view', 'View', required=True),
+        'view': fields.Many2One('ir.ui.view', 'View', required=True),
         'act_window': fields.Many2One('ir.action.act_window', 'Action',
             ondelete='CASCADE'),
         'multi': fields.Boolean('On multiple doc.',
diff --git a/trytond/ir/action.xml b/trytond/ir/action.xml
index 05c65018e5..0042bcf436 100644
--- a/trytond/ir/action.xml
+++ b/trytond/ir/action.xml
@@ -46,13 +46,13 @@
         <record model="ir.action.act_window.view"
             id="act_action_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="action_view_tree"/>
+            <field name="view" ref="action_view_tree"/>
             <field name="act_window" ref="act_action_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_action_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="action_view_form"/>
+            <field name="view" ref="action_view_form"/>
             <field name="act_window" ref="act_action_form"/>
         </record>
         <menuitem parent_id="menu_action"
@@ -111,13 +111,13 @@
         <record model="ir.action.act_window.view"
             id="act_action_report_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="action_report_view_tree"/>
+            <field name="view" ref="action_report_view_tree"/>
             <field name="act_window" ref="act_action_report_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_action_report_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="action_report_view_form"/>
+            <field name="view" ref="action_report_view_form"/>
             <field name="act_window" ref="act_action_report_form"/>
         </record>
         <menuitem parent_id="menu_action"
@@ -142,12 +142,12 @@
                         <form string="Views">
                             <label name="sequence"/>
                             <field name="sequence" colspan="4"/>
-                            <label name="view_id"/>
-                            <field name="view_id"/>
+                            <label name="view"/>
+                            <field name="view"/>
                         </form>
                         <tree string="Views">
                             <field name="sequence"/>
-                            <field name="view_id"/>
+                            <field name="view"/>
                         </tree>
                     </field>
                     <label name="domain"/>
@@ -183,7 +183,7 @@
                     <field name="res_model" select="1"/>
                     <field name="src_model" select="2"/>
                     <field name="view_type"/>
-                    <field name="view_id"/>
+                    <field name="view"/>
                     <field name="domain"/>
                 </tree>
                 ]]>
@@ -197,12 +197,12 @@
         </record>
         <record model="ir.action.act_window.view" id="act_action_act_window_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="action_act_window_view_tree"/>
+            <field name="view" ref="action_act_window_view_tree"/>
             <field name="act_window" ref="act_action_act_window_form"/>
         </record>
         <record model="ir.action.act_window.view" id="act_action_act_window_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="action_act_window_view_form"/>
+            <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"
@@ -255,13 +255,13 @@
         <record model="ir.action.act_window.view"
             id="act_action_wizard_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="action_wizard_view_tree"/>
+            <field name="view" ref="action_wizard_view_tree"/>
             <field name="act_window" ref="act_action_wizard_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_action_wizard_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="action_wizard_view_form"/>
+            <field name="view" ref="action_wizard_view_form"/>
             <field name="act_window" ref="act_action_wizard_form"/>
         </record>
         <menuitem parent_id="menu_action"
diff --git a/trytond/ir/attachment.xml b/trytond/ir/attachment.xml
index 13b4bf4ded..3740f5099d 100644
--- a/trytond/ir/attachment.xml
+++ b/trytond/ir/attachment.xml
@@ -43,13 +43,13 @@
         <record model="ir.action.act_window.view"
             id="act_attachment_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="attachment_view_tree"/>
+            <field name="view" ref="attachment_view_tree"/>
             <field name="act_window" ref="act_attachment_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_attachment_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="attachment_view_form"/>
+            <field name="view" ref="attachment_view_form"/>
             <field name="act_window" ref="act_attachment_form"/>
         </record>
         <menuitem name="Attachments" parent_id="ir.menu_ir"
diff --git a/trytond/ir/cron.xml b/trytond/ir/cron.xml
index 5985bc0955..02cb63321c 100644
--- a/trytond/ir/cron.xml
+++ b/trytond/ir/cron.xml
@@ -63,13 +63,13 @@
         <record model="ir.action.act_window.view"
             id="act_cron_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="cron_view_tree"/>
+            <field name="view" ref="cron_view_tree"/>
             <field name="act_window" ref="act_cron_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_cron_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="cron_view_form"/>
+            <field name="view" ref="cron_view_form"/>
             <field name="act_window" ref="act_cron_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
diff --git a/trytond/ir/default.xml b/trytond/ir/default.xml
index 9f596760ac..e911584543 100644
--- a/trytond/ir/default.xml
+++ b/trytond/ir/default.xml
@@ -44,13 +44,13 @@
         <record model="ir.action.act_window.view"
             id="act_default_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="default_view_tree"/>
+            <field name="view" ref="default_view_tree"/>
             <field name="act_window" ref="act_default_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_default_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="default_view_form"/>
+            <field name="view" ref="default_view_form"/>
             <field name="act_window" ref="act_default_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
diff --git a/trytond/ir/export.xml b/trytond/ir/export.xml
index 4f15484a2f..c68530c9d2 100644
--- a/trytond/ir/export.xml
+++ b/trytond/ir/export.xml
@@ -37,13 +37,13 @@
         <record model="ir.action.act_window.view"
             id="act_export_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="export_view_tree"/>
+            <field name="view" ref="export_view_tree"/>
             <field name="act_window" ref="act_export_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_export_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="export_view_form"/>
+            <field name="view" ref="export_view_form"/>
             <field name="act_window" ref="act_export_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
diff --git a/trytond/ir/fr_FR.csv b/trytond/ir/fr_FR.csv
index 40c9f5e5b4..710944ce6b 100644
--- a/trytond/ir/fr_FR.csv
+++ b/trytond/ir/fr_FR.csv
@@ -13,7 +13,7 @@ field,"ir.action.act_window.view,multi",0,On multiple doc.,Sur plusieurs doc.,0
 field,"ir.action.act_window,views",0,Views,Vues,0
 field,"ir.action.act_window.view,sequence",0,Sequence,Séquence,0
 field,"ir.action.act_window,view_type",0,Type of view,Type de vue,0
-field,"ir.action.act_window.view,view_id",0,View,Vue,0
+field,"ir.action.act_window.view,view",0,View,Vue,0
 field,"ir.action.keyword,action",0,Action,Action,0
 field,"ir.action.keyword,keyword",0,Keyword,Mot-clè,0
 field,"ir.action.keyword,model",0,Model,Modèle,0
diff --git a/trytond/ir/lang.xml b/trytond/ir/lang.xml
index a95903f680..ac4f35d791 100644
--- a/trytond/ir/lang.xml
+++ b/trytond/ir/lang.xml
@@ -33,7 +33,7 @@
         <record model="ir.action.act_window.view"
             id="act_lang_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="lang_view_tree"/>
+            <field name="view" ref="lang_view_tree"/>
             <field name="act_window" ref="act_lang_form"/>
         </record>
         <menuitem name="Languages" parent_id="ir.menu_ir"
diff --git a/trytond/ir/model.xml b/trytond/ir/model.xml
index 92c62f12b5..f24d19b43b 100644
--- a/trytond/ir/model.xml
+++ b/trytond/ir/model.xml
@@ -53,13 +53,13 @@
         <record model="ir.action.act_window.view"
             id="act_model_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="model_view_tree"/>
+            <field name="view" ref="model_view_tree"/>
             <field name="act_window" ref="act_model_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_model_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="model_view_form"/>
+            <field name="view" ref="model_view_form"/>
             <field name="act_window" ref="act_model_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
@@ -108,13 +108,13 @@
         <record model="ir.action.act_window.view"
             id="act_model_fields_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="model_fields_view_tree"/>
+            <field name="view" ref="model_fields_view_tree"/>
             <field name="act_window" ref="act_model_fields_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_model_fields_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="model_fields_view_form"/>
+            <field name="view" ref="model_fields_view_form"/>
             <field name="act_window" ref="act_model_fields_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
@@ -165,13 +165,13 @@
         <record model="ir.action.act_window.view"
             id="act_model_access_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="model_access_view_tree"/>
+            <field name="view" ref="model_access_view_tree"/>
             <field name="act_window" ref="act_model_access_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_model_access_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="model_access_view_form"/>
+            <field name="view" ref="model_access_view_form"/>
             <field name="act_window" ref="act_model_access_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
diff --git a/trytond/ir/module/category.xml b/trytond/ir/module/category.xml
index a09ec520d7..b3c45057e4 100644
--- a/trytond/ir/module/category.xml
+++ b/trytond/ir/module/category.xml
@@ -37,7 +37,7 @@
         <record model="ir.action.act_window.view"
             id="act_category_tree_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="category_view_tree"/>
+            <field name="view" ref="category_view_tree"/>
             <field name="act_window" ref="act_category_tree"/>
         </record>
         <menuitem parent_id="menu_modules"
diff --git a/trytond/ir/module/module.xml b/trytond/ir/module/module.xml
index 403e1d7a37..6b6722beb0 100644
--- a/trytond/ir/module/module.xml
+++ b/trytond/ir/module/module.xml
@@ -93,13 +93,13 @@
         <record model="ir.action.act_window.view"
             id="act_module_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="module_view_tree"/>
+            <field name="view" ref="module_view_tree"/>
             <field name="act_window" ref="act_module_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_module_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="module_view_form"/>
+            <field name="view" ref="module_view_form"/>
             <field name="act_window" ref="act_module_form"/>
         </record>
         <record model="ir.action.keyword" id="act_category_keyword1">
diff --git a/trytond/ir/module/repository.xml b/trytond/ir/module/repository.xml
index d8f9ebd36d..0c8740e1ce 100644
--- a/trytond/ir/module/repository.xml
+++ b/trytond/ir/module/repository.xml
@@ -44,13 +44,13 @@
         <record model="ir.action.act_window.view"
             id="act_repository_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="repository_view_tree"/>
+            <field name="view" ref="repository_view_tree"/>
             <field name="act_window" ref="act_repository_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_repository_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="repository_view_form"/>
+            <field name="view" ref="repository_view_form"/>
             <field name="act_window" ref="act_repository_form"/>
         </record>
         <menuitem parent_id="menu_modules"
diff --git a/trytond/ir/property.xml b/trytond/ir/property.xml
index 159c9377ef..ff5ced796b 100644
--- a/trytond/ir/property.xml
+++ b/trytond/ir/property.xml
@@ -43,13 +43,13 @@
         <record model="ir.action.act_window.view"
             id="act_property_form_view1_default">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="property_view_tree"/>
+            <field name="view" ref="property_view_tree"/>
             <field name="act_window" ref="act_property_form_default"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_property_form_view2_default">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="property_view_form"/>
+            <field name="view" ref="property_view_form"/>
             <field name="act_window" ref="act_property_form_default"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
@@ -63,13 +63,13 @@
         <record model="ir.action.act_window.view"
             id="act_property_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="property_view_tree"/>
+            <field name="view" ref="property_view_tree"/>
             <field name="act_window" ref="act_property_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_property_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="property_view_form"/>
+            <field name="view" ref="property_view_form"/>
             <field name="act_window" ref="act_property_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml
index fd53330292..18768d508b 100644
--- a/trytond/ir/rule.xml
+++ b/trytond/ir/rule.xml
@@ -43,13 +43,13 @@
         <record model="ir.action.act_window.view"
             id="act_rule_group_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="rule_group_view_tree"/>
+            <field name="view" ref="rule_group_view_tree"/>
             <field name="act_window" ref="act_rule_group_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_rule_group_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="rule_group_view_form"/>
+            <field name="view" ref="rule_group_view_form"/>
             <field name="act_window" ref="act_rule_group_form"/>
         </record>
         <menuitem parent_id="ir.menu_ir"
diff --git a/trytond/ir/sequence.xml b/trytond/ir/sequence.xml
index ed8e6a2286..c1623e1090 100644
--- a/trytond/ir/sequence.xml
+++ b/trytond/ir/sequence.xml
@@ -58,13 +58,13 @@
         <record model="ir.action.act_window.view"
             id="act_sequence_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="sequence_view_tree"/>
+            <field name="view" ref="sequence_view_tree"/>
             <field name="act_window" ref="act_sequence_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_sequence_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="sequence_view_form"/>
+            <field name="view" ref="sequence_view_form"/>
             <field name="act_window" ref="act_sequence_form"/>
         </record>
         <menuitem parent_id="menu_ir"
@@ -105,13 +105,13 @@
         <record model="ir.action.act_window.view"
             id="act_sequence_type_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="sequence_type_view_tree"/>
+            <field name="view" ref="sequence_type_view_tree"/>
             <field name="act_window" ref="act_sequence_type_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_sequence_type_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="sequence_type_view_form"/>
+            <field name="view" ref="sequence_type_view_form"/>
             <field name="act_window" ref="act_sequence_type_form"/>
         </record>
         <menuitem parent_id="menu_ir"
diff --git a/trytond/ir/translation.xml b/trytond/ir/translation.xml
index 27789bacad..d9c6a1c4d1 100644
--- a/trytond/ir/translation.xml
+++ b/trytond/ir/translation.xml
@@ -55,13 +55,13 @@
         <record model="ir.action.act_window.view"
             id="act_translation_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="translation_view_tree"/>
+            <field name="view" ref="translation_view_tree"/>
             <field name="act_window" ref="act_translation_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_translation_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="translation_view_form"/>
+            <field name="view" ref="translation_view_form"/>
             <field name="act_window" ref="act_translation_form"/>
         </record>
         <menuitem name="Translations" parent_id="ir.menu_ir"
diff --git a/trytond/ir/ui/menu.xml b/trytond/ir/ui/menu.xml
index 87f5b0d253..6757c5852c 100644
--- a/trytond/ir/ui/menu.xml
+++ b/trytond/ir/ui/menu.xml
@@ -23,7 +23,7 @@
         <record model="ir.action.act_window.view"
             id="act_menu_tree_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="menu_view_tree_tree"/>
+            <field name="view" ref="menu_view_tree_tree"/>
             <field name="act_window" ref="act_menu_tree"/>
         </record>
         <record model="ir.ui.view" id="menu_view_tree">
@@ -72,13 +72,13 @@
         <record model="ir.action.act_window.view"
             id="act_menu_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="menu_view_tree"/>
+            <field name="view" ref="menu_view_tree"/>
             <field name="act_window" ref="act_menu_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_menu_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="menu_view_form"/>
+            <field name="view" ref="menu_view_form"/>
             <field name="act_window" ref="act_menu_form"/>
         </record>
         <menuitem parent_id="menu_ui"
diff --git a/trytond/ir/ui/view.xml b/trytond/ir/ui/view.xml
index c26e859f98..556aa2a545 100644
--- a/trytond/ir/ui/view.xml
+++ b/trytond/ir/ui/view.xml
@@ -46,13 +46,13 @@
         <record model="ir.action.act_window.view"
             id="act_view_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="view_view_tree"/>
+            <field name="view" ref="view_view_tree"/>
             <field name="act_window" ref="act_view_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_view_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="view_view_form"/>
+            <field name="view" ref="view_view_form"/>
             <field name="act_window" ref="act_view_form"/>
         </record>
         <menuitem parent_id="menu_ui"
@@ -96,13 +96,13 @@
         <record model="ir.action.act_window.view"
             id="act_view_sc_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="view_sc_view_tree"/>
+            <field name="view" ref="view_sc_view_tree"/>
             <field name="act_window" ref="act_view_sc_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_view_sc_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="view_sc_view_form"/>
+            <field name="view" ref="view_sc_view_form"/>
             <field name="act_window" ref="act_view_sc_form"/>
         </record>
         <menuitem parent_id="menu_ui"
diff --git a/trytond/res/request.xml b/trytond/res/request.xml
index 921d504b02..15cfe3fedd 100644
--- a/trytond/res/request.xml
+++ b/trytond/res/request.xml
@@ -81,13 +81,13 @@
         <record model="ir.action.act_window.view"
             id="act_request_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="request_view_tree"/>
+            <field name="view" ref="request_view_tree"/>
             <field name="act_window" ref="act_request_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_request_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="request_view_form"/>
+            <field name="view" ref="request_view_form"/>
             <field name="act_window" ref="act_request_form"/>
         </record>
         <menuitem parent_id="res.menu_res" 
diff --git a/trytond/res/user.xml b/trytond/res/user.xml
index 13380c81ae..caf0d90881 100644
--- a/trytond/res/user.xml
+++ b/trytond/res/user.xml
@@ -81,13 +81,13 @@
         <record model="ir.action.act_window.view"
             id="act_user_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="user_view_tree"/>
+            <field name="view" ref="user_view_tree"/>
             <field name="act_window" ref="act_user_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_user_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="user_view_form"/>
+            <field name="view" ref="user_view_form"/>
             <field name="act_window" ref="act_user_form"/>
         </record>
         <menuitem parent_id="res.menu_res"
@@ -138,13 +138,13 @@
         <record model="ir.action.act_window.view"
             id="act_group_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="group_view_tree"/>
+            <field name="view" ref="group_view_tree"/>
             <field name="act_window" ref="act_group_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_group_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="group_view_form"/>
+            <field name="view" ref="group_view_form"/>
             <field name="act_window" ref="act_group_form"/>
         </record>
         <menuitem parent_id="res.menu_res"
diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py
index 4fb5946763..1fe3a1a8d1 100644
--- a/trytond/tools/convert.py
+++ b/trytond/tools/convert.py
@@ -69,7 +69,7 @@ class MenuitemTagHandler:
                 "LEFT JOIN ir_action_wizard wizard ON (a.id = wizard.action) " \
                 "LEFT JOIN ir_action_url url ON (a.id = url.action) " \
                 "LEFT JOIN ir_action_act_window_view wv on (act.id = wv.act_window) " \
-                "LEFT JOIN ir_ui_view v on (v.id = wv.view_id) " \
+                "LEFT JOIN ir_ui_view v on (v.id = wv.view) " \
             "WHERE report.id = %d " \
                 "OR act.id = %d " \
                 "OR wizard.id = %d " \
diff --git a/trytond/webdav/webdav.xml b/trytond/webdav/webdav.xml
index 50d57551ff..32d8df1557 100644
--- a/trytond/webdav/webdav.xml
+++ b/trytond/webdav/webdav.xml
@@ -43,7 +43,7 @@
         <record model="ir.action.act_window.view"
             id="act_directory_tree_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="directory_view_tree"/>
+            <field name="view" ref="directory_view_tree"/>
             <field name="act_window" ref="act_directory_tree"/>
         </record>
         <menuitem parent_id="menu_webdav"
@@ -57,13 +57,13 @@
         <record model="ir.action.act_window.view"
             id="act_directory_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="directory_view_form"/>
+            <field name="view" ref="directory_view_form"/>
             <field name="act_window" ref="act_directory_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_directory_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="directory_view_tree"/>
+            <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"
diff --git a/trytond/workflow/workflow.xml b/trytond/workflow/workflow.xml
index ffbd0191a2..776b2275c9 100644
--- a/trytond/workflow/workflow.xml
+++ b/trytond/workflow/workflow.xml
@@ -40,13 +40,13 @@
         <record model="ir.action.act_window.view"
             id="act_workflow_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="workflow_view_tree"/>
+            <field name="view" ref="workflow_view_tree"/>
             <field name="act_window" ref="act_workflow_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_workflow_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="workflow_view_form"/>
+            <field name="view" ref="workflow_view_form"/>
             <field name="act_window" ref="act_workflow_form"/>
         </record>
         <menuitem parent_id="menu_workflow"
@@ -158,13 +158,13 @@
         <record model="ir.action.act_window.view"
             id="act_activity_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="activity_view_tree"/>
+            <field name="view" ref="activity_view_tree"/>
             <field name="act_window" ref="act_activity_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_activity_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="activity_view_form"/>
+            <field name="view" ref="activity_view_form"/>
             <field name="act_window" ref="act_activity_form"/>
         </record>
         <menuitem parent_id="menu_workflow"
@@ -218,13 +218,13 @@
         <record model="ir.action.act_window.view"
             id="act_transition_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="transition_view_tree"/>
+            <field name="view" ref="transition_view_tree"/>
             <field name="act_window" ref="act_transition_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_transition_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="transition_view_form"/>
+            <field name="view" ref="transition_view_form"/>
             <field name="act_window" ref="act_transition_form"/>
         </record>
         <menuitem parent_id="menu_workflow"
@@ -272,13 +272,13 @@
         <record model="ir.action.act_window.view"
             id="act_instance_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="instance_view_tree"/>
+            <field name="view" ref="instance_view_tree"/>
             <field name="act_window" ref="act_instance_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_instance_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="instance_view_form"/>
+            <field name="view" ref="instance_view_form"/>
             <field name="act_window" ref="act_instance_form"/>
         </record>
         <menuitem parent_id="menu_workflow"
@@ -323,13 +323,13 @@
         <record model="ir.action.act_window.view"
             id="act_workitem_form_view1">
             <field name="sequence" eval="1"/>
-            <field name="view_id" ref="workitem_view_tree"/>
+            <field name="view" ref="workitem_view_tree"/>
             <field name="act_window" ref="act_workitem_form"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_workitem_form_view2">
             <field name="sequence" eval="2"/>
-            <field name="view_id" ref="workitem_view_form"/>
+            <field name="view" ref="workitem_view_form"/>
             <field name="act_window" ref="act_workitem_form"/>
         </record>
         <menuitem parent_id="menu_workflow"