diff options
| author | hmo <hmo@hmo> | 2010-05-24 14:48:24 +0530 |
|---|---|---|
| committer | hmo <hmo@hmo> | 2010-05-24 14:48:24 +0530 |
| commit | d4a05cfbc5b93a2561ee5e7014bf8f7b7545c814 (patch) | |
| tree | 63fb002560a370a7796a8fb9510ce3d270bb8a95 /addons/analytic_user_function | |
| parent | 4699eabe755fd06af74c3ed2ca2a1433e8133529 (diff) | |
| parent | 9330c43cdac7ac4f6922e5a97c49c3ae42e84164 (diff) | |
[MERGE] merged lp:~openerp/openobject-addons/trunk
bzr revid: hmo@hmo-20100524091824-lscplcr9u9m7d5gb
Diffstat (limited to 'addons/analytic_user_function')
| -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 |