loopback/locale/es.json

@@ -357,5 +357,9 @@
 	"This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
 	"Select ticket or client": "Elija un ticket o un client",
 	"It was not able to create the invoice": "No se pudo crear la factura",
+<<<<<<< HEAD
 	"This PDA is already assigned to another user": "This PDA is already assigned to another user"
+=======
+	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)"
+>>>>>>> test
 }

modules/ticket/back/methods/ticket/closeAll.js

@@ -138,12 +138,10 @@ module.exports = Self => {
                     JOIN alertLevel al ON al.id = ts.alertLevel
                     JOIN agencyMode am ON am.id = t.agencyModeFk
                     JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-                    JOIN zone z ON z.id = t.zoneFk
                 SET t.routeFk = NULL
                 WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
-                    AND t.routeFk
-                    AND z.name LIKE '%MADRID%'`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
+                    AND t.routeFk`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
 
         return {
             message: 'Success'