Amit Bhavsar (Open ERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-930042-amb into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
  Amit Parik (OpenERP) (amp-openerp)
Related bugs:
  Bug #930042 in OpenERP Addons: "Exchange rates: Naming issue on Warning 
message"
  https://bugs.launchpad.net/openobject-addons/+bug/930042

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-930042-amb/+merge/104694

Hello,

Fixes for the warning message. which was raised wrong. Now It's fine.

Thanks!
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-930042-amb/+merge/104694
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-930042-amb.
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-08-20 11:02:07 +0000
+++ account_voucher/account_voucher.py	2012-08-27 13:29:39 +0000
@@ -950,11 +950,11 @@
         if amount_residual > 0:
             account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
             if not account_id:
+                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
+        else:
+            account_id = line.voucher_id.company_id.income_currency_exchange_account_id
+            if not account_id:
                 raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Income Currency Rate' on the company, then create accounting entry for currency rate difference."))
-        else:
-            account_id = line.voucher_id.company_id.income_currency_exchange_account_id
-            if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
         # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
         # the receivable/payable account may have a secondary currency, which render this field mandatory
         account_currency_id = company_currency <> current_currency and current_currency or False

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to