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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-07-28 15:47:53 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-07-31 14:38:32 +0000
@@ -38477,7 +38477,7 @@
 #. module: stock
 #: code:addons/stock/physical_inventory.py:1411
 #: field:physical.inventory.discrepancy,discrepancy_value:0
-#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:813
+#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:833
 #, python-format
 msgid "Discrepancy Value"
 msgstr "Valeur des Écarts"
@@ -41514,8 +41514,9 @@
 msgstr "The partner is missing."
 
 #. module: stock
+#: view:physical.inventory:0
 #: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:682
-msgid "With discrepencies"
+msgid "With discrepancies"
 msgstr "Avec les écarts"
 
 #. module: base
@@ -48064,11 +48065,6 @@
 msgid "Unit"
 msgstr "Unité"
 
-#. module: stock
-#: view:physical.inventory:0
-msgid "With discrepancies"
-msgstr "Avec les écart"
-
 #. module: msf_instance
 #: view:res.company:0
 msgid "B/S Move to 0 accounts"
@@ -91203,7 +91199,6 @@
 #: field:wizard.import.po.simulation.screen.line,imp_discrepancy:0
 #: field:wizard.simu.import.po.line,discrepancy:0
 #: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:801
-#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:811
 msgid "Discrepancy"
 msgstr "Écarts"
 
@@ -92418,11 +92413,6 @@
 msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
 msgstr "Donne la marge de rentabilité en calculant la différence entre le prix unitaire et le prix"
 
-#. module: stock
-#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:803
-msgid "Discrepancy value"
-msgstr "Valeur des écarts"
-
 #. module: base
 #: selection:res.config.users,context_tz:0
 #: selection:res.users,context_tz:0
@@ -109250,6 +109240,7 @@
 #: code:addons/account_override/invoice.py:1272
 msgid "Split Stock Transfer Voucher"
 msgstr "Fractionner Bon Client"
+<<<<<<< TREE
 
 #. modules: account_override, register_accounting
 #: view:account.invoice:0
@@ -110362,3 +110353,15 @@
 #, python-format
 msgid "is dispatched."
 msgstr "est expédié."
+=======
+
+#. module: stock
+#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:841
+msgid "Total Discrepancy"
+msgstr "Écart Total"
+
+#. module: stock
+#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:843
+msgid "Total Discrepancy Value"
+msgstr "Valeur Totale des Écarts"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako'
--- bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako	2018-02-15 17:15:17 +0000
+++ bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako	2020-07-31 14:38:32 +0000
@@ -231,6 +231,7 @@
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="0"/>
    <Interior/>
   </Style>
   <Style ss:ID="s108">
@@ -241,6 +242,7 @@
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="0"/>
   </Style>
   <Style ss:ID="s109">
    <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
@@ -476,7 +478,7 @@
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s107"><Data ss:Type="String">${item.product_uom_id and item.product_uom_id.name or ''|x}</Data><NamedCell
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s108"><Data ss:Type="String">${item.quantity or ''}</Data><NamedCell
+    <Cell ss:StyleID="s108"><Data ss:Type="Number">${item.quantity or 0|x}</Data><NamedCell
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s108"><Data ss:Type="String">${item.batch_number or ''|x}</Data></Cell>
     % if isDate(item.expiry_date):
 
=== modified file 'bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako'
--- bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako	2019-04-25 08:34:50 +0000
+++ bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako	2020-07-31 14:38:32 +0000
@@ -18,9 +18,8 @@
  <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
   <WindowHeight>9660</WindowHeight>
   <WindowWidth>17370</WindowWidth>
-  <WindowTopX>480</WindowTopX>
-  <WindowTopY>195</WindowTopY>
-  <TabRatio>319</TabRatio>
+  <WindowTopX>120</WindowTopX>
+  <WindowTopY>75</WindowTopY>
   <ProtectStructure>False</ProtectStructure>
   <ProtectWindows>False</ProtectWindows>
  </ExcelWorkbook>
@@ -87,6 +86,8 @@
    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
    <Borders>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
@@ -96,8 +97,8 @@
   <Style ss:ID="s27">
    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
    <Borders>
