db/dump/fixtures.after.sql

@@ -255,7 +255,7 @@ INSERT INTO vn.operator (workerFk, numberOfWagons, trainFk, itemPackingTypeFk, w
         (9, 1, 1, 'V', 1);
 */
 -- XXX: web
-
+/* #5483
 INSERT INTO `hedera`.`config` (`cookieLife`, `defaultForm`)
     VALUES (15,'cms/home');
 
@@ -274,7 +274,7 @@ UPDATE `vn`.`agencyMode` SET `description` = `name`;
 
 INSERT INTO `hedera`.`tpvConfig` (currency, terminal, transactionType, maxAmount, employeeFk, `url`, testMode, testUrl, testKey, merchantUrl)
     VALUES (978, 1, 0, 2000, 9, 'https://sis.redsys.es/sis/realizarPago', 0, 'https://sis-t.redsys.es:25443/sis/realizarPago', 'sq7HjrUOBfKmC576ILgskD5srU870gJ7', NULL);
-
+*/
 INSERT INTO hedera.tpvMerchantEnable (merchantFk, companyFk)
     VALUES (1, 442);
 

db/routines/vn/procedures/client_userDisable.sql

@@ -20,15 +20,15 @@ BEGIN
 		WHERE c.typeFk = 'normal'
 			AND a.id IS NULL
 			AND u.active
-			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH
+			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH 
 			AND NOT u.role = (SELECT id FROM `role` WHERE name = 'supplier')
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c
 						LEFT JOIN ticket t ON t.clientFk = c.id
 					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH
-						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH
+						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH 
 			);
 END$$
 DELIMITER ;

loopback/locale/es.json

@@ -378,4 +378,4 @@
 	"There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
 	"The height must be greater than 50cm": "La altura debe ser superior a 50cm",
 	"The maximum height of the wagon is 200cm": "La altura máxima es 200cm"
-}
+}