[FIX] Purchase:[PS] Purchase order line_ Unit of measure
lp bug: https://launchpad.net/bugs/716117 fixed bzr revid: aag@tinyerp.co.in-20110211125920-iarez31rjra2bep8
This commit is contained in:
parent
a997044246
commit
f394ec2357
|
@ -662,7 +662,6 @@ class purchase_order_line(osv.osv):
|
||||||
'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
|
'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
|
||||||
res = {}
|
res = {}
|
||||||
prod= self.pool.get('product.product').browse(cr, uid, product)
|
prod= self.pool.get('product.product').browse(cr, uid, product)
|
||||||
|
|
||||||
product_uom_pool = self.pool.get('product.uom')
|
product_uom_pool = self.pool.get('product.uom')
|
||||||
lang=False
|
lang=False
|
||||||
if partner_id:
|
if partner_id:
|
||||||
|
@ -678,6 +677,11 @@ class purchase_order_line(osv.osv):
|
||||||
date_order = time.strftime('%Y-%m-%d')
|
date_order = time.strftime('%Y-%m-%d')
|
||||||
qty = qty or 1.0
|
qty = qty or 1.0
|
||||||
seller_delay = 0
|
seller_delay = 0
|
||||||
|
if uom:
|
||||||
|
uom1_cat = prod.uom_id.category_id.id
|
||||||
|
uom2_cat = product_uom_pool.browse(cr, uid, uom).category_id.id
|
||||||
|
if uom1_cat != uom2_cat:
|
||||||
|
uom = False
|
||||||
|
|
||||||
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
|
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
|
||||||
res = {}
|
res = {}
|
||||||
|
@ -704,14 +708,13 @@ class purchase_order_line(osv.osv):
|
||||||
'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
|
'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
|
||||||
'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
|
'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
|
||||||
'product_qty': qty,
|
'product_qty': qty,
|
||||||
'product_uom': uom}})
|
'product_uom': prod.uom_id.id}})
|
||||||
domain = {}
|
domain = {}
|
||||||
|
|
||||||
taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
|
taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
|
||||||
fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
|
fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
|
||||||
res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
|
res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
|
||||||
|
res2 = self.pool.get('product.uom').read(cr, uid, [prod.uom_id.id], ['category_id'])
|
||||||
res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
|
|
||||||
res3 = prod.uom_id.category_id.id
|
res3 = prod.uom_id.category_id.id
|
||||||
domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
|
domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
|
||||||
if res2[0]['category_id'][0] != res3:
|
if res2[0]['category_id'][0] != res3:
|
||||||
|
|
Loading…
Reference in New Issue