Fix trade_shipments import task. Using wrong references for tables
Merge branch 'fix_import_shipments_script' into develop