From fff2fe66da226902025707033f20e89f9b57a2bd Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 11 Oct 2013 09:22:10 +0200 Subject: [PATCH] [FIX] multi-company rule of procurement.rule object bzr revid: qdp-launchpad@openerp.com-20131011072210-llvfrr0n1a9xiyiu --- addons/procurement/procurement.py | 1 + addons/procurement/security/procurement_security.xml | 7 +++++++ addons/stock_location/security/stock_location_security.xml | 6 ------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 3f4ad6e6b37..60583519827 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -85,6 +85,7 @@ class procurement_rule(osv.osv): 'group_id': fields.many2one('procurement.group', 'Procurement Group'), 'action': fields.selection(selection=lambda s, cr, uid, context=None: s._get_action(cr, uid, context=context), string='Action', required=True), + 'company_id': fields.many2one('res.company', 'Company'), } diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml index 8b3a4fc3b9f..c19852d2f60 100644 --- a/addons/procurement/security/procurement_security.xml +++ b/addons/procurement/security/procurement_security.xml @@ -9,5 +9,12 @@ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)] + + product_pulled_flow multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + diff --git a/addons/stock_location/security/stock_location_security.xml b/addons/stock_location/security/stock_location_security.xml index 2f406614380..2ef99b53025 100644 --- a/addons/stock_location/security/stock_location_security.xml +++ b/addons/stock_location/security/stock_location_security.xml @@ -3,12 +3,6 @@ - - product_pulled_flow multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - stock_location_path multi-company