pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp:~openerp-dev/openobject-addons/6.0-opw-4292-stw

Browse Source 
bzr revid: stephane@openerp.com-20110310103427-89ao0vf5h3x801da
This commit is contained in:
Stephane Wirtel
2011-03-10 11:34:27 +01:00
parent 13521c719b d9cabb1b5b
commit 126fec64ff
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/procurement/procurement.py
+6
View File
@@ -289,9 +289,15 @@ class procurement_order(osv.osv):
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',
addons/product/product.py
+3 -1
View File
@@ -250,7 +250,9 @@ class product_template(osv.osv):
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