diff options
| author | Najlaa <nel@silver> | 2008-12-16 10:33:36 +0100 |
|---|---|---|
| committer | Najlaa <nel@silver> | 2008-12-16 10:33:36 +0100 |
| commit | deca5fffa9b7f5a5c88a92ff6b084df9e02ce075 (patch) | |
| tree | 6f07a1f4357338f3dc39039b54c037e1174dfcc2 /bin/addons/base | |
| parent | 8d14c3880a4bd6ed7c094a65f1e0847aea73a840 (diff) | |
| parent | ce70e60592b621c0b10ea531b1435b968beb04ac (diff) | |
merge
bzr revid: nel@silver-20081216093336-o69waqe4kbzx04c9
Diffstat (limited to 'bin/addons/base')
| -rw-r--r-- | bin/addons/base/base_data.xml | 2 | ||||
| -rw-r--r-- | bin/addons/base/ir/ir.xml | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml index e41fccfe682..4777b7ea4f0 100644 --- a/bin/addons/base/base_data.xml +++ b/bin/addons/base/base_data.xml @@ -19,7 +19,7 @@ <field name="view_id" ref="view_menu"/> <field name="res_model">ir.ui.menu</field> <field name="view_type">tree</field> - <field eval="'[(\'parent_id\',\'=\',False)]'" name="domain"/> + <field name="domain">[('parent_id', '=', False)]</field> </record> <record id="lang_en" model="res.lang"> diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index c649b12cf99..53c9fb7e580 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -324,12 +324,25 @@ </record> <menuitem action="ir_action_window" id="menu_ir_action_window" parent="base.next_id_6"/> - <record id="act_wizard_view" model="ir.ui.view"> + <record id="act_wizard_view_tree" model="ir.ui.view"> + <field name="name">ir.actions.wizard.tree</field> + <field name="model">ir.actions.wizard</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Wizard"> + <field name="name" select="1"/> + <field name="wiz_name" select="1"/> + <field name="multi"/> + </tree> + </field> + </record> + + <record id="act_wizard_view" model="ir.ui.view"> <field name="name">ir.actions.wizard</field> <field name="model">ir.actions.wizard</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Wizard"> + <form string="Wizards"> <field name="name" select="1"/> <field name="type" select="1"/> <field name="wiz_name" select="1"/> @@ -340,7 +353,7 @@ </record> <record id="ir_action_wizard" model="ir.actions.act_window"> - <field name="name">Wizard</field> + <field name="name">Wizards</field> <field name="type">ir.actions.act_window</field> <field name="res_model">ir.actions.wizard</field> <field name="view_type">form</field> |