Unifield Server

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

  1. US-11146-11176
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6419
Proposed branch: lp:~dorian-kemps/unifield-server/US-11146-11176
Merge into: lp:unifield-server
Diff against target: 44 lines (+6/-20)
1 file modified
bin/addons/msf_outgoing/wizard/picking_processor.py (+6/-20)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-11146-11176
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+439690@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_outgoing/wizard/picking_processor.py'
2--- bin/addons/msf_outgoing/wizard/picking_processor.py 2023-01-31 15:24:11 +0000
3+++ bin/addons/msf_outgoing/wizard/picking_processor.py 2023-03-27 07:59:13 +0000
4@@ -373,22 +373,11 @@
5
6 res = {}
7
8- move_dict = dict([(x['id'], x['product_id'][0]) for x in self.read(cr, uid, ids,
9- ['id',
10- 'product_id'],
11- context=context)])
12+ move_dict = dict([(x['id'], x['product_id'][0]) for x in self.read(cr, uid, ids, ['id', 'product_id'], context=context)])
13 product_module = self.pool.get('product.product')
14- product_list_dict = product_module.read(cr, uid,
15- move_dict.values(),
16- ['batch_management',
17- 'perishable',
18- 'type',
19- 'subtype',
20- 'is_kc',
21- 'ssl_txt',
22- 'dg_txt',
23- 'cs_txt',],
24- context=context)
25+ product_list_dict = product_module.read(cr, uid, move_dict.values(), ['batch_management', 'perishable', 'type',
26+ 'subtype', 'is_kc', 'ssl_txt', 'dg_txt',
27+ 'cs_txt'], context=context)
28 procuct_dict = dict([(x['id'], x) for x in product_list_dict])
29
30 for move_id, product_id in move_dict.items():
31@@ -397,11 +386,8 @@
32 res[move_id] = {
33 'lot_check': product['batch_management'],
34 'exp_check': product['perishable'],
35- 'asset_check': product['type'] == 'product' and
36- product['subtype'] == 'asset',
37- 'kit_check': product['type'] == 'product' and
38- product['subtype'] == 'kit' and not
39- product['perishable'],
40+ 'asset_check': product['type'] == 'product' and product['subtype'] == 'asset',
41+ 'kit_check': product['type'] == 'product' and product['subtype'] == 'kit',
42 'kc_check': product['is_kc'] and 'X',
43 'ssl_check': product['ssl_txt'],
44 'dg_check': product['dg_txt'],

Subscribers

People subscribed via source and target branches