From cc6382e442f84e0e979b0a966364514cffd30fbb Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Fri, 14 Oct 2011 16:57:55 +0530 Subject: [PATCH] [REM, REF]: mrp: Commented dead code in product.py bzr revid: rpa@tinyerp.com-20111014112755-mzsh5hdr7msv0zc5 --- addons/mrp/product.py | 46 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/addons/mrp/product.py b/addons/mrp/product.py index 9731d93f84b..6ade4f670dd 100644 --- a/addons/mrp/product.py +++ b/addons/mrp/product.py @@ -26,28 +26,30 @@ from tools.translate import _ class product_product(osv.osv): _inherit = "product.product" - def get_product_accounts(self, cr, uid, product_id, context=None): - """ To get the stock input account, stock output account and stock journal related to product. - @param product_id: product id - @return: dictionary which contains information regarding stock input account, stock output account and stock journal - """ - product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False) - res = super(product_product,self).get_product_accounts(cr, uid, product_id, context=context) - stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False - if not stock_input_acc: - stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False - - stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False - if not stock_output_acc: - stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False - - journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False - - res.update({'stock_account_input': stock_input_acc}) - res.update({'stock_account_output': stock_output_acc}) - res.update({'stock_journal': journal_id}) - - return res + # TODO: DEAD CODE: This function was called from do_change_standard_price, + # but as that function is removed for the fix of lp:747056, its not reached +# def get_product_accounts(self, cr, uid, product_id, context=None): +# """ To get the stock input account, stock output account and stock journal related to product. +# @param product_id: product id +# @return: dictionary which contains information regarding stock input account, stock output account and stock journal +# """ +# product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False) +# res = super(product_product,self).get_product_accounts(cr, uid, product_id, context=context) +# stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False +# if not stock_input_acc: +# stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False +# +# stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False +# if not stock_output_acc: +# stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False +# +# journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False +# +# res.update({'stock_account_input': stock_input_acc}) +# res.update({'stock_account_output': stock_output_acc}) +# res.update({'stock_journal': journal_id}) +# +# return res _columns = {