Merge lp:~unifield-team/unifield-addons/upt-661 into lp:unifield-addons

Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4606
Proposed branch: lp:~unifield-team/unifield-addons/upt-661
Merge into: lp:unifield-addons
Diff against target: 37 lines (+15/-5)
1 file modified
stock/stock.py (+15/-5)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/upt-661
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+197017@code.launchpad.net
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 'stock/stock.py'
2--- stock/stock.py 2013-08-02 13:57:44 +0000
3+++ stock/stock.py 2013-11-28 08:28:34 +0000
4@@ -1979,6 +1979,20 @@
5 '''
6 return False
7
8+ def _create_chained_picking_internal_request(self, cr, uid, context=None, *args, **kwargs):
9+ '''
10+ Overrided in delivery_mechanism to create an OUT instead of or in plus of the INT at reception
11+ '''
12+ pickid = kwargs['picking']
13+ picking_obj = self.pool.get('stock.picking')
14+ wf_service = netsvc.LocalService("workflow")
15+ wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
16+ wf_service.trg_validate(uid, 'stock.picking', pickid, 'action_assign', cr)
17+ # Make the stock moves available
18+ picking_obj.action_assign(cr, uid, [pickid], context=context)
19+ picking_obj.log_picking(cr, uid, [pickid], context=context)
20+ return
21+
22 def create_chained_picking(self, cr, uid, moves, context=None):
23 res_obj = self.pool.get('res.company')
24 location_obj = self.pool.get('stock.location')
25@@ -2024,11 +2038,7 @@
26 })
27 new_moves.append(self.browse(cr, uid, [new_id])[0])
28 if pickid:
29- wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
30- wf_service.trg_validate(uid, 'stock.picking', pickid, 'action_assign', cr)
31- # Make the stock moves available
32- picking_obj.action_assign(cr, uid, [pickid], context=context)
33- picking_obj.log_picking(cr, uid, [pickid], context=context)
34+ self._create_chained_picking_internal_request(cr, uid, context=context, picking=pickid)
35 if new_moves:
36 new_moves += self.create_chained_picking(cr, uid, new_moves, context)
37 return new_moves

Subscribers

People subscribed via source and target branches

to all changes: