diff options
| author | Yogesh (OpenERP) <ysa@openerp.com> | 2011-01-17 17:58:40 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-01-17 17:58:40 +0100 |
| commit | cd8515c8b491c491d5f5d5a36bf9f19f32d1ee38 (patch) | |
| tree | b3a6751e634a99f5038edb0d5150b1a6863f19ef /bin | |
| parent | 41530916db980e84844d4bc247ad8fffd565e39c (diff) | |
| parent | fa0e10ba3c8bf12e7558d8b419354f6817a4e448 (diff) | |
[MERGE] base data: make default shortcuts non-updatable, to avoid possible conflicts at update
lp bug: https://launchpad.net/bugs/699866 fixed
bzr revid: odo@openerp.com-20110117165840-1d5cwsxf24lwflw3
Diffstat (limited to 'bin')
5 files changed, 28 insertions, 13 deletions
diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py index bb419fc90d3..cc1ed3778c6 100644 --- a/bin/addons/base/__openerp__.py +++ b/bin/addons/base/__openerp__.py @@ -52,6 +52,7 @@ 'module/wizard/base_import_language_view.xml', 'module/wizard/base_module_upgrade_view.xml', 'module/wizard/base_module_configuration_view.xml', + 'module/wizard/base_module_shortcut_data.xml', 'module/wizard/base_export_language_view.xml', 'module/wizard/base_update_translations_view.xml', 'res/res_request_view.xml', @@ -59,6 +60,7 @@ 'res/res_log_view.xml', 'res/partner/partner_report.xml', 'res/partner/partner_view.xml', + 'res/partner/partner_shortcut_data.xml', 'res/bank_view.xml', 'res/country_view.xml', 'res/res_currency_view.xml', diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml index 428eab63af9..f8abf1e2732 100644 --- a/bin/addons/base/module/wizard/base_module_configuration_view.xml +++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml @@ -38,12 +38,6 @@ <field name="key">action</field> <field name="model">ir.actions.todo</field> </record> - <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc"> - <field name="name">Reconfigure</field> - <field name="resource">ir.ui.menu</field> - <field name="user_id" ref="base.user_root"/> - <field name="res_id" ref="menu_view_base_module_configuration"/> - </record> </data> </openerp> diff --git a/bin/addons/base/module/wizard/base_module_shortcut_data.xml b/bin/addons/base/module/wizard/base_module_shortcut_data.xml new file mode 100644 index 00000000000..e5faaabdd5e --- /dev/null +++ b/bin/addons/base/module/wizard/base_module_shortcut_data.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data noupdate="1"> + + <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc"> + <field name="name">Reconfigure</field> + <field name="resource">ir.ui.menu</field> + <field name="user_id" ref="base.user_root"/> + <field name="res_id" ref="menu_view_base_module_configuration"/> + </record> + + </data> +</openerp> diff --git a/bin/addons/base/res/partner/partner_shortcut_data.xml b/bin/addons/base/res/partner/partner_shortcut_data.xml new file mode 100644 index 00000000000..ee534a2ff6b --- /dev/null +++ b/bin/addons/base/res/partner/partner_shortcut_data.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data noupdate="1"> + + <record id="ir_ui_view_sc_partner0" model="ir.ui.view_sc"> + <field name="name">Customers</field> + <field name="resource">ir.ui.menu</field> + <field name="user_id" ref="base.user_root"/> + <field name="res_id" ref="menu_partner_form"/> + </record> + + </data> +</openerp> diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index cf1d36cbaec..9d46404132c 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -590,12 +590,5 @@ groups="base.group_extended" /> - <record id="ir_ui_view_sc_partner0" model="ir.ui.view_sc"> - <field name="name">Customers</field> - <field name="resource">ir.ui.menu</field> - <field name="user_id" ref="base.user_root"/> - <field name="res_id" ref="menu_partner_form"/> - </record> - </data> </openerp> |