[MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)

ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary

bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2

addons/hr/security/hr_security.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+<data noupdate="0">
 
     <record model="res.groups" id="base.group_user">
         <field name="comment">the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
@@ -19,6 +19,10 @@
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
+
+</data>
+<data noupdate="1">
+
     <record id="hr_dept_comp_rule" model="ir.rule">
         <field name="name">Department multi company rule</field>
         <field model="ir.model" name="model_id" ref="model_hr_department"/>
@@ -31,6 +35,6 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-    
-    </data>
+
+</data>
 </openerp>