banking-addons-team team mailing list archive

["Holger Brunn \(Therp\)" <hbrunn@xxxxxxxx>]

Holger Brunn (Therp) has proposed merging lp:~therp-nl/banking-addons/6.1_fix_lacking_invoice_and_move_line into lp:banking-addons.

Requested reviews:
  Banking Addons Team (banking-addons-team)

For more details, see:
https://code.launchpad.net/~therp-nl/banking-addons/6.1_fix_lacking_invoice_and_move_line/+merge/154689
-- 
https://code.launchpad.net/~therp-nl/banking-addons/6.1_fix_lacking_invoice_and_move_line/+merge/154689
Your team Banking Addons Team is requested to review the proposed merge of lp:~therp-nl/banking-addons/6.1_fix_lacking_invoice_and_move_line into lp:banking-addons.

=== modified file 'account_banking/banking_import_transaction.py'
--- account_banking/banking_import_transaction.py	2013-02-07 09:56:06 +0000
+++ account_banking/banking_import_transaction.py	2013-03-21 12:57:47 +0000
@@ -374,7 +374,7 @@
                 move_line = False
                 partial = False
 
-            elif len(candidates) == 1:
+            elif len(candidates) == 1 and candidates[0].invoice:
                 # Mismatch in amounts
                 move_line = candidates[0]
                 invoice = move_line.invoice
@@ -422,10 +422,10 @@
                     if x.partner_id.id == move_line.partner_id.id
                     ]
                 
-            return (trans, self._get_move_info(
-                    cr, uid, [move_line.id],
-                    account_ids and account_ids[0] or False),
-                    trans2)
+                return (trans, self._get_move_info(
+                        cr, uid, [move_line.id],
+                        account_ids and account_ids[0] or False),
+                        trans2)
 
         return trans, False, False