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

[jftempo]

=== modified file 'bin/addons/sale/wizard/internal_request_import.py'
--- bin/addons/sale/wizard/internal_request_import.py	2018-11-14 14:05:06 +0000
+++ bin/addons/sale/wizard/internal_request_import.py	2018-11-27 09:58:17 +0000
@@ -475,13 +475,13 @@
                 # Line 6: Creation date
                 create_date = values.get(6, [])[1]
                 if type(create_date) == type(DateTime.now()):
-                    req_date = create_date.strftime('%d-%m-%Y')
-                    header_values['imp_creation_date'] = req_date
+                    create_date = create_date.strftime('%Y-%m-%d')
+                    header_values['imp_creation_date'] = create_date
                 else:
                     for format in l_date_format:
                         try:
-                            time.strptime(create_date, format)
-                            header_values['imp_creation_date'] = create_date
+                            create_date = datetime.datetime.strptime(create_date, format)
+                            header_values['imp_creation_date'] = create_date.strftime('%Y-%m-%d')
                             break
                         except:
                             continue
@@ -496,13 +496,13 @@
                 # Line 7: Requested date
                 req_date = values.get(7, [])[1]
                 if type(req_date) == type(DateTime.now()):
-                    req_date = req_date.strftime('%d-%m-%Y')
+                    req_date = req_date.strftime('%Y-%m-%d')
                     header_values['imp_requested_date'] = req_date
                 else:
                     for format in l_date_format:
                         try:
-                            time.strptime(req_date, format)
-                            header_values['imp_requested_date'] = req_date
+                            req_date = datetime.datetime.strptime(req_date, format)
+                            header_values['imp_requested_date'] = req_date.strftime('%Y-%m-%d')
                             break
                         except:
                             continue
@@ -694,13 +694,13 @@
                     if vals[8]:
                         dost = vals[8]
                         if type(dost) == type(DateTime.now()):
-                            dost = dost.strftime('%d-%m-%Y')
+                            dost = dost.strftime('%Y-%m-%d')
                             line_data.update({'imp_stock_take_date': dost})
                         else:
                             for format in l_date_format:
                                 try:
-                                    time.strptime(dost, format)
-                                    line_data.update({'imp_stock_take_date': dost})
+                                    dost = datetime.datetime.strptime(dost, format)
+                                    line_data.update({'imp_stock_take_date': dost.strftime('%Y-%m-%d')})
                                     break
                                 except:
                                     continue

=== modified file 'bin/addons/sales_followup/report/ir_follow_up_location_report.py'
--- bin/addons/sales_followup/report/ir_follow_up_location_report.py	2018-11-13 10:54:52 +0000
+++ bin/addons/sales_followup/report/ir_follow_up_location_report.py	2018-11-27 09:58:17 +0000
@@ -279,7 +279,7 @@
                                 shipment = move.picking_id.shipment_id.name or '-'
                                 is_shipment_done = move.picking_id.shipment_id.state == 'done'
                             elif from_stock:
-                                packing = '-'
+                                packing = move.picking_id.name or '-'
                                 shipment = '-'
                                 is_shipment_done = move.picking_id.state == 'done' and move.state != 'cancel'
                                 state = move.picking_id.state