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
1=== modified file 'mrp_custom/mrp.py'
2--- mrp_custom/mrp.py 2012-03-20 18:09:17 +0000
3+++ mrp_custom/mrp.py 2012-03-23 00:24:20 +0000
4@@ -505,6 +505,8 @@
5 move_obj = self.pool.get('stock.move')
6 production=self.browse(cr,uid,ids)[0]
7
8+ vals_line=[]
9+
10 routing_loc = None
11 pick_type = 'internal'
12 address_id = False
13@@ -516,14 +518,14 @@
14 routing_loc = routing_loc.id
15 pick_name = seq_obj.get(cr, uid, 'stock.picking.' + pick_type)
16
17- picking_id = pick_obj.create(cr, uid, {
18+ picking_val = {
19 'name': pick_name + ' '+ name_pick,
20 'origin': (production.origin or '').split(':')[0] + ':' + production.name,
21 'type': pick_type,
22 'state': 'draft',
23 'company_id': production.company_id.id,
24 'production_id':ids[0]
25- })
26+ }
27
28 source = production.product_id.product_tmpl_id.property_stock_production.id
29 for lins in production.product_lines:
30@@ -541,10 +543,13 @@
31 'move_dest_id': production.move_prod_id.id,
32 'state': 'waiting',
33 'company_id': production.company_id.id,
34- 'picking_id':picking_id
35 }
36- mov_id = move_obj.create(cr, uid, data)
37-# cr.execute(""" insert into mrp_production_move_ids values(%s,%s) """,(production.id,mov_id))
38+ vals_line.append(data)
39+
40+ if vals_line:
41+ picking_val.update({'move_lines':([[0,6,linss] for linss in vals_line])})
42+ pick_obj.create(cr,uid,picking_val)
43+
44 cr.execute("""
45 DELETE FROM stock_move WHERE id IN(
46 SELECT sm.id FROM mrp_production_move_ids mp

Subscribers

People subscribed via source and target branches

to all changes: