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

Proposed by jftempo
Status: Merged
Merged at revision: 4119
Proposed branch: lp:~unifield-team/unifield-server/us-1743
Merge into: lp:unifield-server
Diff against target: 21 lines (+2/-2)
1 file modified
bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1743
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+313321@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_doc_import/report/po_simulation_screen_xls_report.mako'
2--- bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako 2016-06-13 07:41:13 +0000
3+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako 2016-12-15 08:33:16 +0000
4@@ -139,7 +139,7 @@
5 % else:
6 <Cell ss:StyleID="line" ></Cell>
7 % endif
8- % if o.imp_ready_to_ship_date != o.in_ready_to_ship_date:
9+ % if o.imp_ready_to_ship_date not in ('False', False) and o.imp_ready_to_ship_date != o.in_ready_to_ship_date:
10 <Cell ss:StyleID="line_change_short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_ready_to_ship_date)|n}T00:00:00.000</Data></Cell>
11 % elif o.imp_ready_to_ship_date not in ('False', False):
12 <Cell ss:StyleID="short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_ready_to_ship_date)|n}T00:00:00.000</Data></Cell>
13@@ -155,7 +155,7 @@
14 % else:
15 <Cell ss:StyleID="line" ></Cell>
16 % endif
17- % if o.imp_shipment_date != o.in_shipment_date:
18+ % if o.imp_shipment_date not in ('False', False) and o.imp_shipment_date != o.in_shipment_date:
19 <Cell ss:StyleID="line_change_short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_shipment_date)|n}T00:00:00.000</Data></Cell>
20 % elif o.imp_shipment_date not in ('False', False):
21 <Cell ss:StyleID="short_date" ss:MergeAcross="1" ><Data ss:Type="DateTime">${(o.imp_shipment_date)|n}T00:00:00.000</Data></Cell>

Subscribers

People subscribed via source and target branches

to all changes: