Merge pull request 'fix: refs #6897 fix filter' (!2901) from 6897-entryMigrationFilterFix into dev

Reviewed-on: #2901
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

modules/entry/back/methods/entry/filter.js

@@ -109,6 +109,11 @@ module.exports = Self => {
                 arg: 'days',
                 type: 'number',
                 description: `N days interval`
+            },
+            {
+                arg: 'invoiceAmount',
+                type: 'number',
+                description: `The invoice amount`
             }
         ],
         returns: {
@@ -192,6 +197,7 @@ module.exports = Self => {
                     e.companyFk,
                     e.gestDocFk,
                     e.invoiceInFk,
+                    e.invoiceAmount,
                     t.landed,
                     s.name supplierName,
                     s.nickname supplierAlias,

modules/entry/back/models/entry.json

@@ -74,6 +74,9 @@
         },
         "observationEditorFk": {
             "type": "number"
+        },
+        "invoiceAmount": {
+            "type": "number"
         }
     },
     "relations": {
@@ -108,4 +111,4 @@
             "foreignKey": "typeFk"
         }
     }
-}
+}

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

@@ -71,7 +71,15 @@ module.exports = Self => {
                 arg: 'continent',
                 type: 'string',
                 description: 'The continent code'
-            },
+            }, {
+                arg: 'shipmentHour',
+                type: 'string',
+                description: 'The shipment hour'
+            }, {
+                arg: 'landingHour',
+                type: 'string',
+                description: 'The landing hour'
+            }
         ],
         returns: {
             type: ['Object'],
@@ -130,6 +138,8 @@ module.exports = Self => {
                     t.isReceived,
                     t.m3,
                     t.kg,
+                    t.shipmentHour,
+                    t.landingHour,
                     t.cargoSupplierFk,
                     t.totalEntries,
                     am.name agencyModeName,

modules/travel/back/models/travel.json

@@ -44,6 +44,12 @@
         },
         "agencyModeFk": {
             "type": "number"
+        },
+        "shipmentHour": {
+            "type": "string"
+        },
+        "landingHour": {
+            "type": "string"
         }
     },
     "relations": {
@@ -64,3 +70,4 @@
         }
     }
 }
+