diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-05-19 18:00:02 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-05-19 18:00:02 +0200 |
| commit | 6dc4c2e6dbe6817b1fa41d883d52a990c7a039e8 (patch) | |
| tree | 898636df2f9020c1b52a2e085ad60b9f8067f0af /addons/analytic_user_function/analytic_user_function.py | |
| parent | 7f1e7b632394df449cc4e625e2bcf66af23a9880 (diff) | |
| parent | 206aad724a3ea1018c16b7344151a187c47b6065 (diff) | |
merge
bzr revid: fp@tinyerp.com-20100519160002-fpaq0qr1pdomukd8
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 |