diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-05-20 09:46:31 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-05-20 09:46:31 +0530 |
| commit | 38dd957438daddec06d314024009860ff5cfa9ed (patch) | |
| tree | 7148d7b2dc839c64ea03b97d0c2348fa0464b3bb /addons/analytic_user_function/analytic_user_function.py | |
| parent | e36fb2209f9fcfa67878a2c10c2e0e205d282a34 (diff) | |
| parent | 3ee0f15d25199ce63d64e21946fdc6c542d8acbf (diff) | |
[MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
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 |