Merge lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error into lp:~extra-addons-commiter/e-commerce-addons/7.0

[Guewen Baconnier @ Camptocamp]

Fixes lp:1269291

Code was just broken...
The automatic reconciliation was no longer possible.

"invoice.sale_ids[0].payment_ids" are move lines since http://bazaar.launchpad.net/~extra-addons-commiter/e-commerce-addons/7.0/revision/282.1.25.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

It seems to me a conflict wasn't correctly resolved between
revid:<email address hidden>
and revid:<email address hidden>

This merge does the right changes

review: Approve (code review, no tests)

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi Guewen

Regarding the fix you should change the line 10 with :

payment_move_lines = self._get_payment(cr, uid, invoice, context=context)

Note : the _get_payment method will retrieve the correct move_line (the aim is to be able to extend the reconciliation for purchase order too, a real case is for the incoming invoice, prepaid in checkmo before validating the purchase order)

After this change it will be ok for me

review: Needs Fixing (code review, no tests)

[lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error]

291. By Guewen Baconnier @ Camptocamp on 2014-01-16

use method to get the move lines

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Hi Guewen
>
> Regarding the fix you should change the line 10 with :
>
> payment_move_lines = self._get_payment(cr, uid, invoice, context=context)
>
> Note : the _get_payment method will retrieve the correct move_line (the aim is
> to be able to extend the reconciliation for purchase order too, a real case is
> for the incoming invoice, prepaid in checkmo before validating the purchase
> order)
>
> After this change it will be ok for me

Thanks for reviewing! Done

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Thanks

review: Approve

=== modified file 'sale_automatic_workflow/invoice.py'
--- sale_automatic_workflow/invoice.py	2013-11-04 09:21:34 +0000
+++ sale_automatic_workflow/invoice.py	2014-01-16 07:59:53 +0000
@@ -119,12 +119,13 @@
         use_currency = currency.id != company_currency_id
         if self._can_be_reconciled(cr, uid, invoice, context=context):
             payment_move_lines = []
-            for payment in invoice.sale_ids[0].payment_ids:
-                payment_move_lines += payment.line_id
+            payment_move_lines = self._get_payment(cr, uid, invoice,
+                                                   context=context)
             res_payment = self._get_sum_payment_move_line(
-                cr, uid, payment_move_lines, context=context)
+                cr, uid, payment_move_lines, invoice.type, context=context)
             res_invoice = self._get_sum_invoice_move_line(
-                cr, uid, invoice.move_id.line_id, context=context)
+                cr, uid, invoice.move_id.line_id,
+                invoice.type, context=context)
             line_ids = res_invoice['line_ids'] + res_payment['line_ids']
             if not use_currency:
                 balance = abs(res_invoice['total_amount'] -