Merge lp:~pedro.baeza/openobject-addons/7.0-bug-1253701 into lp:openobject-addons/7.0

[Pedro Manuel Baeza]

Branch to fix bug 1253701.

[Pedro Manuel Baeza (pedro.baeza)]

I have put it on noupdate=0 section to allow to update users that has already installed the module.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

LGTM

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello Pedro,

As discussed on the bug report, we can not accept this in standard. I will reject this merge then.

Thank you for your understanding

review: Disapprove

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Martin,

As commented on the bug, please reconsider it.

Regards.

Unmerged revisions

9630. By Pedro Manuel Baeza on 2013-11-21

[FIX] mrp: mrp.bom multi-company rule

=== modified file 'mrp/security/mrp_security.xml'
--- mrp/security/mrp_security.xml	2012-07-13 17:08:38 +0000
+++ mrp/security/mrp_security.xml	2013-11-21 17:09:53 +0000
@@ -23,6 +23,13 @@
         <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
     </record>
 
+    <record model="ir.rule" id="mrp_bom_rule">
+        <field name="name">mrp_bom multi-company</field>
+        <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <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>
+
 </data>
 <data noupdate="1">
 <!-- Multi -->
@@ -40,13 +47,6 @@
         <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
-    <record model="ir.rule" id="mrp_bom_rule">
-        <field name="name">mrp_bom multi-company</field>
-        <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-    </record>
-
     <record model="ir.rule" id="mrp_routing_rule">
         <field name="name">mrp_routing multi-company</field>
         <field name="model_id" search="[('model','=','mrp.routing')]" model="ir.model"/>