[FIX] account: on_change_unit_amount do not reset uom to default
This commit is contained in:
parent
39f3e40329
commit
cd31cbf556
|
@ -74,12 +74,16 @@ class account_analytic_line(osv.osv):
|
||||||
product_obj = self.pool.get('product.product')
|
product_obj = self.pool.get('product.product')
|
||||||
analytic_journal_obj =self.pool.get('account.analytic.journal')
|
analytic_journal_obj =self.pool.get('account.analytic.journal')
|
||||||
product_price_type_obj = self.pool.get('product.price.type')
|
product_price_type_obj = self.pool.get('product.price.type')
|
||||||
|
product_uom_obj = self.pool.get('product.uom')
|
||||||
j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
|
j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
|
||||||
prod = product_obj.browse(cr, uid, prod_id, context=context)
|
prod = product_obj.browse(cr, uid, prod_id, context=context)
|
||||||
result = 0.0
|
result = 0.0
|
||||||
if prod_id:
|
if prod_id:
|
||||||
|
unit_obj = product_uom_obj.browse(cr, uid, unit, context=context)
|
||||||
|
if prod.uom_id.category_id.id != unit_obj.category_id.id:
|
||||||
unit = prod.uom_id.id
|
unit = prod.uom_id.id
|
||||||
if j_id.type == 'purchase':
|
if j_id.type == 'purchase':
|
||||||
|
if prod.uom_po_id.category_id.id != unit_obj.category_id.id:
|
||||||
unit = prod.uom_po_id.id
|
unit = prod.uom_po_id.id
|
||||||
if j_id.type <> 'sale':
|
if j_id.type <> 'sale':
|
||||||
a = prod.property_account_expense.id
|
a = prod.property_account_expense.id
|
||||||
|
|
Loading…
Reference in New Issue