From bb8afe3a4afbb93ebd602033b5338a63bbde25e4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 23 Aug 2012 14:20:50 +0200
Subject: [PATCH] [IMP] remove some of the @noupdate=1 introduced in a
 previous merge targeting modules' descriptions improvement
 this will preserve the previous behavior of modules update
 operation

bzr revid: abo@openerp.com-20120823122050-9fw0id92idc1m36l
---
 openerp/addons/base/base_menu.xml              |    2 +-
 openerp/addons/base/res/res_config.xml         |    3 ++-
 openerp/addons/base/res/res_security.xml       |    2 +-
 openerp/addons/base/security/base_security.xml |   10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index f3e0cda..770e0e2 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
         <!-- Top menu item -->
         <menuitem name="Reporting"
diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index a705250..342aeaa 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
+        
         <record id="res_config_view_base" model="ir.ui.view">
             <field name="name">res.config.view.base</field>
             <field name="model">res.config</field>
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 8aa18bd..e4c6d22 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+<data>
 
     <record model="res.groups" id="group_partner_manager">
         <field name="name">Partner Manager</field>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 11be6e3..1762554 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
-<!--
- Users Groups
-    [Note] Field 'category_id' is set later in base/module/module_data.xml
--->
+    <!--
+        Users Groups
+        [Note] Field 'category_id' is set later in base/module/module_data.xml
+    -->
     <record model="res.groups" id="group_erp_manager">
         <field name="name">Access Rights</field>
     </record>
-- 
1.7.10.4