[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/__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',

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>

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>

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>

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>