diff options
| author | Olivier Dony <odo@openerp.com> | 2012-12-18 23:50:15 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-12-18 23:50:15 +0100 |
| commit | 03b6acd13d28300f853cb5ed89b6732ab244d95b (patch) | |
| tree | f8306123b50ded54f2ad8ca492d08a4c174fdb11 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 72387cef3b4e43a1d33df7a25e10981e090612c7 (diff) | |
| parent | f9fe63780347c73d70f8d6a0b36a02cdb3704941 (diff) | |
[MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
It makes the code a little more straightforward and does not hurt.
bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
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 bc387b25859..ec2aa1688d6 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -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: |