Merge branch '2402-entry_create' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create

modules/entry/front/create/index.html

@@ -33,8 +33,8 @@
                 ng-model="$ctrl.entry.travelFk"
                 url="Travels/filter"
                 search-function="$ctrl.searchFunction($search)"
-                value-field="t.id"
+                value-field="id"
-                order="t.id"
+                order="id"
                 label="Travel"
                 required="true">
                 <tpl-item>

modules/entry/front/create/index.js

@@ -26,11 +26,11 @@ export default class Controller extends Section {
 
     searchFunction($search) {
         return {or: [
-            {'am.name': {like: `%${$search}%`}},
+            {'agencyModeName': {like: `%${$search}%`}},
-            {'win.name': {like: `%${$search}%`}},
+            {'warehouseInName': {like: `%${$search}%`}},
-            {'wout.name': {like: `%${$search}%`}},
+            {'warehouseOutName': {like: `%${$search}%`}},
-            {'t.shipped': new Date($search)},
+            {'shipped': new Date($search)},
-            {'t.landed': new Date($search)}
+            {'landed': new Date($search)}
         ]};
     }
 }

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

@@ -112,7 +112,8 @@ module.exports = Self => {
         let stmts = [];
         let stmt;
         stmt = new ParameterizedSQL(
-            `SELECT
+            `SELECT * FROM
+                (SELECT
                     t.id,
                     t.shipped,
                     t.landed,
@@ -132,7 +133,7 @@ module.exports = Self => {
                 FROM vn.travel t
                     JOIN vn.agencyMode am ON am.id = t.agencyFk
                     JOIN vn.warehouse win ON win.id = t.warehouseInFk
-                    JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk`
+                    JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk) AS t`
         );
 
         stmt.merge(conn.makeSuffix(filter));