diff options
| author | Raphael Collet <rco@openerp.com> | 2012-12-19 14:09:53 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-12-19 14:09:53 +0100 |
| commit | 29ee76d744e9b408d00acdf54dbcf899000fd7b6 (patch) | |
| tree | dcb7438ebc733f3c4b5a8906d6298f29533e6563 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 0ca480a80d4e87883941f84508c58d36c97d6329 (diff) | |
| parent | 698369a0cff70bad9a2f2ea78848bcef9cd10da4 (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20121219130953-tq0e2mzw145j1ewx
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index c2a7ae8f05a..ec2aa1688d6 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -19,9 +19,9 @@ # ############################################################################## -from osv import fields,osv -from tools.translate import _ -import decimal_precision as dp +from openerp.osv import fields,osv +from openerp.tools.translate import _ +import openerp.addons.decimal_precision as dp class analytic_user_funct_grid(osv.osv): _name="analytic.user.funct.grid" @@ -96,10 +96,10 @@ class hr_analytic_timesheet(osv.osv): res.setdefault('value',{}) res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)['value'] res['value']['product_id'] = r.product_id.id - res['value']['product_uom_id'] = r.product_id.product_tmpl_id.uom_id.id + res['value']['product_uom_id'] = r.product_id.uom_id.id #the change of product has to impact the amount, uom and general_account_id - a = r.product_id.product_tmpl_id.property_account_expense.id + a = r.product_id.property_account_expense.id if not a: a = r.product_id.categ_id.property_account_expense_categ.id if not a: @@ -128,7 +128,7 @@ class hr_analytic_timesheet(osv.osv): res['value']['product_id'] = r.product_id.id #the change of product has to impact the amount, uom and general_account_id - a = r.product_id.product_tmpl_id.property_account_expense.id + a = r.product_id.property_account_expense.id if not a: a = r.product_id.categ_id.property_account_expense_categ.id if not a: |