diff options
| author | sbh (Open ERP) <sbh@tinyerp.com> | 2010-05-24 10:57:59 +0530 |
|---|---|---|
| committer | sbh (Open ERP) <sbh@tinyerp.com> | 2010-05-24 10:57:59 +0530 |
| commit | 57c10e8bfe9ec69bf70a0eeae05084220d8ee512 (patch) | |
| tree | f0467c03b3145edfd65d6f19d34d222d9da4e8cd /addons/analytic_user_function/analytic_user_function.py | |
| parent | 58cc50fcb171e54efc204cdc9934253aaa86cd61 (diff) | |
| parent | be942cf4b8e6b8f0550882b481d81d90f65533ff (diff) | |
[MERGE]:Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: sbh@tinyerp.com-20100524044458-s6fxz4onkv01zd8c
bzr revid: sbh@tinyerp.com-20100524052759-mk8mpnm1v2gfcslq
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 |