diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-06-10 10:59:27 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-06-10 10:59:27 +0530 |
| commit | 53e8ddb3df0d6ed4a2258d4eccd5ca41e3f496b0 (patch) | |
| tree | 15d80b15f91d65b4cc2cba7841fa5c901ee06467 /addons/analytic | |
| parent | 4d4385d8ca5fd2e5ab3a3cf51ccd3bb04cf3c064 (diff) | |
| parent | 70f16ce73b0dab305b9e7d63a74416cbcb0448da (diff) | |
[MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130610052927-b496hrq36mlrs5xi
Diffstat (limited to 'addons/analytic')
| -rw-r--r-- | addons/analytic/analytic.py | 2 | ||||
| -rw-r--r-- | addons/analytic/security/analytic_security.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index ac298713b04..ce79c4d5ffb 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -157,7 +157,7 @@ class account_analytic_account(osv.osv): for account in self.browse(cr, uid, ids, context=context): if account.company_id: if account.company_id.currency_id.id != value: - raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example.")) + raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really useful for consolidation purposes of several companies charts with different currencies, for example.")) if value: return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, )) diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index 70688275de2..bf103ca8988 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -4,14 +4,14 @@ <record id="analytic_comp_rule" model="ir.rule"> <field name="name">Analytic multi company rule</field> - <field model="ir.model" name="model_id" ref="model_account_analytic_account"/> + <field name="model_id" ref="model_account_analytic_account"/> <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_line_comp_rule" model="ir.rule"> <field name="name">Analytic line multi company rule</field> - <field model="ir.model" name="model_id" ref="model_account_analytic_line"/> + <field name="model_id" ref="model_account_analytic_line"/> <field eval="True" name="global"/> <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> |