Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-2834 into lp:unifield-server

  1. US-2834
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5140
Proposed branch: lp:~dorian-kemps/unifield-server/US-2834
Merge into: lp:unifield-server
Diff against target: 39 lines (+4/-4)
1 file modified
bin/addons/msf_cross_docking/cross_docking.py (+4/-4)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-2834
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+355787@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 'bin/addons/msf_cross_docking/cross_docking.py'
2--- bin/addons/msf_cross_docking/cross_docking.py 2018-03-28 08:50:44 +0000
3+++ bin/addons/msf_cross_docking/cross_docking.py 2018-09-27 15:37:09 +0000
4@@ -376,7 +376,7 @@
5 move_ids = move.id
6 for move in move_obj.browse(cr, uid, [move_ids], context=context):
7 # Don't change done stock moves
8- if move.state != 'done':
9+ if move.state not in ['done', 'cancel']:
10 move_obj.write(cr, uid, [move_ids], {'location_id': cross_docking_location,
11 'move_cross_docking_ok': True}, context=context)
12 self.write(cr, uid, ids, {'cross_docking_ok': True}, context=context)
13@@ -408,7 +408,7 @@
14 for move in move_lines:
15 move_ids = move.id
16 for move in move_obj.browse(cr, uid, [move_ids], context=context):
17- if move.state != 'done':
18+ if move.state not in ['done', 'cancel']:
19 '''
20 Specific rules for non-stockable products:
21 * if the move is an outgoing delivery, picked them from cross-docking
22@@ -625,7 +625,7 @@
23 cross_docking_location = self.pool.get('stock.location').get_cross_docking_location(cr, uid)
24 todo = []
25 for move in self.browse(cr, uid, ids, context=context):
26- if move.state != 'done':
27+ if move.state not in ['done', 'cancel']:
28 todo.append(move.id)
29 self.infolog(cr, uid, "The source location of the stock move id:%s has been changed to cross-docking location" % (move.id))
30 ret = True
31@@ -663,7 +663,7 @@
32 obj_data = self.pool.get('ir.model.data')
33 todo = []
34 for move in self.browse(cr, uid, ids, context=context):
35- if move.state != 'done':
36+ if move.state not in ['done', 'cancel']:
37 '''
38 Specific rules for non-stockable products:
39 * if the move is an outgoing delivery, picked them from cross-docking

Subscribers

People subscribed via source and target branches