diff options
| author | mso <mso@mso> | 2010-05-20 11:47:27 +0530 |
|---|---|---|
| committer | mso <mso@mso> | 2010-05-20 11:47:27 +0530 |
| commit | 035cfdc75f999024c74d06a61d0c24ab6f440f3c (patch) | |
| tree | 55f13a7b7f6091c469faa7144b2514ad0b94a761 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 8c85100d8deebc0a89c5578702cca526cf653ee7 (diff) | |
| parent | 5b4c90f604aaedfe35f6aef36e4f9d2e397aa816 (diff) | |
[Merge] : branch merged with lp:openobject-addons
bzr revid: mso@mso-20100519134757-ya5ypsrrn9k9dyx9
bzr revid: mso@mso-20100519141310-w3yplzus8x8lit4y
bzr revid: mso@mso-20100520061727-56aj2nrxouve1qpa
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 |