Merge lp:~vauxoo/addons-vauxoo/saberysabor-dev-julio into lp:~vauxoo/addons-vauxoo/saberysabor

Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 28
Proposed branch: lp:~vauxoo/addons-vauxoo/saberysabor-dev-julio
Merge into: lp:~vauxoo/addons-vauxoo/saberysabor
Diff against target: 46 lines (+10/-5)
1 file modified
mrp_custom/mrp.py (+10/-5)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/saberysabor-dev-julio
Reviewer Review Type Date Requested Status
Rodolfo Lopez Pending
Review via email: mp+98945@code.launchpad.net

Description of the change

cambie funcion que crea los pickings de la produccion

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mrp_custom/mrp.py'
--- mrp_custom/mrp.py 2012-03-20 18:09:17 +0000
+++ mrp_custom/mrp.py 2012-03-23 00:24:20 +0000
@@ -505,6 +505,8 @@
505 move_obj = self.pool.get('stock.move')505 move_obj = self.pool.get('stock.move')
506 production=self.browse(cr,uid,ids)[0]506 production=self.browse(cr,uid,ids)[0]
507 507
508 vals_line=[]
509
508 routing_loc = None510 routing_loc = None
509 pick_type = 'internal'511 pick_type = 'internal'
510 address_id = False512 address_id = False
@@ -516,14 +518,14 @@
516 routing_loc = routing_loc.id518 routing_loc = routing_loc.id
517 pick_name = seq_obj.get(cr, uid, 'stock.picking.' + pick_type)519 pick_name = seq_obj.get(cr, uid, 'stock.picking.' + pick_type)
518520
519 picking_id = pick_obj.create(cr, uid, {521 picking_val = {
520 'name': pick_name + ' '+ name_pick,522 'name': pick_name + ' '+ name_pick,
521 'origin': (production.origin or '').split(':')[0] + ':' + production.name,523 'origin': (production.origin or '').split(':')[0] + ':' + production.name,
522 'type': pick_type,524 'type': pick_type,
523 'state': 'draft',525 'state': 'draft',
524 'company_id': production.company_id.id,526 'company_id': production.company_id.id,
525 'production_id':ids[0]527 'production_id':ids[0]
526 })528 }
527 529
528 source = production.product_id.product_tmpl_id.property_stock_production.id530 source = production.product_id.product_tmpl_id.property_stock_production.id
529 for lins in production.product_lines:531 for lins in production.product_lines:
@@ -541,10 +543,13 @@
541 'move_dest_id': production.move_prod_id.id,543 'move_dest_id': production.move_prod_id.id,
542 'state': 'waiting',544 'state': 'waiting',
543 'company_id': production.company_id.id,545 'company_id': production.company_id.id,
544 'picking_id':picking_id
545 }546 }
546 mov_id = move_obj.create(cr, uid, data)547 vals_line.append(data)
547# cr.execute(""" insert into mrp_production_move_ids values(%s,%s) """,(production.id,mov_id))548
549 if vals_line:
550 picking_val.update({'move_lines':([[0,6,linss] for linss in vals_line])})
551 pick_obj.create(cr,uid,picking_val)
552
548 cr.execute(""" 553 cr.execute("""
549 DELETE FROM stock_move WHERE id IN(554 DELETE FROM stock_move WHERE id IN(
550 SELECT sm.id FROM mrp_production_move_ids mp 555 SELECT sm.id FROM mrp_production_move_ids mp

Subscribers

People subscribed via source and target branches

to all changes: