Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3428-item_diary

modules/ticket/back/methods/ticket/filter.js

@@ -177,6 +177,8 @@ module.exports = Self => {
                 return {'a.provinceFk': value};
             case 'stateFk':
                 return {'ts.stateFk': value};
+            case 'collectionFk':
+                return {'cll.id': value};
             case 'mine':
             case 'myTeam':
                 if (value)
@@ -276,9 +278,8 @@ module.exports = Self => {
         if (args.collectionFk) {
             stmt.merge({
                 sql: `
-                    JOIN collection cll ON cll.id = ?
-                    JOIN ticketCollection tc ON tc.collectionFk = cll.id AND tc.ticketFk = t.id`,
-                params: [args.collectionFk]
+                    JOIN collection cll
+                    JOIN ticketCollection tc ON tc.collectionFk = cll.id AND tc.ticketFk = t.id`
             });
         }
 

modules/ticket/front/main/index.js

@@ -8,6 +8,7 @@ export default class Ticket extends ModuleMain {
             'to',
             'search',
             'clientFk',
+            'collectionFk',
             'orderFk',
             'refFk',
             'scopeDays'