Merge lp:~openerp-connector-community/openerp-connector-magento/7.0-magentoerpconnect-carrier-export-1238951 into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

[Guewen Baconnier @ Camptocamp]

Fixes: https://bugs.launchpad.net/openerp-connector/+bug/1238951

[Brendan Clune (Logic Supply) (brendan-clune)]

LGTM, haven't tested but Allison Miller will test today and provide a review.

review: Approve

[Allison (allison-miller)]

Works great, thanks for the quick work

review: Approve

=== modified file 'magentoerpconnect/stock_tracking.py'
--- magentoerpconnect/stock_tracking.py	2013-05-01 12:33:18 +0000
+++ magentoerpconnect/stock_tracking.py	2013-10-12 19:55:10 +0000
@@ -80,13 +80,19 @@
         if not picking.carrier_tracking_ref:
             return _('No tracking number to send.')
 
+        sale_binding_id = picking.magento_order_id
+        if not sale_binding_id:
+            return FailedJobError("No sales order is linked with the picking "
+                                  "%s, can't export the tracking number." %
+                                  picking.name)
+
         magento_picking_id = picking.magento_id
         if magento_picking_id is None:
             raise NoExternalId("No value found for the picking ID on "
                                "Magento side, the job will be retried later.")
 
         self._validate(picking)
-        self._check_allowed_carrier(picking, magento_picking_id)
+        self._check_allowed_carrier(picking, sale_binding_id.magento_id)
         tracking_args = self._get_tracking_args(picking)
         self.backend_adapter.add_tracking_number(magento_picking_id,
                                                  *tracking_args)