Merge lp:~camptocamp/openerp-connector-magento/7.0-export-invoice-no-id-1337778 into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

[Guewen Baconnier @ Camptocamp]

Fix: lp:1337778

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Moved to GitHub: https://github.com/OCA/connector-magento/pull/10

Unmerged revisions

1007. By Guewen Baconnier @ Camptocamp on 2014-07-04

When Magento returns no ID when we create an invoice, try to get the invoice's ID otherwise, just consider the job as done, but do not bind with a None ID

1006. By Guewen Baconnier @ Camptocamp on 2014-07-04

Prevent Binder to bind when external or binding id is missing

=== modified file 'magentoerpconnect/invoice.py'
--- magentoerpconnect/invoice.py	2014-05-26 09:37:00 +0000
+++ magentoerpconnect/invoice.py	2014-07-04 10:03:56 +0000
@@ -176,6 +176,7 @@
         mail_notification = magento_store.send_invoice_paid_mail
 
         lines_info = self._get_lines_info(invoice)
+        magento_id = None
         try:
             magento_id = self._export_invoice(magento_order.magento_id,
                                               lines_info,
@@ -190,18 +191,32 @@
                               'the invoice id.',
                               magento_order.magento_id)
                 magento_id = self._get_existing_invoice(magento_order)
+                if magento_id is None:
+                    # In that case, we let the exception bubble up so
+                    # the user is informed of the 102 error.
+                    # We couldn't find the invoice supposedly existing
+                    # so an investigation may be necessary.
+                    raise
             else:
                 raise
+        # When the invoice already exists on Magento, it may return
+        # a 102 error (handled above) or return silently without ID
+        if not magento_id:
+            # If Magento returned no ID, try to find the Magento
+            # invoice, but if we don't find it, let consider the job
+            # as done, because Magento did not raised an error
+            magento_id = self._get_existing_invoice(magento_order)
 
-        self.binder.bind(magento_id, binding_id)
+        if magento_id:
+            self.binder.bind(magento_id, binding_id)
 
     def _get_existing_invoice(self, magento_order):
         invoices = self.backend_adapter.search_read(
-                order_id=magento_order.magento_order_id)
+            order_id=magento_order.magento_order_id)
         if not invoices:
-            raise
+            return
         if len(invoices) > 1:
-            raise
+            return
         return invoices[0]['increment_id']
 
 
 
=== modified file 'magentoerpconnect/unit/binder.py'
--- magentoerpconnect/unit/binder.py	2014-05-27 15:23:44 +0000
+++ magentoerpconnect/unit/binder.py	2014-07-04 10:03:56 +0000
@@ -120,6 +120,10 @@
         context = self.session.context.copy()
         context['connector_no_export'] = True
         now_fmt = datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        assert external_id and binding_id, (
+            "external_id or binding_id missing, "
+            "got: %s, %s" % (external_id, binding_id)
+        )
         self.environment.model.write(
             self.session.cr,
             self.session.uid,