summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorCedric Snauwaert <csn@openerp.com>2015-11-24 17:29:58 +0100
committerCedric Snauwaert <csn@openerp.com>2015-11-24 17:29:58 +0100
commit0ff9a1c34a8019081c1fb2d5f97c984b9c6a1b99 (patch)
tree56066011eca27f3d5f7396c940d97f951ff3c755 /addons
parentdad1e378258894f0d77fa56c398d809de6ac8162 (diff)
[FIX] account: wrong error message for _check_currency constraint
Diffstat (limited to 'addons')
-rw-r--r--addons/account/i18n/account.pot2
-rw-r--r--addons/account/models/account_move.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index b62371c8fdf..11b15c01ed5 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -7813,7 +7813,7 @@ msgstr ""
#. module: account
#: code:addons/account/models/account_move.py:372
#, python-format
-msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account."
msgstr ""
#. module: account
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index f72e5b6bbaa..90e8fc1887f 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -374,7 +374,7 @@ class AccountMoveLine(models.Model):
for line in self:
if line.account_id.currency_id:
if not line.currency_id or line.currency_id.id != line.account_id.currency_id.id:
- raise UserError(_('The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.'))
+ raise UserError(_('The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account.'))
@api.multi
@api.constrains('currency_id', 'amount_currency')