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

[jftempo]

=== modified file 'bin/addons/stock_override/report/delivery_order.py'
--- bin/addons/stock_override/report/delivery_order.py	2018-12-07 08:20:52 +0000
+++ bin/addons/stock_override/report/delivery_order.py	2021-09-27 10:27:19 +0000
@@ -62,8 +62,10 @@
             'assigned': _('Available'),
             'shipped': _('Available Shipped'),
             'done': _('Closed'),
+            'dispatched': _('Dispatched'),
             'cancel': _('Cancelled'),
             'import': _('Import in progress'),
+            'received': _('Received'),
         }
         return states.get(state, '')
 
 
=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
--- bin/addons/stock_override/report/delivery_order.rml	2019-02-08 15:31:51 +0000
+++ bin/addons/stock_override/report/delivery_order.rml	2021-09-27 10:27:19 +0000
@@ -171,7 +171,7 @@
                     <para style="HeaderRight">State :</para>
                 </td>
                 <td>
-                    <para style="Header">[[ get_state(picking.state) ]]</para>
+                    <para style="Header">[[ get_state(picking.state_hidden) ]]</para>
                 </td>
                 <td>
                     <para style="HeaderRight">Reason Type :</para>