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

[jftempo]

=== modified file 'bin/addons/sales_followup/report/sale_follow_up_report_multi.py'
--- bin/addons/sales_followup/report/sale_follow_up_report_multi.py	2018-09-24 15:01:54 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_report_multi.py	2019-05-03 09:52:04 +0000
@@ -214,9 +214,9 @@
                             is_shipment_done = move.picking_id.state == 'done'
                             packing = '-'
                         if not grouped:
-                            key = (packing, False, move.product_uom.name)
+                            key = (packing, s_out and shipment or False, move.product_uom.name)
                         else:
-                            key = (packing, False, move.product_uom.name, line.line_number)
+                            key = (packing, s_out and shipment or False, move.product_uom.name, line.line_number)
                         if not only_bo:
                             data.update({
                                 'packing': packing,