Merge lp:~camptocamp/openobject-addons/7.0-fix-1206167 into lp:openobject-addons/7.0

[Yannick Vaucher @ Camptocamp]

Unmerged revisions

9312. By Yannick Vaucher @ Camptocamp on 2013-07-30

[PEP8]

9311. By Vincent Renaville@camptocamp on 2013-07-30

[FIX] account_payment - Add journal type filter, to prevent import of unreconciled bank move line

=== modified file 'account_payment/wizard/account_payment_order.py'
--- account_payment/wizard/account_payment_order.py	2013-06-20 13:32:51 +0000
+++ account_payment/wizard/account_payment_order.py	2013-08-15 09:37:32 +0000
@@ -104,7 +104,10 @@
 #        payment = self.pool.get('payment.order').browse(cr, uid, context['active_id'], context=context)
 
         # Search for move line to pay:
-        domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('amount_to_pay', '>', 0)]
+        domain = [('reconcile_id', '=', False),
+                  ('account_id.type', '=', 'payable'),
+                  ('journal_id.type','<>','bank'),
+                  ('amount_to_pay', '>', 0)]
         domain = domain + ['|', ('date_maturity', '<=', search_due_date), ('date_maturity', '=', False)]
         line_ids = line_obj.search(cr, uid, domain, context=context)
         context.update({'line_ids': line_ids})