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

Proposed by jftempo
Status: Needs review
Proposed branch: lp:~dorian-kemps/unifield-server/US-8549
Merge into: lp:unifield-server
Diff against target: 21 lines (+2/-2)
1 file modified
bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako (+2/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-8549
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+402173@code.launchpad.net
To post a comment you must log in.
5964. By Dorian on 2021-05-04

US-8549 [FIX] Physical Inventory: reverted the modfication on the discrepancy report

Unmerged revisions

5964. By Dorian on 2021-05-04

US-8549 [FIX] Physical Inventory: reverted the modfication on the discrepancy report

5963. By Dorian on 2021-05-04

US-8549 [FIX] Physical Inventory: fixed expiry date style for empty case

5962. By Dorian on 2021-05-03

US-8549 [FIX] Physical Inventory: fixed date format in excel exports

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako'
2--- bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako 2020-08-04 13:17:16 +0000
3+++ bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako 2021-05-04 09:02:42 +0000
4@@ -327,7 +327,7 @@
5 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
6 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
7 </Borders>
8- <NumberFormat ss:Format="Short Date"/>
9+ <NumberFormat ss:Format="dd/mm/yyyy;@"/>
10 </Style>
11 </Styles>
12 <Worksheet ss:Name="stock">
13@@ -487,7 +487,7 @@
14 % if isDate(item.expiry_date):
15 <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${item.expiry_date|n}T00:00:00.000</Data></Cell>
16 % else:
17- <Cell ss:StyleID="s108"><Data ss:Type="String"></Data></Cell>
18+ <Cell ss:StyleID="short_date"><Data ss:Type="String"></Data></Cell>
19 % endif
20 <Cell ss:StyleID="s108"><Data ss:Type="String">${display_product_attributes(item)|x}</Data></Cell>
21 <Cell ss:StyleID="s109"><Data ss:Type="String">${yesno(item.is_bn)}</Data></Cell>

Subscribers

People subscribed via source and target branches