Merge lp:~therp-nl/banking-addons/ba61-lp986088-fix_import_move_lines_without_invoice into lp:banking-addons/6.1

[Stefan Rijnhart (Opener)]

In account_banking, a method from account.payment is replaced by a slightly modified version. This branch applies a bugfix that was applied to the original method. To keep the changes compared to the original method as small as possible, I did not fix the line length of the orignal patch.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM as we want to be able to track the same line in case of trouble !

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Forget the approve...

review: Approve

=== modified file 'account_banking/wizard/account_payment_order.py'
--- account_banking/wizard/account_payment_order.py	2011-12-08 21:20:05 +0000
+++ account_banking/wizard/account_payment_order.py	2013-01-10 13:43:20 +0000
@@ -112,7 +112,7 @@
                 'state': state,
                 ### end account banking
                 'date': date_to_pay,
-                'currency': line.invoice and line.invoice.currency_id.id or False,
+                'currency': line.invoice and line.invoice.currency_id.id or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}