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

Proposed by jftempo on 2019-07-15
Status: Merged
Merged at revision: 5408
Proposed branch: lp:~dorian-kemps/unifield-server/US-6137
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6137
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2019-07-15 Pending
Review via email: mp+370100@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 2018-08-10 09:51:23 +0000
3+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako 2019-07-15 07:18:54 +0000
4@@ -298,7 +298,7 @@
5 % else:
6 <Cell ss:StyleID="line" ><Data ss:Type="String">${(l.imp_currency and obj_name_get('res.currency', l.imp_currency.id) or '')|x}</Data></Cell>
7 % endif
8- % if not l.type_change == 'ignore' and (l.type_change == 'del' or (l.in_drd != l.imp_drd and isDate(l.imp_drd))):
9+ % if not l.type_change == 'ignore' and (l.type_change == 'del' or l.in_drd != l.imp_drd) and isDate(l.imp_drd):
10 <Cell ss:StyleID="line_change_short_date" ><Data ss:Type="DateTime">${(l.imp_drd)|n}T00:00:00.000</Data></Cell>
11 % elif isDate(l.imp_drd):
12 <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${(l.imp_drd)|n}T00:00:00.000</Data></Cell>

Subscribers

People subscribed via source and target branches