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

[jftempo]

=== modified file 'bin/addons/stock/report/stock_delivery_report.py'
--- bin/addons/stock/report/stock_delivery_report.py	2019-08-22 09:27:03 +0000
+++ bin/addons/stock/report/stock_delivery_report.py	2019-08-27 15:04:17 +0000
@@ -66,7 +66,7 @@
                 'destination': ppl and pick.partner_id.name or fo and not fo.procurement_request and fo.partner_id.name
                 or move.location_dest_id.name or '',
                 'create_date': pick.date,
-                'shipped_date': ppl and ship and ship.shipment_expected_date or pick.date_done,
+                'shipped_date': ppl and ship and ship.shipment_actual_date or pick.date_done,
             })
 
             self._order_iterator += 1
 
=== modified file 'bin/addons/stock/wizard/stock_delivery_wizard.py'
--- bin/addons/stock/wizard/stock_delivery_wizard.py	2019-08-22 09:27:03 +0000
+++ bin/addons/stock/wizard/stock_delivery_wizard.py	2019-08-27 15:04:17 +0000
@@ -84,13 +84,13 @@
                 out_domain.insert(0, '&')
                 out_domain.append(('picking_id.date_done', '>=', wizard.start_date))
                 ppl_domain.insert(0, '&')
-                ppl_domain.append(('picking_id.shipment_id.shipment_expected_date', '>=', wizard.start_date))
+                ppl_domain.append(('picking_id.shipment_id.shipment_actual_date', '>=', wizard.start_date))
 
             if wizard.end_date:
                 out_domain.insert(0, '&')
                 out_domain.append(('picking_id.date_done', '<=', wizard.end_date))
                 ppl_domain.insert(0, '&')
-                ppl_domain.append(('picking_id.shipment_id.shipment_expected_date', '<=', wizard.end_date))
+                ppl_domain.append(('picking_id.shipment_id.shipment_actual_date', '<=', wizard.end_date))
 
             if wizard.location_id:
                 out_domain.insert(0, '&')