Merge lp:~openerp-dev/openobject-server/6.0-opw-16203-rha into lp:openobject-server/6.0

[Rifakat Husen (OpenERP)]

Hello,

I have added data tag with noupdate='1' excluding the groups defination, to be able to update the record rules.

Thanks,
Rifakat

[Priyesh (OpenERP) (pso-openerp)]

Hello Rifakat,

Thanks for the fix. Though, I need approval of Olivier.

Olivier, Can you please share your views ?

review: Approve

=== modified file 'bin/addons/base/res/res_security.xml'
--- bin/addons/base/res/res_security.xml	2011-03-02 11:08:16 +0000
+++ bin/addons/base/res/res_security.xml	2011-07-15 12:13:28 +0000
@@ -12,7 +12,11 @@
     <record model="ir.ui.menu" id="menu_base_config">
         <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
     </record>
-
+    
+</data>
+
+
+<data noupdate="1">
 
     <!-- Record Rule For Company -->
 
@@ -31,7 +35,6 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-
-
+    
 </data>
 </openerp>