diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2013-01-28 11:15:31 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2013-01-28 11:15:31 +0530 |
| commit | 76de37f9bda8ce1a8e75439c577cfa0c1afa876f (patch) | |
| tree | 89f150ed741f3247fe8b14e2831962a62d95e0e7 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 45f013603ffe691524aaf497e20e0af45f1b876b (diff) | |
| parent | b390a5697cd4eb8cced5f4cdcf2c34b6cad3a7e4 (diff) | |
[MERGE] Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130128054531-uw2kkz03zbnf3vub
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: |