savoirfairelinux-openerp team mailing list archive

["Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>]

Guewen Baconnier @ Camptocamp has proposed merging lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error into lp:e-commerce-addons.

Requested reviews:
  extra-addons-commiter (extra-addons-commiter)
Related bugs:
  Bug #1269291 in e-commerce-addons: "sale_automatic_workflow does not reconcile"
  https://bugs.launchpad.net/e-commerce-addons/+bug/1269291

For more details, see:
https://code.launchpad.net/~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error/+merge/201727

Fixes lp:1269291

Code was just broken...
The automatic reconciliation was no longer possible.
-- 
https://code.launchpad.net/~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error/+merge/201727
Your team extra-addons-commiter is requested to review the proposed merge of lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error into lp:e-commerce-addons.

=== 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-15 08:33:24 +0000
@@ -119,12 +119,12 @@
         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 = invoice.sale_ids[0].payment_ids
             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'] -