openerp-community-reviewer team mailing list archive

[Pedro Manuel Baeza <pedro.baeza@xxxxxxxxx>]

Pedro Manuel Baeza has proposed merging lp:~pedro.baeza/ocb-addons/7.0-bug-1253701 into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1253701 in OpenERP Community Backports (Addons): "[trunk/7.0/6.1/6.0] Incorrect multi-company rule for BOMs"
  https://bugs.launchpad.net/ocb-addons/+bug/1253701

For more details, see:
https://code.launchpad.net/~pedro.baeza/ocb-addons/7.0-bug-1253701/+merge/196170

Fix for the bug 1253701. All the explanations are in the bug description.
-- 
https://code.launchpad.net/~pedro.baeza/ocb-addons/7.0-bug-1253701/+merge/196170
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~pedro.baeza/ocb-addons/7.0-bug-1253701 into lp:ocb-addons.

=== modified file 'mrp/security/mrp_security.xml'
--- mrp/security/mrp_security.xml	2012-10-23 16:05:04 +0000
+++ mrp/security/mrp_security.xml	2013-11-21 17:17:27 +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"/>