[MERGE] base data: make default shortcuts non-updatable, to avoid possible conflicts...
authorYogesh (OpenERP) <ysa@openerp.com>
Mon, 17 Jan 2011 16:58:40 +0000 (17:58 +0100)
committerOlivier Dony <odo@openerp.com>
Mon, 17 Jan 2011 16:58:40 +0000 (17:58 +0100)
commitcd8515c8b491c491d5f5d5a36bf9f19f32d1ee38
treeb3a6751e634a99f5038edb0d5150b1a6863f19ef
parent41530916db980e84844d4bc247ad8fffd565e39c
parentfa0e10ba3c8bf12e7558d8b419354f6817a4e448
[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
bin/addons/base/module/wizard/base_module_configuration_view.xml
bin/addons/base/res/partner/partner_view.xml