-    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
@@ -129,27 +130,29 @@
   <Style ss:ID="s30">
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="0"/>
   </Style>
   <Style ss:ID="s31">
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#0"/>
   </Style>
   <Style ss:ID="s32">
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
   </Style>
@@ -186,9 +189,21 @@
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-   </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#0"/>
+  </Style>
+  <Style ss:ID="s36dec">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s37">
    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
@@ -204,7 +219,7 @@
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
   </Style>
@@ -239,16 +254,20 @@
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#0"/>
   </Style>
   <Style ss:ID="s43">
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s44">
    <Borders>
@@ -274,9 +293,10 @@
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s47">
    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
@@ -290,8 +310,8 @@
   <Style ss:ID="s48">
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>"production"
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
   </Style>
@@ -307,9 +327,9 @@
    <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
   </Style>
@@ -327,23 +347,38 @@
    <Borders/>
   </Style>
   <Style ss:ID="s57">
-   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
     ss:Bold="1"/>
   </Style>
   <Style ss:ID="s58">
-   <Borders>
-    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-   </Borders>
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#0"/>
+  </Style>
+  <Style ss:ID="s58dec">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s59">
    <Borders>
@@ -366,60 +401,67 @@
    </Borders>
   </Style>
   <Style ss:ID="s63">
-   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
   </Style>
   <Style ss:ID="s64">
-   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
   </Style>
   <Style ss:ID="s65">
-   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
-    ss:Bold="1"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s66">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
   </Style>
   <Style ss:ID="s67" ss:Parent="s16">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s68">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#,##0.00"/>
   </Style>
   <Style ss:ID="s69">
    <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
@@ -429,7 +471,7 @@
    <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
   </Style>
   <Style ss:ID="s70">
-   <Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
    <Borders/>
    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="24" ss:Color="#000000"
     ss:Bold="1"/>
@@ -464,8 +506,7 @@
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
-    ss:Bold="1"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
   </Style>
   <Style ss:ID="s80">
    <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
@@ -475,8 +516,7 @@
     <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
    </Borders>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
-    ss:Bold="1"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
   </Style>
  </Styles>
  <Worksheet ss:Name="stock">
@@ -496,7 +536,7 @@
    <Column ss:Index="16" ss:Width="67.5"/>
    <Column ss:AutoFitWidth="0" ss:Width="78" ss:Span="2"/>
    <Column ss:Index="20" ss:AutoFitWidth="0" ss:Width="273"/>
-   <Row ss:Height="31.5" ss:StyleID="s71">
+   <Row ss:Height="35" ss:StyleID="s71">
     <Cell ss:StyleID="s70"><Data ss:Type="String">${_('INVENTORY REPORT')|x}</Data><NamedCell
       ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
@@ -651,11 +691,11 @@
       ss:Name="Print_Area"/></Cell>
     <Cell ss:Index="16" ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">${_('Total at the end')|x}</Data><NamedCell
       ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s58"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_number}</Data><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s57"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_value}</Data><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s65"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_absvalue}</Data><NamedCell
+    <Cell ss:StyleID="s58"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="Number">${objects[0].inventory_lines_number}</Data><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s57"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="Number">${objects[0].inventory_lines_value}</Data><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s65"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="Number">${objects[0].inventory_lines_absvalue}</Data><NamedCell
       ss:Name="Print_Area"/></Cell>
    </Row>
    <Row ss:Height="15.75">
@@ -679,13 +719,13 @@
       ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">${_('With discrepencies')|x}</Data><NamedCell
+    <Cell ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">${_('With discrepancies')|x}</Data><NamedCell
       ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s58"><Data ss:Type="String">${objects[0].discrepancy_lines_number}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s58"><Data ss:Type="String">${objects[0].discrepancy_lines_value}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s66"><Data ss:Type="String">${objects[0].discrepancy_lines_absvalue}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+    <Cell ss:StyleID="s58"><Data ss:Type="Number">${objects[0].discrepancy_lines_number}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s58dec"><Data ss:Type="Number">${objects[0].discrepancy_lines_value}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s66"><Data ss:Type="Number">${objects[0].discrepancy_lines_absvalue}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
       ss:Name="Print_Area"/></Cell>
    </Row>
    <Row ss:Height="15.75">
