diff options
| author | psi (Open ERP) <psi@tinyerp.co.in> | 2010-05-20 10:07:50 +0530 |
|---|---|---|
| committer | psi (Open ERP) <psi@tinyerp.co.in> | 2010-05-20 10:07:50 +0530 |
| commit | 6802a4781591bd702fb9a96b4cae455737afd7a4 (patch) | |
| tree | 701d601be7805506423a99dad10382d5de7bf4ea /addons/analytic_user_function/analytic_user_function.py | |
| parent | 1fa0bc873d5d13f357232a98c6cc5bc48e98925d (diff) | |
| parent | 9657c3319ffff8a29df65f15f836963e6d0c9faf (diff) | |
[MERGE] merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100520043750-oiavvz6xfsfdlopa
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 |