Unifield Server

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

  1. US-3655
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4873
Proposed branch: lp:~dorian-kemps/unifield-server/US-3655
Merge into: lp:unifield-server
Diff against target: 30 lines (+5/-4)
2 files modified
bin/addons/msf_outgoing/msf_outgoing.py (+4/-3)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-3655
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+342557@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 2018-03-28 07:36:10 +0000
3+++ bin/addons/msf_outgoing/msf_outgoing.py 2018-04-03 10:30:41 +0000
4@@ -2953,9 +2953,10 @@
5 shipment_id = shipment_ids[0]
6 shipment = shipment_obj.browse(cr, uid, shipment_id, context=context)
7 # if expected ship date of shipment is greater than rts, update shipment_expected_date and shipment_actual_date
8- shipment_expected = datetime.strptime(shipment.shipment_expected_date, db_datetime_format)
9- if rts_obj < shipment_expected:
10- shipment.write({'shipment_expected_date': rts, 'shipment_actual_date': rts, }, context=context)
11+ if shipment.shipment_expected_date:
12+ shipment_expected = datetime.strptime(shipment.shipment_expected_date, db_datetime_format)
13+ if rts_obj < shipment_expected:
14+ shipment.write({'shipment_expected_date': rts, 'shipment_actual_date': rts, }, context=context)
15 shipment_name = shipment.name
16 shipment_obj.log(cr, uid, shipment_id, _('The ppl has been added to the existing Draft Shipment %s.') % (shipment_name,))
17
18
19=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
20--- bin/addons/msf_outgoing/msf_outgoing_view.xml 2017-11-29 09:42:15 +0000
21+++ bin/addons/msf_outgoing/msf_outgoing_view.xml 2018-04-03 10:30:41 +0000
22@@ -1235,7 +1235,7 @@
23 <field name="name" readonly="1"/>
24 <field name="date" readonly="True" />
25 <field name="shipment_actual_date" />
26- <field name="shipment_expected_date" attrs="{'readonly': [('state', 'not in', ('draft', 'packed'))]}" />
27+ <field name="shipment_expected_date" required="1" attrs="{'readonly': [('state', 'not in', ('draft', 'packed'))]}" />
28 <field name="transport_type" attrs="{'readonly': [('state', 'in', ('done', 'delivered', 'cancel'))]}" />
29 <field name="backshipment_id" readonly="True" />
30 <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)"

Subscribers

People subscribed via source and target branches