summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-08-24 11:08:49 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-08-24 11:08:49 +0200
commit25dd249ecb9aff63aeb13f85d65c0c13d3df8751 (patch)
tree005de21531613a9a0c3ec7d316acc06a136073b6
parent59f37f712f81054b4643b7c5975c8797334865f0 (diff)
parent2d8559b6266b2873199a534c0aeccf7d8a436712 (diff)
[MERGE] lp:1034799
bzr revid: qdp-launchpad@openerp.com-20120824090849-v7imbkj2q74ywq3q
-rw-r--r--addons/product/product.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/product/product.py b/addons/product/product.py
index 58f47f9adc3..aa1bc3954a0 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -499,7 +499,7 @@ class product_product(osv.osv):
main_supplier = self._get_main_product_supplier(cr, uid, product, context=context)
result[product.id] = {
'seller_info_id': main_supplier and main_supplier.id or False,
- 'seller_delay': main_supplier and main_supplier.delay or 1,
+ 'seller_delay': main_supplier.delay if main_supplier else 1,
'seller_qty': main_supplier and main_supplier.qty or 0.0,
'seller_id': main_supplier and main_supplier.name.id or False
}