Merge lp:~camptocamp/magentoerpconnect/oerp6.1-oldstable-fix-1131157 into lp:magentoerpconnect/oerp6.1-oldstable

[Alexandre Fayolle - camptocamp]

[FIX] flag pickings of SO without magento id as not exportable

Unmerged revisions

671. By Alexandre Fayolle - camptocamp on 2013-02-21

[FIX] flag pickings of SO without magento id as not exportable

=== modified file 'magentoerpconnect/stock.py'
--- magentoerpconnect/stock.py	2012-06-27 15:44:07 +0000
+++ magentoerpconnect/stock.py	2013-02-21 11:28:26 +0000
@@ -76,10 +76,21 @@
         """
         Create the shipping on Magento. It can be a partial or a complete shipment.
 
+        This method raises ExternalShippingCreateError in case there
+        it cannot create the shipping, so that the picking will be
+        flagged as 'do_not_export' and not be considered for export
+        again
+
         :param str picking_type: 'partial' or 'complete'
         :return: the picking id on magento
         """
         sale = self.browse(cr, uid, id, context=context).sale_id
+        if not sale.magento_incrementid:
+            # the sale order was probably manually created on OpenERP
+            # and is not linked to a Magento sale order. Raise
+            # ExternalShippingCreateError to flag the picking as not
+            # exportable
+            raise ExternalShippingCreateError('The sale order %s has no magento_incrementid' % sale.name)
         magento_incrementid = sale.magento_incrementid
         carrier_id = self.read(cr, uid, id, ['carrier_id'], context)['carrier_id']
         if carrier_id: