diff options
| author | hmo <hmo@hmo> | 2010-05-20 17:03:03 +0530 |
|---|---|---|
| committer | hmo <hmo@hmo> | 2010-05-20 17:03:03 +0530 |
| commit | 3aaebcb3a9b0c31c385bf1ba90d47310fccefe81 (patch) | |
| tree | 1bf2c5ba4b4bddd912a194456838b85bd84df474 /addons/analytic_user_function/analytic_user_function.py | |
| parent | e0f2f19dc3bfdd896456e3669219a6e29246c175 (diff) | |
| parent | ca07e840da31b85dd4046c7b46b92417be748b35 (diff) | |
[MERGE] merge with master trunk-addons
bzr revid: hmo@hmo-20100520113303-67jlxy1thn3iafdn
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 |