@@ -719,11 +759,11 @@
       ss:Name="Print_Area"/></Cell>
     <Cell ss:MergeAcross="1" ss:StyleID="s80"><Data ss:Type="String">${_('%')|x}</Data><NamedCell
       ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s67"><Data ss:Type="String">${objects[0].discrepancy_lines_percent}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s67"><Data ss:Type="String">${objects[0].discrepancy_lines_percent_value}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s68"><Data ss:Type="String">${objects[0].discrepancy_lines_percent_absvalue}</Data><NamedCell
+    <Cell ss:StyleID="s67"><Data ss:Type="Number">${objects[0].discrepancy_lines_percent}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s67"><Data ss:Type="Number">${objects[0].discrepancy_lines_percent_value}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s68"><Data ss:Type="Number">${objects[0].discrepancy_lines_percent_absvalue}</Data><NamedCell
       ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
    </Row>
    <Row ss:Height="15.75">
@@ -773,16 +813,16 @@
     <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Family')|x}</Data><NamedCell
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Item code')|x}</Data><NamedCell
-      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Description')|x}</Data><NamedCell
-      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s37"><Data ss:Type="String">${_('UoM')|x}</Data><NamedCell
-      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Unit price')|x}</Data><NamedCell
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Item code')|x}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Description')|x}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('UoM')|x}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Unit price')|x}</Data><NamedCell
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
       ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s26"><Data ss:Type="String">${_('currency (functional)')|x}</Data><NamedCell
@@ -791,53 +831,53 @@
     <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Quantity Theorical')|x}</Data><NamedCell
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s29"><Data ss:Type="String">${_('Quantity counted')|x}</Data><NamedCell
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Quantity counted')|x}</Data><NamedCell
       ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s47"><Data ss:Type="String">${_('Batch no')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Expiry date')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s41"><Data ss:Type="String">${_('Discrepancy')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s41"><Data ss:Type="String">${_('Discrepancy value')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s41"><Data ss:Type="String">${_('Total QTY before INV')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Total QTY after INV')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Total Value after INV')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Discrepancy')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Discrepancy Value')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Adjustment type')|x}</Data><NamedCell
-      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Comments / actions (in case of discrepancy)')|x}</Data><NamedCell
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Batch no')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Expiry date')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Discrepancy')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Discrepancy Value')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total QTY before INV')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total QTY after INV')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total Value after INV')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total Discrepancy')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total Discrepancy Value')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Adjustment type')|x}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Comments / actions (in case of discrepancy)')|x}</Data><NamedCell
       ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
 <% index = 0 %>
    </Row>
    % for index,item in enumerate([x for x in objects[0].discrepancy_line_ids if not x.ignored]):
    <Row>
-    <Cell ss:StyleID="s30"><Data ss:Type="String">${item.line_no}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s30"><Data ss:Type="Number">${item.line_no}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s30"><Data ss:Type="String">${item.nomen_manda_2 and item.nomen_manda_2.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s31"><Data ss:Type="String">${item.product_id and item.product_id.code or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s31"><Data ss:Type="String">${item.product_id and item.product_id.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s38"><Data ss:Type="String">${item.product_uom_id and item.product_uom_id.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.standard_price}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s43"><Data ss:Type="Number">${item.standard_price}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s43"><Data ss:Type="String">${item.currency_id and item.currency_id.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s30"><Data ss:Type="String">${item.theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s31"><Data ss:Type="String">${item.counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s30"><Data ss:Type="Number">${item.theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s31"><Data ss:Type="Number">${item.counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s38"><Data ss:Type="String">${item.batch_number or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s32"><Data ss:Type="String">${item.expiry_date or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s42"><Data ss:Type="String">${item.total_product_theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_counted_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s46"><Data ss:Type="String">${item.total_product_discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s31"><Data ss:Type="Number">${item.discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s43"><Data ss:Type="Number">${item.discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s42"><Data ss:Type="Number">${item.total_product_theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36"><Data ss:Type="Number">${item.total_product_counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36dec"><Data ss:Type="Number">${item.total_product_counted_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36"><Data ss:Type="Number">${item.total_product_discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="Number">${item.total_product_discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s50"><Data ss:Type="String">${item.reason_type_id and item.reason_type_id.complete_name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s48"><Data ss:Type="String">${item.comment or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
    </Row>