diff options
| author | psi (Open ERP) <psi@tinyerp.co.in> | 2010-05-27 15:26:49 +0530 |
|---|---|---|
| committer | psi (Open ERP) <psi@tinyerp.co.in> | 2010-05-27 15:26:49 +0530 |
| commit | a36f752b77a6553eec81422c180c3a6b784edfc9 (patch) | |
| tree | ce33d470499f4c66999900b33056771a94fc7a94 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 3a8903e71896af1e09c00a51e72c8da123876ffe (diff) | |
| parent | bcca89dd2ae4af39cebd4153258cb9000d54d98c (diff) | |
[MERGE] Merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100527095649-w942ihepbvj9ht9c
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 |