diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/analytic/security | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/analytic/security')
| -rw-r--r-- | addons/analytic/security/analytic_security.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index bf103ca8988..43bf89de406 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -15,6 +15,13 @@ <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> + + <record id="analytic_journal_comp_rule" model="ir.rule"> + <field name="name">Analytic journal multi-company</field> + <field name="model_id" ref="model_account_analytic_journal"/> + <field name="global" eval="True"/> + <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + </record> </data> <data noupdate="0"> |