diff --git a/addons/mrp/product.py b/addons/mrp/product.py index 6a73063e591..ea717bd546c 100644 --- a/addons/mrp/product.py +++ b/addons/mrp/product.py @@ -26,30 +26,6 @@ from tools.translate import _ class product_product(osv.osv): _inherit = "product.product" - def get_product_accounts(self, cr, uid, product_id, context={}): - """ 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) - - 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 = {} - res.update({'stock_account_input': stock_input_acc}) - res.update({'stock_account_output': stock_output_acc}) - res.update({'stock_journal': journal_id}) - - return res - def do_change_standard_price(self, cr, uid, ids, datas, context={}): """ Changes the Standard Price of Product and parent products and creates an account move accordingly. @param datas: dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal diff --git a/addons/stock/product.py b/addons/stock/product.py index dc300994232..83e36b9d078 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -25,7 +25,30 @@ from tools.translate import _ class product_product(osv.osv): _inherit = "product.product" + + def get_product_accounts(self, cr, uid, product_id, context={}): + """ 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) + + 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 = {} + res.update({'stock_account_input': stock_input_acc}) + res.update({'stock_account_output': stock_output_acc}) + res.update({'stock_journal': journal_id}) + + return res def do_change_standard_price(self, cr, uid, ids, datas, context={}): """ Changes the Standard Price of Product and creates an account move accordingly.