Merge lp:~openerp-dev/openobject-addons/6.1-opw-590373-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

OpenERP v6.1 . Home currency is EUR.
Create USD bank account and did the following steps:

Input a customer payment USD 1,000 without reconcile with any sales
invoice. Validate this payment.
Then I got the following entries which have two positive 1,000 in Amount
Currency.

Unmerged revisions

7195. By Dhruti Shastri(OpenERP) on 2013-03-28

[account_voucher] : Payment in foreign currency with no Sign (case: 590373)

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-12-05 17:57:01 +0000
+++ account_voucher/account_voucher.py	2013-03-28 11:47:23 +0000
@@ -1152,6 +1152,7 @@
                 account_id = voucher_brw.partner_id.property_account_receivable.id
             else:
                 account_id = voucher_brw.partner_id.property_account_payable.id
+            sign = voucher_brw.type == 'payment' and -1 or 1
             move_line = {
                 'name': write_off_name or name,
                 'account_id': account_id,
@@ -1160,7 +1161,7 @@
                 'date': voucher_brw.date,
                 'credit': diff > 0 and diff or 0.0,
                 'debit': diff < 0 and -diff or 0.0,
-                'amount_currency': company_currency <> current_currency and voucher_brw.writeoff_amount or False,
+                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher_brw.writeoff_amount) or False,
                 'currency_id': company_currency <> current_currency and current_currency or False,
                 'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
             }