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 1/3] [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 f3e0cda7e12..770e0e2d329 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 a705250b989..342aeaa6e0f 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 8aa18bd8df4..e4c6d22b4ff 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 11be6e35bd1..1762554f729 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>

From 9f933d0ae329baa046ff72528d20d9fe6918ac73 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 23 Aug 2012 16:15:31 +0200
Subject: [PATCH 2/3] [IMP] put @noupdate="1" back in place for xml security
 files

bzr revid: abo@openerp.com-20120823141531-l01abke754duh4z5
---
 openerp/addons/base/res/res_security.xml       | 6 +-----
 openerp/addons/base/security/base_security.xml | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index e4c6d22b4ff..826bc073675 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>
+<data noupdate="1">
 
     <record model="res.groups" id="group_partner_manager">
         <field name="name">Partner Manager</field>
@@ -16,10 +16,6 @@
         <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
     </record>
 
-</data>
-
-<data noupdate="1">
-
     <!-- Record Rule For Company -->
 
     <record id="res_company_rule" model="ir.rule">
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 1762554f729..78916c94273 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
     <!--
         Users Groups
@@ -45,10 +45,6 @@
         <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
     </record>
 
-    </data>
-
-    <data noupdate="1">
-
         <record model="ir.rule" id="res_widget_user_rule">
             <field name="name">res.widget.user rule</field>
             <field name="model_id" ref="model_res_widget_user"/>

From 445ddc75948ec8f8a73b929542127467393757c0 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 23 Aug 2012 16:20:36 +0200
Subject: [PATCH 3/3] [IMP] indentation

bzr revid: abo@openerp.com-20120823142036-e0kmr9ri1e8ns56d
---
 openerp/addons/base/res/res_security.xml      | 59 +++++++------
 .../addons/base/security/base_security.xml    | 82 ++++++++++---------
 2 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 826bc073675..c7d2a77f846 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+    <data noupdate="1">
 
-    <record model="res.groups" id="group_partner_manager">
-        <field name="name">Partner Manager</field>
-    </record>
+        <record model="res.groups" id="group_partner_manager">
+            <field name="name">Partner Manager</field>
+        </record>
 
-    <record model="ir.ui.menu" id="menu_config_address_book">
-        <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
-    <record model="ir.ui.menu" id="menu_base_config">
-        <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
-    <record model="ir.ui.menu" id="menu_base_partner">
-        <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
+        <record model="ir.ui.menu" id="menu_config_address_book">
+            <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
+        <record model="ir.ui.menu" id="menu_base_config">
+            <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
+        <record model="ir.ui.menu" id="menu_base_partner">
+            <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
 
-    <!-- Record Rule For Company -->
+        <!-- Record Rule For Company -->
+        <record id="res_company_rule" model="ir.rule">
+            <field name="name">company rule</field>
+            <field model="ir.model" name="model_id" ref="model_res_company"/>
+            <field eval="True" name="global"/>
+            <!-- TODO: review this <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
+            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
+        </record>
 
-    <record id="res_company_rule" model="ir.rule">
-        <field name="name">company rule</field>
-        <field model="ir.model" name="model_id" ref="model_res_company"/>
-        <field eval="True" name="global"/>
-        <!-- TODO: review this <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
-        <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
-    </record>
+        <!-- Record Rule For User -->
+        <record id="res_users_rule" model="ir.rule">
+            <field name="name">user rule</field>
+            <field model="ir.model" name="model_id" ref="model_res_users"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
+        </record>
 
-    <!-- Record Rule For User -->
-    <record id="res_users_rule" model="ir.rule">
-        <field name="name">user rule</field>
-        <field model="ir.model" name="model_id" ref="model_res_users"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
-    </record>
-    
-</data> 
+    </data>
 </openerp>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 78916c94273..8eb832ea618 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -2,48 +2,49 @@
 <openerp>
     <data noupdate="1">
 
-    <!--
-        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>
-    <record model="res.groups" id="group_system">
-        <field name="name">Configuration</field>
-        <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
+        <!--
+            Users Groups
+            Note that the 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>
+        <record model="res.groups" id="group_system">
+            <field name="name">Configuration</field>
+            <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
 
-    <record model="res.groups" id="group_user">
-        <field name="name">Employee</field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
+        <record model="res.groups" id="group_user">
+            <field name="name">Employee</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
 
-    <record model="res.groups" id="group_multi_company">
-        <field name="name">Multi Companies</field>
-    </record>
-    
-    <record model="res.groups" id="group_multi_currency">
-        <field name="name">Multi Currencies</field>
-    </record>
+        <record model="res.groups" id="group_multi_company">
+            <field name="name">Multi Companies</field>
+        </record>
 
-    <record model="res.groups" id="group_no_one">
-        <field name="name">Technical Features</field>
-    </record>
+        <record model="res.groups" id="group_multi_currency">
+            <field name="name">Multi Currencies</field>
+        </record>
 
-    <record id="group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-    </record>
-    <record id="group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
-    </record>
+        <record model="res.groups" id="group_no_one">
+            <field name="name">Technical Features</field>
+        </record>
 
-    <!-- Set accesses to menu -->
-    <record model="ir.ui.menu" id="base.menu_administration">
-        <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
-    </record>
+        <record id="group_sale_salesman" model="res.groups">
+            <field name="name">User</field>
+        </record>
+        <record id="group_sale_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
+        </record>
+
+        <!-- Set accesses to menu -->
+        <record model="ir.ui.menu" id="base.menu_administration">
+            <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
+        </record>
 
         <record model="ir.rule" id="res_widget_user_rule">
             <field name="name">res.widget.user rule</field>
@@ -54,8 +55,11 @@
         <record model="ir.rule" id="res_partner_rule">
             <field name="name">res.partner company</field>
             <field name="model_id" ref="model_res_partner"/>
-            <!-- Show partners from ancestors and descendants companies (or company-less), this is usually a better
-                 default for multicompany setups. -->
+            <!--
+                Show partners from ancestors and descendants companies
+                (or company-less), this is usually a better default for
+                multicompany setups.
+            -->
             <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
         </record>