summaryrefslogtreecommitdiff
path: root/addons/procurement/security
diff options
context:
space:
mode:
authorrha@tinyerp.com <>2011-01-07 12:02:58 +0530
committerrha@tinyerp.com <>2011-01-07 12:02:58 +0530
commit496e491f4e9be433f1c5629c4ecc259041e2e5d2 (patch)
tree699b7b9cc5e0de931fb49c364f051707e058b439 /addons/procurement/security
parentbc8fe779879b79ff5d07e4b33b707b91a49262a3 (diff)
parentb61007cb7d68bcaa38f3cbaf0eac168dfbb6fc41 (diff)
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rha@tinyerp.com-20110107063258-nou8nqzwefq6xf2y
Diffstat (limited to 'addons/procurement/security')
-rw-r--r--addons/procurement/security/procurement_security.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index b6b15d565c6..2e250db461c 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -6,14 +6,14 @@
<field name="name">procurement multi-company</field>
<field name="model_id" search="[('model','=','procurement.order')]" 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_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="stock_warehouse_orderpoint_rule">
<field name="name">stock_warehouse.orderpoint multi-company</field>
<field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" 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_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
</data>