odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REM, REF]: mrp: Commented dead code in product.py 

bzr revid: rpa@tinyerp.com-20111014112755-mzsh5hdr7msv0zc5
This commit is contained in:
Rucha (Open ERP) 2011-10-14 16:57:55 +05:30
parent b6037ec0a5
commit cc6382e442
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
addons/mrp/product.py
View File

@ -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 = {