diff options
| author | jam-openerp <jam@tinyerp.com> | 2010-12-31 13:58:49 +0530 |
|---|---|---|
| committer | jam-openerp <jam@tinyerp.com> | 2010-12-31 13:58:49 +0530 |
| commit | 951754060d2308ec6721fe5b0c887bf1880eb4d1 (patch) | |
| tree | dd84dbcf3cbaf6034dca727478644229a7652efa /addons/document/security/document_security.xml | |
| parent | ef644ffe46a17647121e09895d0f9ba7d35a62db (diff) | |
| parent | 93c221d29603ba5f0213fd21de94bf72f21bf14b (diff) | |
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: jam@tinyerp.com-20101231072542-70a11o30k1cek98b
bzr revid: jam@tinyerp.com-20101231082849-acysabn1q0cw8wgq
Diffstat (limited to 'addons/document/security/document_security.xml')
| -rw-r--r-- | addons/document/security/document_security.xml | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ <record id="ir_rule_readpublicdirectories0" model="ir.rule"> <field name="model_id" ref="document.model_document_directory"/> - <field name="domain_force">['|','|',('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])]</field> + <field name="domain_force">['|','|',('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])]</field> <field name="name">Read public directories</field> <field eval="0" name="global"/> <field eval="[(6,0,[ref('base.group_user')])]" name="groups"/> @@ -28,7 +28,7 @@ <record id="ir_rule_documentmodifyowndirectories0" model="ir.rule"> <field name="model_id" ref="document.model_document_directory"/> - <field name="domain_force">[ '|', ('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])]</field> + <field name="domain_force">[ '|', ('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])]</field> <field name="name">Document modify own directories</field> <field eval="0" name="global"/> <field eval="[(6,0,[ref('base.group_document_user')])]" name="groups"/> |