diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-06 17:17:05 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-06 17:17:05 +0530 |
| commit | dec836ec284ea874822e29b183d62502266c3c56 (patch) | |
| tree | c09567d903a1ec5bce7adce07043c0281ef60fcb /addons/document/security/document_security.xml | |
| parent | 61b21841b1751b63336cb8dcacab57c76ff6b0a1 (diff) | |
| parent | c738ec75ca0048c13b7854a0665ae87f048e3acf (diff) | |
[MERGE] Merge with team1 branch
bzr revid: sbh@tinyerp.com-20110106114705-9jbx7e33a2sl101c
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"/> |