Merge branch 'master' into hotFixDefaulterFilter

modules/client/back/models/client-credit.json

@@ -19,6 +19,9 @@
         },
         "created": {
             "type": "date"
+        },
+        "workerFk": {
+            "type": "number"
         }
     },
     "relations": {
@@ -33,4 +36,4 @@
             "foreignKey": "workerFk"
         }
     }
-}
+}

modules/travel/back/methods/travel/filter.js

@@ -91,6 +91,11 @@ module.exports = Self => {
                 arg: 'landed',
                 type: 'date',
                 description: 'The landed date'
+            },
+            {
+                arg: 'awbFk',
+                type: 'number',
+                description: 'The awbFk id'
             }
         ],
         returns: {
@@ -168,7 +173,9 @@ module.exports = Self => {
                     t.totalEntries,
                     t.isRaid,
                     t.daysInForward,
+                    t.awbFk,
                     am.name agencyModeName,
+                    a.code awbCode,
                     win.name warehouseInName,
                     wout.name warehouseOutName,
                     cnt.code continent
@@ -176,6 +183,7 @@ module.exports = Self => {
                     JOIN vn.agencyMode am ON am.id = t.agencyModeFk
                     JOIN vn.warehouse win ON win.id = t.warehouseInFk
                     JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk
+                    JOIN vn.awb a ON a.id = t.awbFk
                     JOIN warehouse wo ON wo.id = t.warehouseOutFk
                     JOIN country c ON c.id = wo.countryFk
                     LEFT JOIN continent cnt ON cnt.id = c.continentFk) AS t`