odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]PO:Improvement in take default code from product suppier code 

bzr revid: ron@tinyerp.com-20101122133622-4ieg0scgl7f99eve
This commit is contained in:
ron@tinyerp.com 2010-11-22 19:06:22 +05:30
parent 94d6daaa76
commit ab1e86c9fc
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/purchase/purchase.py
View File

@ -662,12 +662,22 @@ class purchase_order_line(osv.osv):
date_order = time.strftime('%Y-%m-%d')
qty = qty or 1.0
seller_delay = 0
seller_get_id = False
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
for s in prod.seller_ids:
if s.name.id == partner_id:
seller_delay = s.delay
temp_qty = s.qty # supplier _qty assigned to temp
if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
qty = temp_qty
prod_suppl_name = s.product_name
prod_suppl_code = s.product_code
if not (prod_suppl_name or prod_suppl_code):
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
elif (not prod_suppl_name) or (not prod_suppl_code):
prod_name= '[' + (prod_suppl_code or prod.default_code or '') + '] '+ (prod_suppl_name or prod.name or '')
else:
prod_name= '[' + prod_suppl_code + '] '+ prod_suppl_name
if price_unit:
price = price_unit
else:
@ -678,21 +688,6 @@ class purchase_order_line(osv.osv):
})[pricelist]
dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
seller_get_id = False
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
for seller_id in prod.product_tmpl_id.seller_ids:
if seller_id.name.id == partner_id:
prod_suppl_name = seller_id.product_name
prod_suppl_code = seller_id.product_code
if not (prod_suppl_name or prod_suppl_code):
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
elif (not prod_suppl_name) or (not prod_suppl_code):
prod_name= '[' + (prod_suppl_code or prod.default_code or '') + '] '+ (prod_suppl_name or prod.name or '')
else:
prod_name= '[' + prod_suppl_code + '] '+ prod_suppl_name
res = {'value': {'price_unit': price, 'name': name or prod_name,
'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),