diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py index dde529b6002..661180c0874 100644 --- a/addons/crm/wizard/crm_merge_opportunities.py +++ b/addons/crm/wizard/crm_merge_opportunities.py @@ -73,7 +73,7 @@ class crm_merge_opportunity(osv.osv_memory): for this in self.browse(cr, uid, ids, context=context): for opp in this.opportunity_ids: - opp_obj.write(cr, uid, opp.id, { + opp_obj.write(cr, uid, [opp.id], { 'stage_id': opp.stage_id.id or current_opp.stage_id.id or False, 'priority': opp.priority or current_opp.priority, 'email_from': opp.email_from or current_opp.email_from, diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml index ca55a8219c1..ee669052fde 100644 --- a/addons/document/security/document_security.xml +++ b/addons/document/security/document_security.xml @@ -16,7 +16,7 @@ - ['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&', ('user_id', '=', False), ('group_ids','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])] + ['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&', ('user_id', '=', False), ('group_ids','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Read public directories @@ -28,7 +28,7 @@ - [ '|', ('user_id', '=', user.id), '&', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])] + [ '|', ('user_id', '=', user.id), '&', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Document modify own directories diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml index 7dd67c39f6c..2e250db461c 100644 --- a/addons/procurement/security/procurement_security.xml +++ b/addons/procurement/security/procurement_security.xml @@ -6,14 +6,14 @@ procurement multi-company - ['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)] + ['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])] stock_warehouse.orderpoint multi-company - ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)] + ['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 786b5d2a7ff..5cc873beb75 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -38,7 +38,7 @@ Sale Shop multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]