diff options
| author | hmo <hmo@hmo> | 2010-05-24 14:42:32 +0530 |
|---|---|---|
| committer | hmo <hmo@hmo> | 2010-05-24 14:42:32 +0530 |
| commit | 9330c43cdac7ac4f6922e5a97c49c3ae42e84164 (patch) | |
| tree | 87cd92718d04330df78b45ee6e84bd3ad5a610a6 /addons/analytic_user_function | |
| parent | 7b9fb87c011ccaa9af6517c5ae1f4ef95b3025d9 (diff) | |
| parent | f1a7cf722b621ba83ffc5aa65e3ea20a5f692363 (diff) | |
[MERGE] merged lp:~openerp/openobject-addons/trunk
bzr revid: hmo@hmo-20100524091232-ko5oezpr7j866ngo
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index c5c2af729a0..fe238d373be 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -100,7 +100,7 @@ class hr_analytic_timesheet(osv.osv): 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype - amount_unit=self.on_change_unit_amount(cr, uid, ids, + amount_unit = self.on_change_unit_amount(cr, uid, ids, r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] amount = unit_amount * amount_unit @@ -136,7 +136,7 @@ class hr_analytic_timesheet(osv.osv): 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype - amount_unit=self.on_change_unit_amount(cr, uid, ids, + amount_unit = self.on_change_unit_amount(cr, uid, ids, r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] amount = unit_amount * amount_unit |