Unifield Server

Merge lp:~unifield-team/unifield-server/us-2314 into lp:unifield-server

  1. us-2314
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4206
Proposed branch: lp:~unifield-team/unifield-server/us-2314
Merge into: lp:unifield-server
Diff against target: 49 lines (+10/-0)
3 files modified
bin/addons/msf_outgoing/msf_outgoing.py (+1/-0)
bin/addons/msf_outgoing/wizard/return_pack_shipment_processor.py (+4/-0)
bin/addons/msf_outgoing/wizard/shipment_processor.py (+5/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2314
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+317447@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/msf_outgoing.py'
2--- bin/addons/msf_outgoing/msf_outgoing.py 2017-02-08 16:24:00 +0000
3+++ bin/addons/msf_outgoing/msf_outgoing.py 2017-02-16 11:13:54 +0000
4@@ -1045,6 +1045,7 @@
5 ('picking_id', '=', family.draft_packing_id.id),
6 ('from_pack', '=', family.from_pack),
7 ('to_pack', '=', family.to_pack),
8+ ('comment', '=', family.comment)
9 ], context=context)
10
11 stay = []
12
13=== modified file 'bin/addons/msf_outgoing/wizard/return_pack_shipment_processor.py'
14--- bin/addons/msf_outgoing/wizard/return_pack_shipment_processor.py 2015-04-22 09:06:36 +0000
15+++ bin/addons/msf_outgoing/wizard/return_pack_shipment_processor.py 2017-02-16 11:13:54 +0000
16@@ -259,6 +259,10 @@
17 readonly=True,
18 multi='pack_info',
19 ),
20+ 'comment': fields.text(
21+ string='Comment',
22+ readonly=True,
23+ ),
24 'integrity_status': fields.selection(
25 string=' ',
26 selection=[
27
28=== modified file 'bin/addons/msf_outgoing/wizard/shipment_processor.py'
29--- bin/addons/msf_outgoing/wizard/shipment_processor.py 2015-05-04 07:22:06 +0000
30+++ bin/addons/msf_outgoing/wizard/shipment_processor.py 2017-02-16 11:13:54 +0000
31@@ -193,6 +193,7 @@
32 'draft_packing_id': family.draft_packing_id and family.draft_packing_id.id or False,
33 'description_ppl': family.description_ppl,
34 'ppl_id': family.ppl_id and family.ppl_id.id or False,
35+ 'comment': family.comment,
36 }
37
38 family_obj.create(cr, uid, family_vals, context=context)
39@@ -347,6 +348,10 @@
40 readonly=True,
41 multi='pack_info',
42 ),
43+ 'comment': fields.text(
44+ string='Comment',
45+ readonly=True,
46+ ),
47 'integrity_status': fields.selection(
48 string=' ',
49 selection=[

Subscribers

People subscribed via source and target branches

to all changes: