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

[jftempo]

=== modified file 'bin/addons/stock/report/stock_reception_report.py'
--- bin/addons/stock/report/stock_reception_report.py	2020-02-03 10:43:58 +0000
+++ bin/addons/stock/report/stock_reception_report.py	2020-02-20 15:04:51 +0000
@@ -39,6 +39,31 @@
                 func_price_unit = round(curr_obj.compute(self.cr, self.uid, po.pricelist_id.currency_id.id,
                                                          move.company_id.currency_id.id, move.price_unit,
                                                          round=False, context=self.localcontext), 2)
+
+            # Get the linked INT's move destination location
+            int_move_dest_loc = False
+            int_domain = [('type', '=', 'internal'), ('line_number', '=', move.line_number),
+                          ('picking_id.previous_chained_pick_id', '=', pick.id)]
+            linked_int_move_ids = move_obj.search(self.cr, self.uid, int_domain, context=self.localcontext)
+            if linked_int_move_ids:
+                int_move_dest_loc = move_obj.browse(self.cr, self.uid, linked_int_move_ids[0],
+                                                    fields_to_fetch=['location_dest_id'],
+                                                    context=self.localcontext).location_dest_id.name
+            if sol:
+                if sol.procurement_request:
+                    if int_move_dest_loc and sol.order_id.location_requestor_id.usage == 'internal':
+                        final_dest_loc = int_move_dest_loc
+                    else:
+                        final_dest_loc = sol.order_id.location_requestor_id.name
+                else:
+                    final_dest_loc = sol.order_id.partner_id.name
+            elif int_move_dest_loc:
+                final_dest_loc = int_move_dest_loc
+            elif move.location_dest_id:
+                final_dest_loc = move.location_dest_id.name
+            else:
+                final_dest_loc = ''
+
             res.append({
                 'ref': pick.name,
                 'reason_type': move.reason_type_id and move.reason_type_id.name or '',
@@ -46,7 +71,7 @@
                 'supplier': pick.partner_id and pick.partner_id.name or '',
                 'purchase_id': po,  # For category, type and priority
                 'dr_date': pol.date_planned or po.delivery_requested_date,
-                'dc_date': pol.confirmed_delivery_date or po.confirmed_delivery_date,
+                'dc_date': pol.confirmed_delivery_date or po.delivery_confirmed_date,
                 'origin': move.origin,
                 'backorder': pick.backorder_id and pick.backorder_id.name or '',
                 'line': move.line_number,
@@ -60,8 +85,7 @@
                 'total_cost': move.product_qty * move.price_unit,
                 'total_cost_func': move.product_qty * func_price_unit,
                 'dest_loc': move.location_dest_id and move.location_dest_id.name or '',
-                'final_dest_loc': sol and (sol.order_id.procurement_request and sol.order_id.location_requestor_id.name or sol.order_id.partner_id.name)
-                or move.location_dest_id and move.location_dest_id.name or '',
+                'final_dest_loc': final_dest_loc,
                 'exp_receipt_date': move.date_expected,
                 'actual_receipt_date': move.date,
                 'phys_recep_date': pick.physical_reception_date,