From f1c30ca6d1f6ced7785ae4186435285f96b4fedc Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 6 May 2021 08:13:17 +0200
Subject: [PATCH] cambio landed por created

---
 modules/client/back/methods/client/createReceipt.js    |  3 +--
 .../route/back/methods/route/getSuggestedTickets.js    | 10 ++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
index 976ff7cf27..a96575c5e2 100644
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/modules/client/back/methods/client/createReceipt.js
@@ -83,9 +83,8 @@ module.exports = function(Self) {
                     throw new UserError('Invalid account');
 
                 await Self.rawSql(
-                    `CALL vn.ledger_doCompensation(?, ?, ?, ?, ?, ?, ?)`,
+                    `CALL vn.ledger_doCompensation(CURDATE(), ?, ?, ?, ?, ?, ?)`,
                     [
-                        Date(),
                         args.compensationAccount,
                         args.bankFk,
                         accountingType.receiptDescription + args.compensationAccount,
diff --git a/modules/route/back/methods/route/getSuggestedTickets.js b/modules/route/back/methods/route/getSuggestedTickets.js
index 12bde16841..5699cf6546 100644
--- a/modules/route/back/methods/route/getSuggestedTickets.js
+++ b/modules/route/back/methods/route/getSuggestedTickets.js
@@ -20,12 +20,6 @@ module.exports = Self => {
     });
 
     Self.getSuggestedTickets = async id => {
-        const ticketsInRoute = await Self.app.models.Ticket.find({
-            where: {routeFk: id},
-            fields: ['id']
-        });
-        const idsToExclude = ticketsInRoute.map(ticket => ticket.id);
-
         const route = await Self.app.models.Route.findById(id);
 
         const zoneAgencyModes = await Self.app.models.ZoneAgencyMode.find({
@@ -48,8 +42,8 @@ module.exports = Self => {
             where: {
                 agencyModeFk: route.agencyModeFk,
                 zoneFk: {inq: zoneIds},
-                id: {nin: idsToExclude},
-                created: {between: [minDate, maxDate]}
+                routeFk: null,
+                landed: {between: [minDate, maxDate]}
             },
             include: [
                 {