openerp-dev-web team mailing list archive

["Stephane Wirtel \(OpenERP\)" <stw@xxxxxxxxxxx>]

Stephane Wirtel (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-4292-stw into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-4292-stw/+merge/52815

Fix a bug for the confirmation of the production order.


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-4292-stw/+merge/52815
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-4292-stw.

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2011-01-17 08:00:48 +0000
+++ procurement/procurement.py	2011-03-10 10:21:05 +0000
@@ -289,9 +289,15 @@
                 return False
             partner = procurement.product_id.seller_id #Taken Main Supplier of Product of Procurement.
 
+            if not partner:
+                cr.execute('update procurement_order set message=%s where id=%s',
+                           (_('No default supplier defined for this product'), procurement.id))
+                return False
+
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
                     return False
+
             address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
                 cr.execute('update procurement_order set message=%s where id=%s',

=== modified file 'product/product.py'
--- product/product.py	2011-03-09 18:41:27 +0000
+++ product/product.py	2011-03-10 10:21:05 +0000
@@ -251,7 +251,9 @@
                 result[product.id] = {field:False}
             result[product.id]['seller_delay'] = 1
             if product.seller_ids:
-                partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  product.seller_ids if partner_id and partner_id.sequence])
+                partner_list = sorted([(partner_id.sequence, partner_id)
+                                       for partner_id in  product.seller_ids
+                                       if partner_id and isinstance(partner_id.sequence, (int, long))])
                 main_supplier = partner_list and partner_list[0] and partner_list[0][1] or False
                 result[product.id]['seller_delay'] =  main_supplier and main_supplier.delay or 1
                 result[product.id]['seller_qty'] =  main_supplier and main_supplier.qty or 0.0