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

Fix uom conversion in analytic line 

bzr revid: ced-cd42cc44fdc260bca64f66a2e599c02621dd9733
This commit is contained in:
ced 2007-12-17 07:58:40 +00:00
parent 2b10958acb
commit 44c66c7f34
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/account/account_analytic_line.py
View File

@ -65,21 +65,26 @@ class account_analytic_line(osv.osv):
(_check_company, 'You can not create analytic line that is not in the same company than the account line', ['account_id'])
]
def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit=False, context={}):
def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,
unit=False, context=None):
uom_obj = self.pool.get('product.uom')
product_obj = self.pool.get('product.product')
if unit_amount and prod_id:
rate = 1
if unit:
uom_obj = self.pool.get('product.uom')
hunit = uom_obj.browse(cr, uid, unit)
rate = hunit.factor
product_obj = self.pool.get('product.product')
prod = product_obj.browse(cr, uid, prod_id)
a = prod.product_tmpl_id.property_account_expense.id
if not a:
a = prod.categ_id.property_account_expense_categ.id
if not a:
raise osv.except_osv('Error !', 'There is no expense account define for this product: "%s" (id:%d)' % (prod.name, prod.id,))
return {'value' : {'amount' : -round(unit_amount * prod.standard_price * rate,2), 'general_account_id':a}}
raise osv.except_osv('Error !',
'There is no expense account define ' \
'for this product: "%s" (id:%d)' % \
(prod.name, prod.id,))
amount = unit_amount * uom_obj._compute_price(cr, uid,
prod.uom_id.id, prod.standard_price, unit)
return {'value': {
'amount': - round(amount, 2),
'general_account_id': a,
}}
return {}
account_analytic_line()