openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #02144
[Merge] lp:~openerp-dev/openobject-server/menu_shortcuts into lp:openobject-server
Ysa(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/menu_shortcuts into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/menu_shortcuts/+merge/45814
[FIX] shortcuts remove in view file and create data in separate file and set noupdate='1'.
https://bugs.launchpad.net/openobject-server/+bug/699866
--
https://code.launchpad.net/~openerp-dev/openobject-server/menu_shortcuts/+merge/45814
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/menu_shortcuts.
=== modified file 'bin/addons/base/__openerp__.py'
--- bin/addons/base/__openerp__.py 2011-01-07 15:17:35 +0000
+++ bin/addons/base/__openerp__.py 2011-01-11 06:36:10 +0000
@@ -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',
=== modified file 'bin/addons/base/module/wizard/base_module_configuration_view.xml'
--- bin/addons/base/module/wizard/base_module_configuration_view.xml 2010-12-16 13:17:30 +0000
+++ bin/addons/base/module/wizard/base_module_configuration_view.xml 2011-01-11 06:36:10 +0000
@@ -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>
=== added file 'bin/addons/base/module/wizard/base_module_shortcut_data.xml'
--- bin/addons/base/module/wizard/base_module_shortcut_data.xml 1970-01-01 00:00:00 +0000
+++ bin/addons/base/module/wizard/base_module_shortcut_data.xml 2011-01-11 06:36:10 +0000
@@ -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>
=== added file 'bin/addons/base/res/partner/partner_shortcut_data.xml'
--- bin/addons/base/res/partner/partner_shortcut_data.xml 1970-01-01 00:00:00 +0000
+++ bin/addons/base/res/partner/partner_shortcut_data.xml 2011-01-11 06:36:10 +0000
@@ -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>
=== modified file 'bin/addons/base/res/partner/partner_view.xml'
--- bin/addons/base/res/partner/partner_view.xml 2010-12-30 10:29:43 +0000
+++ bin/addons/base/res/partner/partner_view.xml 2011-01-11 06:36:10 +0000
@@ -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>
Follow ups