diff options
| author | mtr <mtr@mtr> | 2010-05-20 15:38:48 +0530 |
|---|---|---|
| committer | mtr <mtr@mtr> | 2010-05-20 15:38:48 +0530 |
| commit | 7cd2fe9f76fca16f5729d0059518d294a3c63759 (patch) | |
| tree | 55f13a7b7f6091c469faa7144b2514ad0b94a761 /addons/analytic_user_function/analytic_user_function.py | |
| parent | aa297be495ba8a09e6e543c6a7b48867c85faa8d (diff) | |
| parent | 035cfdc75f999024c74d06a61d0c24ab6f440f3c (diff) | |
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: mtr@mtr-20100520100848-r9o5d1x9fee27jcz
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 |