diff options
| author | Xavier ALT <xal@openerp.com> | 2012-12-21 11:03:30 +0100 |
|---|---|---|
| committer | Xavier ALT <xal@openerp.com> | 2012-12-21 11:03:30 +0100 |
| commit | 6f0f58562d1918d89bbdd6e05cb46f5f0ffd9b02 (patch) | |
| tree | 53b02fa949afd8e84f938bc77c9ce478089b6148 /addons/analytic_user_function/analytic_user_function.py | |
| parent | afc2b06042284a122dc44cbd8f85f55a1cd99874 (diff) | |
| parent | 1dbea4a07a37325e420e26b3429e4a27f3e8e308 (diff) | |
[MERGE] sync with latest trunk @2012-12-21
bzr revid: xal@openerp.com-20121221100330-b0aw0q6txzbq9t0g
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: |