diff options
| author | nel@tinyerp.com <> | 2010-05-20 15:30:40 +0200 |
|---|---|---|
| committer | nel@tinyerp.com <> | 2010-05-20 15:30:40 +0200 |
| commit | 8ec9a7a780708a5e9bd693df2d7192a493cae10e (patch) | |
| tree | 4078426ace3a0b4ea2422b4ded8a771145733e06 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 3651dde82c9d66c463ca98d86b3697c034040e44 (diff) | |
| parent | 9db96a7573c0fd97a59e540609bc95b867087da4 (diff) | |
[MERGE] from trunk addons
bzr revid: nel@tinyerp.com-20100520133040-g1ylbrdwfju4r1sz
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
| -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 |