Merge lp:~magentoerpconnect-core-editors/magentoerpconnect/oerp6.1-oldstable-nocheck_tracking-1108643 into lp:magentoerpconnect/oerp6.1-oldstable

[Guewen Baconnier @ Camptocamp]

[FIX] do not check if the carrier exists in getCarrier if there is no tracking number, do not send an empty tracking number

Fix for bug lp:1108643

Skip the check and creation of a tracking number if the tracking number is empty.
Currently, the check prevent to export a picking if the carrier is not in the
Magento's 'getCarriers' list.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Same fix for oerp6.1-stable: https://code.launchpad.net/~magentoerpconnect-core-editors/magentoerpconnect/oerp6.1-stable-nocheck_tracking-1108643/+merge/145323

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Don't we want to have at least something logged telling us that something is not correctly configured?

review: Needs Information

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

Unmerged revisions

666. By Guewen Baconnier @ Camptocamp on 2013-01-29

[FIX] do not check if the carrier exists in getCarrier if there is no tracking number, do not send an empty tracking number

=== modified file 'magentoerpconnect/stock.py'
--- magentoerpconnect/stock.py	2012-06-27 15:44:07 +0000
+++ magentoerpconnect/stock.py	2013-01-29 08:38:22 +0000
@@ -79,12 +79,16 @@
         :param str picking_type: 'partial' or 'complete'
         :return: the picking id on magento
         """
-        sale = self.browse(cr, uid, id, context=context).sale_id
+        picking = self.browse(cr, uid, id, context=context)
+        sale = picking.sale_id
         magento_incrementid = sale.magento_incrementid
         carrier_id = self.read(cr, uid, id, ['carrier_id'], context)['carrier_id']
         if carrier_id:
             carrier_id = carrier_id[0]
-            self.pool.get('delivery.carrier').check_ext_carrier_reference(cr, uid, carrier_id, magento_incrementid, context)
+
+        if carrier_id and picking.carrier_tracking_ref:
+            self.pool.get('delivery.carrier').check_ext_carrier_reference(
+                    cr, uid, carrier_id, magento_incrementid, context)
 
         ext_shipping_id = False
         meth = getattr(self, "create_ext_%s_shipping" % picking_type)
@@ -106,7 +110,7 @@
             else:
                 raise
 
-        if ext_shipping_id and carrier_id:
+        if ext_shipping_id and carrier_id and picking.carrier_tracking_ref:
             self.add_ext_tracking_reference(cr, uid, id, carrier_id, ext_shipping_id, context)
         return ext_shipping_id
 
@@ -116,10 +120,9 @@
         conn = context.get('conn_obj', False)
         carrier = self.pool.get('delivery.carrier').read(cr, uid, carrier_id, ['magento_carrier_code', 'magento_tracking_title'], context)
 
-        if self.pool.get('ir.model.fields').search(cr, uid, [('name', '=', 'carrier_tracking_ref'), ('model', '=', 'stock.picking')]): #OpenERP v6 have the field carrier_tracking_ref on the stock_picking but v5 doesn't have it
-            carrier_tracking_ref = self.read(cr, uid, id, ['carrier_tracking_ref'], context)['carrier_tracking_ref']
-        else:
-            carrier_tracking_ref = ''
+        carrier_tracking_ref = self.read(cr, uid, id,
+                                         ['carrier_tracking_ref'],
+                                         context)['carrier_tracking_ref']
 
         res = conn.call('sales_order_shipment.addTrack', [ext_shipping_id, carrier['magento_carrier_code'], carrier['magento_tracking_title'] or '', carrier_tracking_ref or ''])
         if res: