diff options
| author | aag (OpenERP) <aag@tinyerp.co.in> | 2010-10-14 13:31:03 +0530 |
|---|---|---|
| committer | aag (OpenERP) <aag@tinyerp.co.in> | 2010-10-14 13:31:03 +0530 |
| commit | fabe3674a7a2d0da9dac1dadf4e7370abc2bbb20 (patch) | |
| tree | 3ea9201015595747a47cea94a151ff778ed50a24 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 7b2e3875b1590d4efbb60b15e78503b6922bc543 (diff) | |
| parent | b7a6164e75f4c08c317ec5a64af2b8cecde62b6e (diff) | |
trunk merge
bzr revid: aag@tinyerp.co.in-20101014080103-58ysx9lo20h9kogo
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 0bb9afc3386..04f66fb8daa 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -40,7 +40,7 @@ class account_analytic_account(osv.osv): _inherit = "account.analytic.account" _columns = { - 'user_product_ids' : fields.one2many('analytic_user_funct_grid', 'account_id', 'Users/Products Rel.'), + 'user_product_ids': fields.one2many('analytic_user_funct_grid', 'account_id', 'Users/Products Rel.'), } account_analytic_account() @@ -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) |