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

[jftempo]

=== modified file 'bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako'
--- bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako	2020-08-04 13:17:16 +0000
+++ bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako	2021-05-04 09:02:42 +0000
@@ -327,7 +327,7 @@
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
-   <NumberFormat ss:Format="Short Date"/>
+   <NumberFormat ss:Format="dd/mm/yyyy;@"/>
   </Style>
  </Styles>
  <Worksheet ss:Name="stock">
@@ -487,7 +487,7 @@
     % if isDate(item.expiry_date):
     <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${item.expiry_date|n}T00:00:00.000</Data></Cell>
     % else:
-    <Cell ss:StyleID="s108"><Data ss:Type="String"></Data></Cell>
+    <Cell ss:StyleID="short_date"><Data ss:Type="String"></Data></Cell>
     % endif
     <Cell ss:StyleID="s108"><Data ss:Type="String">${display_product_attributes(item)|x}</Data></Cell>
     <Cell ss:StyleID="s109"><Data ss:Type="String">${yesno(item.is_bn)}</Data></Cell>