[MERGE] merge of rpa's branch: we shouldn't be able to see orderpoint and procurement of parent companies (reverted other rules for pricelist from proposed branch)

bzr revid: qdp-launchpad@openerp.com-20110531212320-gizw4iaz2t0wdw4b
This commit is contained in:
Quentin (OpenERP) 2011-05-31 23:23:20 +02:00
commit 4ea9c5e715
1 changed files with 2 additions and 2 deletions

View File

@ -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),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</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),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
</record>
</data>