diff options
| author | jas <jas@tinyerp.com> | 2010-10-13 15:18:41 +0530 |
|---|---|---|
| committer | jas <jas@tinyerp.com> | 2010-10-13 15:18:41 +0530 |
| commit | 0ec23b5a256c7f2f59c1253859cf4daedbd8e45c (patch) | |
| tree | c0604245857b116fdb137b509b89877f825ac8c4 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 2648dff04dd9d5a0ebababc0af9cc5e156cfc27b (diff) | |
| parent | db43747c75a0ef22c3a383456071c52d41bc17eb (diff) | |
[MERGE] : merged with trunk-dev-addons2
bzr revid: jas@tinyerp.com-20101013094841-6xfjrw6xcc5sdoxd
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) |