Merge lp:~akretion-team/openerp-connector-magento/7-fix-invoice-binding into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0-next-release

[David BEAL (ak)]

prevent create a second binding in invoice if invoice is cancel and yet validate (with account cancel)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi,

Following the logic of the code, if several magento.account.invoice bindings could be created for an invoice (several sales orders or linked with several backends). Even if this situation is highly improbable, I think it is important to follow the same logic.

So the check should be done in the inner(-inner) loop.

Also, I prefer when a condition returns eagerly than when it pushes all a block of an indentation level (avoid long lines, improve readability, reduce diff size hence conflicts).

In that case, it would have been:

    if invoice.magento_bind_ids:
        return

Or in the inner loop

    if [condition]:
        continue

thanks

review: Needs Fixing

[lp:~akretion-team/openerp-connector-magento/7-fix-invoice-binding]

981. By David BEAL (ak) on 2014-04-29

[FIX] prevent create a second binding with the same backend

[David BEAL (ak) (davidbeal)]

done

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks!

review: Approve (code review)

[Romain Deheele - Camptocamp (romaindeheele)]

LGTM,

Romain

review: Approve (code review)

=== modified file 'magentoerpconnect/invoice.py'
--- magentoerpconnect/invoice.py	2014-03-19 10:34:00 +0000
+++ magentoerpconnect/invoice.py	2014-04-29 14:12:17 +0000
@@ -215,6 +215,9 @@
     # we use the shop as many sale orders can be related to an invoice
     for sale in invoice.sale_ids:
         for magento_sale in sale.magento_bind_ids:
+            for mag_inv in invoice.magento_bind_ids:
+                if mag_inv.backend_id.id == magento_sale.backend_id.id:
+                    continue
             # Check if invoice state matches configuration setting
             # for when to export an invoice
             magento_stores = magento_sale.shop_id.magento_bind_ids