openerp-community-reviewer team mailing list archive

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

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

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/6.1-bug-1253701/+merge/196171

Fix for the bug 1253701. Details on the bug.
-- 
https://code.launchpad.net/~pedro.baeza/ocb-addons/6.1-bug-1253701/+merge/196171
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~pedro.baeza/ocb-addons/6.1-bug-1253701 into lp:ocb-addons/6.1.

=== modified file 'mrp/security/mrp_security.xml'
--- mrp/security/mrp_security.xml	2011-12-19 16:54:40 +0000
+++ mrp/security/mrp_security.xml	2013-11-21 17:34:36 +0000
@@ -36,7 +36,7 @@
         <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>
+        <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>
 
     <record model="ir.rule" id="mrp_routing_rule">