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

[IMP] improve code 

bzr revid: jap@tinyerp.com-20130502133027-rgu6etatmcaflaeg
This commit is contained in:
Jagdish Panchal 2013-05-02 19:00:27 +05:30
parent a2cc9f8d49
commit df08c2cb70
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/mrp/mrp.py
View File

@ -837,6 +837,9 @@ class mrp_production(osv.osv):
if not production.product_lines:
if not self.action_compute(cr, uid, [production.id]):
res = False
for componant in production.bom_id.bom_lines:
if componant.product_id.type == 'service' and not production.move_lines or not production.move_lines2:
res=False
return res
def _get_auto_picking(self, cr, uid, production):
@ -983,7 +986,10 @@ class mrp_production(osv.osv):
for production in self.browse(cr, uid, ids, context=context):
shipment_id = self._make_production_internal_shipment(cr, uid, production, context=context)
produce_move_id = self._make_production_produce_line(cr, uid, production, context=context)
for componant in production.bom_id.bom_lines:
if componant.product_id.type == 'service' and not production.move_lines or not production.move_lines2:
wf_service.trg_validate(uid, 'mrp.production', shipment_id, 'button_confirm', cr)
production.write({'state':'confirmed'}, context=context)
# Take routing location as a Source Location.
source_location_id = production.location_src_id.id
if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
@ -994,9 +1000,6 @@ class mrp_production(osv.osv):
shipment_move_id = self._make_production_internal_shipment_line(cr, uid, line, shipment_id, consume_move_id,\
destination_location_id=source_location_id, context=context)
self._make_production_line_procurement(cr, uid, line, shipment_move_id, context=context)
for componant in production.bom_id.bom_lines:
if componant.product_id.type == 'service' and not production.move_lines or not production.move_lines2:
wf_service.trg_validate(uid, 'mrp.production', shipment_id, 'button_confirm', cr)
wf_service.trg_validate(uid, 'stock.picking', shipment_id, 'button_confirm', cr)
production.write({'state':'confirmed'}, context=context)
return shipment_id

2
addons/mrp/stock.py
View File

@ -182,6 +182,8 @@ class split_in_production_lot(osv.osv_memory):
production_obj.write(cr, uid, production_ids, {'move_lines': [(4, m) for m in new_moves]})
return new_moves
split_in_production_lot()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: