diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-10-05 09:39:44 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-10-05 09:39:44 +0530 |
| commit | 4deea22ac8c5767a9a02b9a22f25676d5d387014 (patch) | |
| tree | ade29389cb5bdaa8da132423455b8bf2d5f9338b /addons/analytic_user_function/analytic_user_function.py | |
| parent | 5d7b8578290c4bc7b3f915d6b68dd31b7e4cd61c (diff) | |
| parent | 79db5a9de198ed4d79c1f08b073bb1c3a8cd839d (diff) | |
[MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101005040944-y4sz4se00lmkuxh9
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 0bb9afc3386..21fe0a7da29 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -99,7 +99,7 @@ class hr_analytic_timesheet(osv.osv): (r.product_id.name, r.product_id.id,)) # Compute based on pricetype amount_unit = self.on_change_unit_amount(cr, uid, ids, - r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] + r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] amount = unit_amount * amount_unit res ['value']['amount']= - round(amount, 2) @@ -134,7 +134,7 @@ class hr_analytic_timesheet(osv.osv): (r.product_id.name, r.product_id.id,)) # Compute based on pricetype amount_unit = self.on_change_unit_amount(cr, uid, ids, - r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] + r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] amount = unit_amount * amount_unit res ['value']['amount']= - round(amount, 2) |
