diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/account/security | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/account/security')
| -rw-r--r-- | addons/account/security/account_security.xml | 12 | ||||
| -rw-r--r-- | addons/account/security/ir.model.access.csv | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index b7271fec84b..5c4c9a0a525 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -2,14 +2,15 @@ <openerp><data> <record id="group_account_invoice" model="res.groups"> - <field name="name">Accounting / Invoice</field> + <field name="name">Accounting / Invoicing & Payments</field> </record> - <record id="group_account_user" model="res.groups" context="{'noadmin':True}"> <field name="name">Accounting / Accountant</field> + <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/> </record> <record id="group_account_manager" model="res.groups" context="{'noadmin':True}"> <field name="name">Accounting / Manager</field> + <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/> </record> <record id="account_move_comp_rule" model="ir.rule"> @@ -97,6 +98,13 @@ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> + <record id="invoice_analysis_comp_rule" model="ir.rule"> + <field name="name">Invoice Analysis multi-company</field> + <field model="ir.model" name="model_id" ref="model_account_invoice_report"/> + <field eval="True" name="global"/> + <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + </record> + <record id="account_fiscal_position_comp_rule" model="ir.rule"> <field name="name">Account fiscal Mapping company rule</field> <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/> diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 50e8dced7e6..cd945a2248d 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -37,6 +37,7 @@ "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0 "access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0 +"access_account_analytic_journal_user","account.analytic.journal","model_account_analytic_journal","base.group_user",1,1,1,0 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1 |