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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-11-21 16:33:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-01-27 10:41:38 +0000
@@ -106586,3 +106586,7 @@
 msgid "Funding Pool not found."
 msgstr "Funding Pool non trouvé."
 
+#. module: stock
+#: report:addons/stock/report/stock_reception_report_xls.mako:255
+msgid "INT Ref."
+msgstr "Réf. du INT"

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2019-11-07 13:30:08 +0000
+++ bin/addons/purchase/purchase_workflow.py	2020-01-27 10:41:38 +0000
@@ -177,6 +177,7 @@
                 'type': 'make_to_order',
                 'is_line_split': pol.is_line_split,
                 'original_line_id': pol.original_line_id.linked_sol_id.id if pol.original_line_id else False,
+                'procurement_request': sale_order.procurement_request,
             }
 
             # update modification comment if it is set

=== modified file 'bin/addons/stock/report/stock_reception_report.py'
--- bin/addons/stock/report/stock_reception_report.py	2019-10-30 14:14:52 +0000
+++ bin/addons/stock/report/stock_reception_report.py	2020-01-27 10:41:38 +0000
@@ -30,7 +30,9 @@
             pick = move.picking_id
             pol = move.purchase_line_id
             po = pol.order_id
-            sol = move.purchase_line_id.sale_order_line_id
+            sol = move.purchase_line_id.linked_sol_id
+            int_name = move.move_dest_id and move.move_dest_id.picking_id.type == 'internal' and \
+                       move.move_dest_id.picking_id.subtype == 'standard' and move.move_dest_id.picking_id.name or ''
             func_price_unit = move.price_unit
             if move.company_id.currency_id.id != po.pricelist_id.currency_id.id:
                 self.localcontext['currency_date'] = move.date
@@ -58,11 +60,12 @@
                 '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.procurement_request and sol.order_id.location_requestor_id.name or sol.order_id.partner_id.name)
+                '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 '',
                 'exp_receipt_date': move.date_expected,
                 'actual_receipt_date': move.date,
                 'phys_recep_date': pick.physical_reception_date,
+                'int_name': int_name,
             })
 
         return res

=== modified file 'bin/addons/stock/report/stock_reception_report_xls.mako'
--- bin/addons/stock/report/stock_reception_report_xls.mako	2019-06-27 13:24:11 +0000
+++ bin/addons/stock/report/stock_reception_report_xls.mako	2020-01-27 10:41:38 +0000
@@ -155,6 +155,8 @@
         <Column ss:AutoFitWidth="1" ss:Width="60.0" />
         ## Physical Reception Date
         <Column ss:AutoFitWidth="1" ss:Width="60.0" />
+        ## INT Ref.
+        <Column ss:AutoFitWidth="1" ss:Width="80.0" />
 
         ## WORKSHEET HEADER
         <Row>
@@ -250,6 +252,7 @@
             _('Expected Receipt Date'),
             _('Actual Receipt Date'),
             _('Physical Reception Date'),
+            _('INT Ref.'),
         ]
         %>
         <Row>
@@ -306,6 +309,7 @@
                 % else:
                 <Cell ss:StyleID="line_center"><Data ss:Type="String"></Data></Cell>
                 % endif
+                <Cell ss:StyleID="line_center"><Data ss:Type="String">${move['int_name']|x}</Data></Cell>
             </Row>
         % endfor