diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-21 11:03:20 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-21 11:03:20 +0100 |
| commit | 5b3fc4061ba0c84f7e0ff466c4d7025f9cfa44e9 (patch) | |
| tree | d07f2c5bb9ec0ce018b824f91caa5f6f1da9c090 /openerp/addons/base/module/wizard | |
| parent | 919c0d1152ba869af49e4d9186698d35dbb89541 (diff) | |
| parent | 73cb6d5321cc71d85456e6f6e61fc34b79b95c16 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121221100320-ntn6zsdcqlvz52xn
Diffstat (limited to 'openerp/addons/base/module/wizard')
4 files changed, 7 insertions, 7 deletions
diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml index cbf7104f957..f184186a500 100644 --- a/openerp/addons/base/module/wizard/base_export_language_view.xml +++ b/openerp/addons/base/module/wizard/base_export_language_view.xml @@ -11,7 +11,7 @@ <group states="choose" string="Export Settings"> <field name="lang"/> <field name="format"/> - <field name="modules"/> + <field name="modules" widget="many2many_tags"/> </group> <div states="get"> <h2>Export Complete</h2> diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml index 192bf6c2a92..d9d6bb6ee78 100644 --- a/openerp/addons/base/module/wizard/base_module_import_view.xml +++ b/openerp/addons/base/module/wizard/base_module_import_view.xml @@ -43,7 +43,7 @@ id="menu_view_base_module_import" parent="menu_management" groups="base.group_no_one" - sequence="1"/> + sequence="6"/> --> </data> diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml index 75d2b1316a6..cb9b9090294 100644 --- a/openerp/addons/base/module/wizard/base_module_update_view.xml +++ b/openerp/addons/base/module/wizard/base_module_update_view.xml @@ -18,17 +18,17 @@ </group> <footer> <div states="init"> - <button name="update_module" string="Update" type="object" class="oe_highlight"/> or + <button name="update_module" string="Update" type="object" class="oe_highlight"/> or <button special="cancel" string="Cancel" class="oe_link"/> </div> <div states="done"> - <button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or + <button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or <button special="cancel" string="Close" class="oe_link"/> </div> </footer> </form> </field> - </record> + </record> <record id="action_view_base_module_update" model="ir.actions.act_window"> <field name="name">Module Update</field> @@ -45,7 +45,7 @@ id="menu_view_base_module_update" groups="base.group_no_one" parent="menu_management" - sequence="2" + sequence="40" icon="STOCK_CONVERT"/> </data> diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml index afd3a2e17b1..1a1225befcb 100644 --- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml +++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml @@ -35,7 +35,7 @@ groups="base.group_no_one" id="menu_view_base_module_upgrade" parent="menu_management" - sequence="3"/> + sequence="50"/> <record id="view_base_module_upgrade_install" model="ir.ui.view"> <field name="name">Module Upgrade Install</field> |