pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Improved code to return product_lines.

Browse Source 
bzr revid: psa@tinyerp.com-20130912135445-xf0rmbh117fznd5v
This commit is contained in:
Paramjit Singh Sahota
2013-09-12 19:24:45 +05:30
parent 8825f2070b
commit 2b65bbfa82
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp.py
+7 -12
View File
@@ -594,12 +594,12 @@ class mrp_production(osv.osv):
def _action_compute_lines(self, cr, uid, ids, properties=None, context=None):
""" Compute product_lines and workcenter_lines from BoM structure
@return dict: product_lines
@return: product_lines
"""
if properties is None:
properties = []
res_product_lines = {}
results = []
bom_obj = self.pool.get('mrp.bom')
uom_obj = self.pool.get('product.uom')
prod_line_obj = self.pool.get('mrp.production.product.line')
@@ -607,11 +607,11 @@ class mrp_production(osv.osv):
for production in self.browse(cr, uid, ids, context=context):
#unlink product_lines
p_ids = map(lambda x:x.id, production.product_lines)
p_ids = [line.id for line in production.product_lines]
prod_line_obj.unlink(cr, SUPERUSER_ID, p_ids, context=context)
#unlink workcenter_lines
w_ids = map(lambda x:x.id, production.workcenter_lines)
w_ids = [line.id for line in production.workcenter_lines]
workcenter_line_obj.unlink(cr, SUPERUSER_ID, w_ids, context=context)
# search BoM structure and route
@@ -642,19 +642,14 @@ class mrp_production(osv.osv):
for line in results2:
line['production_id'] = production.id
workcenter_line_obj.create(cr, uid, line)
res_product_lines[production.id] = results
return res_product_lines
return results
def action_compute(self, cr, uid, ids, properties=None, context=None):
""" Computes bills of material of a product.
@param properties: List containing dictionaries of properties.
@return: No. of products.
"""
production_id = ids and ids[0] or False
res = False
if production_id:
res = len(self._action_compute_lines(cr, uid, [production_id], properties=properties, context=context)[production_id])
return res
return len(self._action_compute_lines(cr, uid, ids, properties=properties, context=context))
def action_cancel(self, cr, uid, ids, context=None):
""" Cancels the production order and related stock moves.
@@ -876,7 +871,7 @@ class mrp_production(osv.osv):
"""
res = True
for production in self.browse(cr, uid, ids):
boms = self._action_compute_lines(cr, uid, [production.id])[production.id]
boms = self._action_compute_lines(cr, uid, [production.id])
res = False
for bom in boms:
product = self.pool.get('product.product').browse(cr, uid, bom['product_id'])
addons/project_mrp/project_mrp.py
+1 -1
View File
@@ -117,7 +117,7 @@ class mrp_production(osv.osv):
res = super(mrp_production, self)._hook_create_post_procurement(cr, uid, production, procurement_id, context)
procurement_order = self.pool.get('procurement.order')
procurement_order.write(cr, uid, procurement_id, {'sale_line_id': production.move_prod_id and production.move_prod_id.sale_line_id and production.move_prod_id.sale_line_id.id})
return procurement_id
return res
mrp_production()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: