From f9fe63780347c73d70f8d6a0b36a02cdb3704941 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 27 Jul 2012 03:52:02 +0200 Subject: Remplace all occurences of my_browse_rec.product_id.product_tmpl_id.field to my_browse_rec.product_id.field bzr revid: alexis@via.ecp.fr-20120727015202-7fylff5jr26sgxez --- addons/analytic_user_function/analytic_user_function.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/analytic_user_function/analytic_user_function.py') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index cfb1aba10d1..e446afc393d 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -85,10 +85,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: @@ -123,7 +123,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: -- cgit v1.2.3 From e7f4891d4634875e960939e7f5d36063ed4b62c1 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 6 Dec 2012 15:56:32 +0100 Subject: [IMP] use the openerp namespace. bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy --- addons/analytic_user_function/analytic_user_function.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/analytic_user_function/analytic_user_function.py') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index c2a7ae8f05a..348fc08d6ba 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields,osv -from tools.translate import _ +from openerp.osv import fields,osv +from openerp.tools.translate import _ import decimal_precision as dp class analytic_user_funct_grid(osv.osv): -- cgit v1.2.3 From a3939acfa519e21b364254ea064b46a7932b2e84 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 17 Dec 2012 16:23:03 +0100 Subject: [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d --- addons/analytic_user_function/analytic_user_function.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic_user_function/analytic_user_function.py') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 348fc08d6ba..bc387b25859 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -21,7 +21,7 @@ from openerp.osv import fields,osv from openerp.tools.translate import _ -import decimal_precision as dp +import openerp.addons.decimal_precision as dp class analytic_user_funct_grid(osv.osv): _name="analytic.user.funct.grid" -- cgit v1.2.3