Merge branch 'dev' into 6497_redirect_firewall

back/methods/dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

back/methods/docuware/download.js

@@ -43,7 +43,7 @@ module.exports = Self => {
             path: `/:id/download`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/image/download.js

@@ -48,7 +48,7 @@ module.exports = Self => {
             path: `/:collection/:size/:id/download`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, collection, size, id) {

back/methods/osticket/sendToSupport.js

@@ -46,7 +46,7 @@ module.exports = Self => {
             html += `<strong>${data}</strong>:<br/>${tryParse(additionalData[data])}<br/>`;
 
         const subjectReason = httpRequest?.data?.error;
-        smtp.send({
+        await smtp.send({
             to: `${config.app.reportEmail}, ${emailUser.email}`,
             subject:
                 '[Support-Salix] ' +

db/dump/.dump/data.sql

@@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','10962','5411433e529d50d68b3a0675b1a0a6215ea931ca','2024-03-25 17:47:37','10969');
+INSERT INTO `version` VALUES ('vn-database','10970','273507d3b711f272078e83880802d0ef7278d062','2024-04-05 10:33:29','10983');
 
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@@ -673,14 +673,21 @@ INSERT INTO `versionLog` VALUES ('vn-database','10874','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10876','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10878','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10879','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10880','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10881','00-alterTableNotification.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10881','01-notification.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10882','00-vehicle.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10883','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10884','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10885','00-revokeUpdateClient.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10887','00-schemaAndUser.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10887','01-tables.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10888','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-16 07:39:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10889','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-23 09:55:56',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10890','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10891','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10892','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10893','00-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','01-financialProductType.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','02-flight.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','03-gastos_resumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:00',NULL,NULL);
@@ -706,6 +713,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10913','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10914','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-28 11:52:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10915','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10918','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10919','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10922','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-29 13:44:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10923','00-createParkingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10923','01-aclParkingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
@@ -714,13 +722,32 @@ INSERT INTO `versionLog` VALUES ('vn-database','10925','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10926','00-refactorClaimState.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10928','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10929','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:16:19',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10932','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10940','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-06 16:48:18',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10941','00-restoreVn2008Jerarquia.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 09:36:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10942','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 10:24:45',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10943','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 10:29:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10946','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-08 07:56:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','00-account.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','01-bs.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','02-edi.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','03-hedera.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','04-pbx.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','05-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','06-salix.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','06-srt.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','07-util.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','08-vn.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','08-vn2.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10956','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10957','00-aclTicketClone.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10959','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-18 13:32:25',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10962','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-25 08:27:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10968','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10969','00-aclSupplierDms.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10970','00-specialPrice.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10975','00-action.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-03 12:03:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10975','01-expeditionFk.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-03 12:04:52',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -735,8 +762,8 @@ INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 09:04:5
 INSERT INTO `role` VALUES (2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 09:04:58','2023-06-02 22:33:28',NULL);
 INSERT INTO `role` VALUES (3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
 INSERT INTO `role` VALUES (5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
-INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
+INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios no autenticados',1,'2017-05-19 09:04:58','2024-04-06 12:05:08',1437);
-INSERT INTO `role` VALUES (9,'developer','Desarrolladores del sistema',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
+INSERT INTO `role` VALUES (9,'developer','Desarrollador raso',1,'2017-05-19 09:04:58','2024-03-27 14:14:58',1437);
 INSERT INTO `role` VALUES (11,'account','Privilegios relacionados con el login',0,'2017-05-19 09:04:58','2017-09-20 19:06:35',NULL);
 INSERT INTO `role` VALUES (13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 09:04:58','2021-06-30 15:29:30',NULL);
 INSERT INTO `role` VALUES (15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 09:04:58','2018-02-12 11:50:10',NULL);
@@ -1309,7 +1336,7 @@ INSERT INTO `ACL` VALUES (274,'InvoiceInLog','*','READ','ALLOW','ROLE','administ
 INSERT INTO `ACL` VALUES (275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant');
-INSERT INTO `ACL` VALUES (279,'MailAlias','*','*','ALLOW','ROLE','marketing');
+INSERT INTO `ACL` VALUES (279,'MailAlias','*','READ','ALLOW','ROLE','marketing');
 INSERT INTO `ACL` VALUES (283,'EntryObservation','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin');
 INSERT INTO `ACL` VALUES (285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin');
@@ -1777,7 +1804,7 @@ INSERT INTO `ACL` VALUES (804,'DeviceProduction','*','READ','ALLOW','ROLE','empl
 INSERT INTO `ACL` VALUES (805,'Collection','assign','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (806,'ExpeditionPallet','getPallet','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (807,'MachineWorker','updateInTime','WRITE','ALLOW','ROLE','production');
-INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (809,'SaleTracking','delete','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (810,'SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (811,'SaleTracking','setPicked','WRITE','ALLOW','ROLE','production');
@@ -1789,6 +1816,10 @@ INSERT INTO `ACL` VALUES (816,'WorkerActivity','*','*','ALLOW','ROLE','productio
 INSERT INTO `ACL` VALUES (817,'ParkingLog','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (818,'ExpeditionPallet','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (819,'Ticket','addSaleByCode','WRITE','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (820,'TicketCollection','*','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (821,'Ticket','clone','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (822,'SupplierDms','*','*','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (823,'MailAlias','*','*','ALLOW','ROLE','developerBoss');
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2492,7 +2523,7 @@ USE `cache`;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 INSERT INTO `cache` VALUES (1,'equalizator','00:19:00');
-INSERT INTO `cache` VALUES (2,'available','00:06:00');
+INSERT INTO `cache` VALUES (2,'available','00:01:00');
 INSERT INTO `cache` VALUES (3,'stock','00:30:00');
 INSERT INTO `cache` VALUES (4,'last_buy','23:59:00');
 INSERT INTO `cache` VALUES (5,'weekly_sales','12:00:00');

db/dump/.dump/privileges.sql

@@ -45,6 +45,7 @@ INSERT  IGNORE INTO `db` VALUES ('','account','salix','Y','Y','Y','Y','N','N','N
 INSERT  IGNORE INTO `db` VALUES ('','mysql','salix','Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','psico','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','geo','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
+INSERT  IGNORE INTO `db` VALUES ('','floranet','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','tmp','guest','Y','Y','Y','Y','N','Y','N','N','N','N','Y','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','util','salix','Y','Y','Y','Y','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','dipole','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
@@ -77,6 +78,7 @@ INSERT  IGNORE INTO `db` VALUES ('','bi','developer','Y','Y','Y','Y','N','N','N'
 INSERT  IGNORE INTO `db` VALUES ('','util','grafana','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','mysql','developerBoss','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','rfid','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
+INSERT  IGNORE INTO `db` VALUES ('','floranet','floranet','N','N','N','N','N','N','N','N','N','N','Y','Y','N','N','N','N','Y','N','N','N');
 /*!40000 ALTER TABLE `db` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `tables_priv` DISABLE KEYS */;
@@ -777,7 +779,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','PreciosEspecia
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','movingState','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferState','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicle','alexm@%','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicle','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','buffer','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferGroup','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','lastRFID','alexm@%','0000-00-00 00:00:00','Select','');
@@ -1373,6 +1375,10 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accounting',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','accounting','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','workerActivity','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleState','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','expeditionState','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','specialPrice','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRatio','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1657,9 +1663,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myUser_checkLogin
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','lang','FUNCTION','juan@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofmonth','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','account_conciliacion_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','logistic','add_awb_component','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','productionAssi','agencyModeImbalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1686,7 +1690,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_CURDATE','FUNCTIO
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','client_checkBalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','addressTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','absoluteInventoryHistory','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','client_getSalesPersonByTicket','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','pbx','developer','clientFromPhone','FUNCTION','juan@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','production','log_addWithUser','PROCEDURE','juan@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1694,6 +1698,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_ad
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_delete','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_move','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','company_getSuppliersDebt','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','multipleInventoryHistory','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','salesAssistant','defaultersFromDate','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_updatepacking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_updategrouping','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1712,8 +1717,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaInvoiceInB
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelvinglog_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','production','expedition_scan','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','historico_absoluto','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','historico_multiple','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','client_getDebt','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_commit','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1792,7 +1795,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','zone_getstate','PRO
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','worker_gethierarchy','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','workertimecontrol_weekcheckbreak','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','ticket_split','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','add_awb_component','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','saletracking_new','PROCEDURE','alexm@pc325.algemesi.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','ticketnotinvoicedbyclient','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','workerjourney_replace','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -2047,6 +2049,7 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"vers
 INSERT  IGNORE INTO `global_priv` VALUES ('','ext','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','floranet','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','grafana','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','greenhouseBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','guest','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 150000, \"max_user_connections\": 200, \"max_statement_time\": 0.000000, \"is_role\": true, \"version_id\": 101106}');

db/dump/.dump/triggers.sql

@@ -820,6 +820,12 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Current Database: `floranet`
+--
+
+USE `floranet`;
+
 --
 -- Current Database: `hedera`
 --
@@ -2289,17 +2295,26 @@ trig: BEGIN
 	DECLARE vGroupingMode TINYINT;
 	DECLARE vGenericFk INT;
 	DECLARE vGenericInDate BOOL;
+	DECLARE vBuyerFk INT;
 
 	IF @isModeInventory THEN
 		LEAVE trig;
 	END IF;
 
+	CALL entry_checkBooked(NEW.entryFk);
 	IF NEW.printedStickers <> 0 THEN
 		CALL util.throw('it is not possible to create buy lines with printedstickers other than 0');
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
 
+	SELECT it.workerFk INTO vBuyerFk
+		FROM item i
+			JOIN itemType it ON it.id = i.typeFk
+		WHERE i.id = NEW.itemFk;
+
+	SET NEW.buyerFk = vBuyerFk;
+
 	CALL buy_checkGrouping(NEW.`grouping`);
 
 	SELECT t.warehouseInFk, t.landed
@@ -2409,11 +2424,13 @@ trig:BEGIN
 	DECLARE vGenericInDate BOOL;
 	DECLARE vIsInventory BOOL;
 	DECLARE vDefaultEntry INT;
+	DECLARE vBuyerFk INT;
 
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
 
+	CALL entry_checkBooked(OLD.entryFk);
 	SET NEW.editorFk = account.myUser_getId();
 
 	SELECT defaultEntry INTO vDefaultEntry
@@ -2467,6 +2484,15 @@ trig:BEGIN
 		SET	NEW.isIgnored = TRUE;
 	END IF;
 
+	IF NOT (NEW.itemFk <=> OLD.itemFk) THEN
+		SELECT it.workerFk INTO vBuyerFk
+			FROM item i
+				JOIN itemType it ON it.id = i.typeFk
+			WHERE i.id = NEW.itemFk;
+
+		SET NEW.buyerFk = vBuyerFk;
+	END IF;
+
 	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
 		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
 		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
@@ -2557,10 +2583,11 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER  `vn`.`buy_beforeDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_beforeDelete`
-    BEFORE DELETE ON buy
+	BEFORE DELETE ON `buy`
-    FOR EACH ROW
+	FOR EACH ROW
 BEGIN 
+	CALL entry_checkBooked(OLD.entryFk);
 	IF OLD.printedStickers <> 0 THEN
 		CALL util.throw("it is not possible to delete buys with printed labels ");
 	END IF;
@@ -4675,6 +4702,10 @@ BEGIN
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	
+	IF NEW.isBooked = OLD.isBooked THEN
+		CALL entry_checkBooked(OLD.id);
+	END IF;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
@@ -4777,6 +4808,7 @@ DELIMITER ;;
 	BEFORE DELETE ON `entry`
 	FOR EACH ROW
 BEGIN
+	CALL entry_checkBooked(OLD.id);
 	DELETE FROM buy WHERE entryFk = OLD.id;
 END */;;
 DELIMITER ;
@@ -10087,6 +10119,10 @@ BEGIN
 			CALL util.throw('The travel has entries with booked invoices');
 		END IF;
 	END IF;	
+	
+	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
+		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10126,10 +10162,6 @@ BEGIN
 			CALL buy_checkItem();
 		END IF;
 	END IF;
-
-	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
-		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10836,6 +10868,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10856,6 +10889,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10865,11 +10899,11 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneIncluded_afterDelete`
 	AFTER DELETE ON `zoneIncluded`
@@ -10880,6 +10914,7 @@ BEGIN
 			`changedModel` = 'zoneIncluded',
 			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10962,4 +10997,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-03-26  6:55:58
+-- Dump completed on 2024-04-08  7:14:22

db/dump/fixtures.after.sql

@@ -156,16 +156,16 @@ INSERT INTO `vn`.`occupationCode` (`code`, `name`)
         ('b', 'Representantes de comercio'),
         ('c', 'Personal de oficios en trabajos de construcción en general, y en instalac.,edificios y obras');
 
-INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`nss`,`codpuesto`,`codempresa`,`codcontrato`,`FAntiguedad`,`grupotarifa`,`codcategoria`,`ContratoTemporal`)
+INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`codempresa`)
     VALUES
-        (36,'46/10515497-58',6,20,189,'2009-01-02',5,10,0),
+        (36,20),
-        (43,'46/10235353-50',7,20,189,'2009-04-21',5,10,0),
+        (43,20),
-        (76,'46/10250562-30',1,20,189,'2009-09-07',9,5,0),
+        (76,20),
-        (1106,'46/10297768-94',4,20,100,'2021-03-09',7,18,0),
+        (1106,20),
-        (1107,'46/1627085-11',15,20,402,'2021-03-15',9,6,1),
+        (1107,20),
-        (1108,'46/10446901-41',25,20,502,'2021-03-22',10,29,1),
+        (1108,20),
-        (1109,'46/10552113-8',3,20,402,'2021-03-23',9,9,1),
+        (1109,20),
-        (1110,'46/10723579-75',3,20,402,'2021-03-23',9,9,1);
+        (1110,20);
 
 INSERT INTO `vn`.`trainingCourseType` (`id`, `name`)
     VALUES

db/dump/fixtures.before.sql

@@ -3223,7 +3223,6 @@ INSERT INTO vn.buy
 		packing = 20,
 		`grouping` = 1,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3262,7 +3261,6 @@ INSERT INTO vn.buy
 		packing = 40,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3301,7 +3299,6 @@ INSERT INTO vn.buy
 		packing = 10,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3348,7 +3345,6 @@ INSERT INTO vn.buy
 		packing = 20,
 		`grouping` = 4,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3387,7 +3383,6 @@ INSERT INTO vn.buy
 		packing = 20,
 		`grouping` = 1,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3427,7 +3422,6 @@ INSERT INTO vn.buy
 		packing = 200,
 		`grouping` = 30,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3467,7 +3461,6 @@ INSERT INTO vn.buy
 		packing = 500,
 		`grouping` = 10,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3507,7 +3500,6 @@ INSERT INTO vn.buy
 		packing = 300,
 		`grouping` = 50,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3547,7 +3539,6 @@ INSERT INTO vn.buy
 		packing = 50,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3588,7 +3579,6 @@ INSERT vn.buy
 		packing = 5,
 		`grouping` = 2,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3628,7 +3618,6 @@ INSERT vn.buy
 		packing = 100,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,

db/routines/vn/events/clientsDisable.sql

@@ -7,9 +7,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
-			JOIN clientType ct ON ct.id = c.typeFk
 		SET u.active = FALSE
-		WHERE ct.code = 'normal'
+		WHERE c.typeFk = 'normal'
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c

db/routines/vn/procedures/collection_assign.sql

@@ -15,6 +15,13 @@ proc:BEGIN
 	DECLARE vHasTooMuchCollections BOOL;
 	DECLARE vLockTime INT DEFAULT 15;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK('collection_assign');
+		
+		RESIGNAL;
+	END;
+
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 

db/routines/vn/procedures/collection_new.sql

@@ -219,9 +219,11 @@ proc:BEGIN
 			UPDATE tmp.productionBuffer pb
 					JOIN (
 						SELECT SUM(litros) liters,
-								@lines:= COUNT(*) + @lines `lines`,
+								@lines:= COUNT(*) + @lines,
+								COUNT(*) `lines`,
 								MAX(i.`size`) height,
-								@volume := SUM(sv.volume) + @volume volume
+								@volume := SUM(sv.volume) + @volume,
+								SUM(sv.volume) volume
 							FROM saleVolume sv
 								JOIN sale s ON s.id = sv.saleFk
 								JOIN item i ON i.id = s.itemFk

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -33,6 +33,7 @@ BEGIN
 			ii.operated = IFNULL(ii.operated,d.operated),
 			ii.issued = IFNULL(ii.issued,d.issued),
 			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
+			e.isBooked = TRUE,
 			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
 

db/routines/vn/procedures/inventoryMake.sql

@@ -114,7 +114,7 @@ BEGIN
 			quantity int(11) DEFAULT '0',
 			buyingValue decimal(10,4) DEFAULT '0.0000',
 			freightValue decimal(10,3) DEFAULT '0.000',
-			packing int(11) DEFAULT '0',
+			packing int(11) DEFAULT '1',
 			`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
 			groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
 			comissionValue decimal(10,3) DEFAULT '0.000',

db/routines/vn/procedures/invoiceOut_new.sql

@@ -68,16 +68,21 @@ BEGIN
 	DELETE ti.*
 		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
+			LEFT JOIN address a ON a.id = t.addressFk
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
 			JOIN supplier su ON su.id = t.companyFk
 			JOIN client c ON c.id = t.clientFk
-			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+				AND itc.countryFk = su.countryFk
 		WHERE (YEAR(t.shipped) < 2001 AND  t.isDeleted)
 			OR c.isTaxDataChecked = FALSE
 			OR t.isDeleted
 			OR c.hasToInvoice = FALSE
-			OR itc.id IS NULL;
+			OR itc.id IS NULL
+			OR a.id IS NULL 
+			OR (vTaxArea = 'WORLD' 
+				AND (a.customsAgentFk IS NULL OR a.incotermsFk IS NULL));
 
 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
 		INTO vIsAnySaleToInvoice

db/routines/vn/procedures/item_getSimilar.sql

@@ -60,7 +60,11 @@ BEGIN
 			(i.value8 <=> its.value8) match8,
 			a.available,
 			IFNULL(ip.counter, 0) `counter`,
-			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
+			CASE
+				WHEN b.groupingMode = 1 THEN b.grouping
+				WHEN b.groupingMode = 2 THEN b.packing
+				ELSE 1
+			END AS minQuantity,
 			iss.visible located
 		FROM vn.item i
 			JOIN cache.available a ON a.item_id = i.id

db/routines/vn/procedures/zone_getAddresses.sql

@@ -28,7 +28,7 @@ BEGIN
 	SELECT c.id clientFk,
 				c.name,
 				c.phone,
-				c.mobile,
+				bt.description,
 				c.salesPersonFk,
 				u.name username,
 				aai.invoiced,
@@ -44,10 +44,11 @@ BEGIN
 				LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = c.id
 				LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
 				JOIN vn.clientType ct ON ct.code = c.typeFk
+				JOIN vn.businessType bt ON bt.code = c.businessTypeFk 
 			WHERE a.isActive
 				AND c.isActive
 				AND ct.code = 'normal'
-				AND c.businessTypeFk <> 'worker'
+				AND bt.code <> 'worker'
 			GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

db/routines/vn2008/views/Proveedores_cargueras.sql

@@ -0,0 +1,5 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Proveedores_cargueras`
+AS SELECT `fs`.`supplierFk` AS `Id_Proveedor`
+FROM `vn`.`supplierFreight` `fs`

db/routines/vn2008/views/Tramos.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Tramos`
+AS SELECT `s`.`id` AS `id`,
+	`s`.`section` AS `Tramo`
+FROM `vn`.`timeSlots` `s`

db/routines/vn2008/views/payrollWorker.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_employee`
+AS SELECT `pw`.`workerFkA3` AS `CodTrabajador`,
+	`pw`.`companyFkA3` AS `codempresa`
+FROM `vn`.`payrollWorker` `pw`

db/routines/vn2008/views/payroll_centros.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_centros`
+AS SELECT `pwc`.`workCenterFkA3` AS `cod_centro`,
+	`pwc`.`companyFkA3` AS `codempresa`
+FROM `vn`.`payrollWorkCenter` `pwc`

db/routines/vn2008/views/payroll_conceptos.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_conceptos`
+AS SELECT `pc`.`id` AS `conceptoid`,
+	`pc`.`name` AS `concepto`,
+	`pc`.`isSalaryAgreed` AS `isSalaryAgreed`,
+	`pc`.`isVariable` AS `isVariable`,
+	`pc`.`isException` AS `isException`	
+FROM `vn`.`payrollComponent` `pc`

db/versions/10930-wheatDendro/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS vn.flight ADD CONSTRAINT flight_airline_FK FOREIGN KEY (airlineFk) 
+    REFERENCES vn.airline(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10930-wheatDendro/01-Tramos.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`Tramos` RENAME `vn`.`timeSlots`;
+
+ALTER TABLE IF EXISTS `vn`.`timeSlots`
+CHANGE COLUMN IF EXISTS `Tramo` `section` time NOT NULL;

db/versions/10930-wheatDendro/02-dock.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`dock` RENAME `vn2008`.`dock__`;
+ALTER TABLE IF EXISTS vn2008.dock__ COMMENT='refs #6371 deprecated 2024-03-05';

db/versions/10930-wheatDendro/03-Proveedores_cargueras.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`Proveedores_cargueras` RENAME `vn`.`supplierFreight`;
+
+ALTER TABLE IF EXISTS `vn`.`supplierFreight`
+CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(10) unsigned NOT NULL;

db/versions/10930-wheatDendro/04-payroll_employee.sql

@@ -0,0 +1,13 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`payroll_employee` RENAME `vn`.`payrollWorker`;
+
+ALTER TABLE IF EXISTS `vn`.`payrollWorker`
+CHANGE COLUMN IF EXISTS `CodTrabajador` `workerFkA3` int(11) NOT NULL COMMENT 'Columna que hace referencia a A3.',
+CHANGE COLUMN IF EXISTS `nss` `nss__` varchar(23) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codpuesto` `codpuesto__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codempresa` `companyFkA3` int(10) NOT NULL COMMENT 'Columna que hace referencia a A3.',
+CHANGE COLUMN IF EXISTS `codcontrato` `codcontrato__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `FAntiguedad` `FAntiguedad__` date NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `grupotarifa` `grupotarifa__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codcategoria` `codcategoria__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `ContratoTemporal` `ContratoTemporal__` tinyint(1) NOT NULL DEFAULT 0 COMMENT '@Deprecated refs #6738 15/03/2024';

db/versions/10930-wheatDendro/05-payroll_centros.sql

@@ -0,0 +1,13 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`payroll_centros` RENAME `vn`.`payrollWorkCenter`;
+
+ALTER TABLE IF EXISTS `vn`.`payrollWorkCenter`
+CHANGE COLUMN IF EXISTS `cod_centro` `workCenterFkA3` int(11) NOT NULL COMMENT 'Columna que hace referencia a A3.',
+CHANGE COLUMN IF EXISTS `Centro` `Centro__` varchar(255) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `nss_cotizacion` `nss_cotizacion__` varchar(15) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `domicilio` `domicilio__` varchar(255) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `poblacion` `poblacion__` varchar(45) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `cp` `cp__` varchar(5) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `empresa_id` `empresa_id__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codempresa` `companyFkA3` int(11) DEFAULT NULL COMMENT 'Columna que hace referencia a A3.';
+;

db/versions/10930-wheatDendro/06-payroll_conceptos.sql

@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`payroll_conceptos` RENAME `vn`.`payrollComponent`;
+
+ALTER TABLE IF EXISTS `vn`.`payrollComponent`
+CHANGE COLUMN IF EXISTS `conceptoid` `id` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `concepto` `name` varchar(255) DEFAULT NULL;

db/versions/10930-wheatDendro/07-Permisos.sql

@@ -0,0 +1,40 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Tramos` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.Tramos TO `employee`;
+GRANT SELECT ON TABLE vn.timeSlots TO `employee`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Proveedores_cargueras` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.Proveedores_cargueras TO `buyer`;
+GRANT SELECT ON TABLE vn.supplierFreight TO `buyer`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_employee` AS
+SELECT 1;
+
+GRANT SELECT,INSERT  ON TABLE vn2008.payroll_employee TO `hr`;
+GRANT SELECT,INSERT  ON TABLE vn.payrollWorker TO `hr`;
+
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_centros` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.payroll_centros TO `hr`;
+GRANT SELECT ON TABLE vn.payrollWorkCenter TO `hr`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_conceptos` AS
+SELECT 1;
+
+GRANT SELECT,UPDATE ON TABLE vn2008.payroll_conceptos TO `hr`;
+GRANT SELECT,UPDATE ON TABLE vn.payrollComponent TO `hr`;

db/versions/10949-limeLaurel/00-firstScript.sql

@@ -0,0 +1,15 @@
+	INSERT INTO util.notification ( name, description)
+		SELECT  'invoice-ticket-closure',
+				'Tickets not invoiced during the nightly closure ticket process';
+			
+	SET @notificationFk =LAST_INSERT_ID();
+
+	INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk)
+		SELECT  @notificationFk,id 
+			FROM account.role 
+			WHERE name ='administrative';
+
+	INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk)
+		SELECT @notificationFk, id 
+			FROM account.`user`
+			WHERE `name` = 'admon';

db/versions/10967-wheatLilium/00-firstScript.sql

@@ -0,0 +1,4 @@
+-- Place your SQL code here
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES('ItemShelving', 'hasItemOlder', 'READ', 'ALLOW', 'ROLE', 'production');

db/versions/10975-whiteIvy/00-action.sql

@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);

db/versions/10975-whiteIvy/01-expeditionFk.sql

@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);

db/versions/10977-wheatFern/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.buy DROP COLUMN packageFk;

e2e/paths/14-account/02_alias_create_and_basic_data.spec.js

@@ -8,7 +8,7 @@ describe('Account Alias create and basic data path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('developer', 'account');
+        await page.loginAndModule('itManagement', 'account');
         await page.accessToSection('account.alias');
     });
 

front/core/components/link-phone/index.html

@@ -5,7 +5,6 @@
             flat
             round
             icon="phone"
-            title="MicroSIP"
             ng-click="$event.stopPropagation();"
         >
         </vn-icon>

front/core/services/token.js

@@ -59,7 +59,8 @@ export default class Token {
 
     getStorage(storage) {
         this.token = storage.getItem('vnToken');
-        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
+        // Cambio realizado temporalmente
+        this.tokenMultimedia = this.token; // storage.getItem('vnTokenMultimedia');
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);

loopback/server/datasources.json

@@ -117,6 +117,21 @@
             "video/mp4"
         ]
     },
+    "supplierStorage": {		
+        "name": "supplierStorage",		
+        "connector": "loopback-component-storage",		
+        "provider": "filesystem",		
+        "root": "./storage/dms",		
+        "maxFileSize": "31457280",		
+        "allowedContentTypes": [		
+            "image/png",		
+            "image/jpeg",		
+            "image/jpg",		
+            "image/webp",		
+            "video/mp4",		
+            "application/pdf"		
+        ]
+    },
     "accessStorage": {
         "name": "accessStorage",
         "connector": "loopback-component-storage",

modules/claim/back/methods/claim/claimPickupPdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:id/claim-pickup-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');

modules/claim/back/methods/claim/downloadFile.js

@@ -33,7 +33,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/claim/back/methods/claim/updateClaim.js

@@ -96,9 +96,9 @@ module.exports = Self => {
             // When claimState has been changed
             if (args.claimStateFk) {
                 const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
-                await notifyStateChange(ctx, salesPerson.id, claim, newState.code);
+                await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
                 if (newState.code == 'canceled')
-                    await notifyStateChange(ctx, claim.workerFk, claim, newState.code);
+                    await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
             }
 
             if (tx) await tx.commit();

modules/client/back/methods/client/campaignMetricsPdf.js

@@ -46,7 +46,7 @@ module.exports = Self => {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');

modules/entry/back/methods/entry/entryOrderPdf.js

@@ -34,7 +34,7 @@ module.exports = Self => {
             path: '/:id/entry-order-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');

modules/invoiceOut/back/methods/invoiceOut/download.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             path: '/:id/download',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, id, options) {

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             path: '/downloadZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, ids, options) {

modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:reference/exportation-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');

modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js

@@ -38,7 +38,7 @@ module.exports = Self => {
             path: '/:reference/invoice-csv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.invoiceCsv = async reference => {

modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js

@@ -40,7 +40,7 @@ module.exports = Self => {
             path: '/negativeBasesCsv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.negativeBasesCsv = async(ctx, options) => {

modules/item/back/methods/item-image-queue/download.js

@@ -11,7 +11,7 @@ module.exports = Self => {
             path: `/download`,
             verb: 'POST',
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.download = async() => {

modules/item/back/methods/item-shelving/hasItemOlder.js

@@ -0,0 +1,63 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    Self.remoteMethod('hasItemOlder', {
+        description:
+            'Get boolean if any or specific item of the shelving has older created in another shelving or parking',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'shelvingFkIn',
+            type: 'string',
+            required: true,
+            description: 'Shelving code'
+        },
+        {
+            arg: 'parking',
+            type: 'string',
+            description: 'Parking code'
+        },
+        {
+            arg: 'shelvingFkOut',
+            type: 'string',
+            description: 'Shelving code'
+        },
+        {
+            arg: 'itemFk',
+            type: 'integer',
+            description: 'Item id'
+        }],
+        returns: {
+            type: 'boolean',
+            root: true
+        },
+        http: {
+            path: `/hasItemOlder`,
+            verb: 'GET'
+        }
+    });
+
+    Self.hasItemOlder = async(shelvingFkIn, parking, shelvingFkOut, itemFk, options) => {
+        if (!parking && !shelvingFkOut) throw new UserError('Missing data: parking or shelving');
+
+        const myOptions = {};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const result = await Self.rawSql(`
+            SELECT COUNT(ish.id) countItemOlder
+                FROM vn.itemShelving ish
+                    JOIN (
+                        SELECT ish.itemFk, created,shelvingFk
+                            FROM vn.itemShelving ish
+                                JOIN vn.shelving s ON ish.shelvingFk = s.code
+                            WHERE ish.shelvingFk = ?
+                        )sub ON sub.itemFK = ish.itemFk
+                    JOIN vn.shelving s ON s.code = ish.shelvingFk 
+                    JOIN vn.parking p ON p.id = s.parkingFk 
+                WHERE sub.created > ish.created 
+                    AND (p.code <> ? OR ? IS NULL)
+                    AND (ish.shelvingFk <> ? OR ? IS NULL)
+                    AND (ish.itemFk <> ? OR ? IS NULL)`,
+        [shelvingFkIn, parking, parking, shelvingFkOut, shelvingFkOut, itemFk, itemFk], myOptions);
+        return result[0]['countItemOlder'] > 0;
+    };
+};

modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js

@@ -0,0 +1,45 @@
+
+const {models} = require('vn-loopback/server/server');
+
+describe('itemShelving hasOlder()', () => {
+    it('should return false because there are not older items', async() => {
+        const shelvingFkIn = 'GVC';
+        const shelvingFkOut = 'HEJ';
+        const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, null, shelvingFkOut);
+
+        expect(result).toBe(false);
+    });
+
+    it('should return false because there are not older items in parking', async() => {
+        const shelvingFkIn = 'HEJ';
+        const parking = '700-01';
+        const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking);
+
+        expect(result).toBe(false);
+    });
+
+    it('should return true because there is an older item', async() => {
+        const shelvingFkIn = 'UXN';
+        const shelvingFkOut = 'PCC';
+        const parking = 'A-01-1';
+        const itemFk = 1;
+
+        const tx = await models.ItemShelving.beginTransaction({});
+        const myOptions = {transaction: tx};
+        const filter = {where: {shelvingFk: shelvingFkOut}
+        };
+        try {
+            const itemShelvingBefore = await models.ItemShelving.findOne(filter, myOptions);
+            await itemShelvingBefore.updateAttributes({
+                itemFk: itemFk
+            }, myOptions);
+            const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking, null, null, myOptions);
+
+            expect(result).toBe(true);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/item/back/models/item-shelving.js

@@ -4,4 +4,5 @@ module.exports = Self => {
     require('../methods/item-shelving/getInventory')(Self);
     require('../methods/item-shelving/getAlternative')(Self);
     require('../methods/item-shelving/updateFromSale')(Self);
+    require('../methods/item-shelving/hasItemOlder')(Self);
 };

modules/route/back/methods/route/downloadCmrsZip.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/downloadCmrsZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadCmrsZip = async function(ctx, ids, options) {

modules/route/back/methods/route/downloadZip.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/downloadZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, id, options) {

modules/route/back/methods/route/driverRoutePdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:id/driver-route-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
 
     });
 

modules/supplier/back/methods/supplier/campaignMetricsPdf.js

@@ -45,7 +45,7 @@ module.exports = Self => {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');

modules/supplier/back/model-config.json

@@ -8,6 +8,9 @@
     "SupplierDms": {
         "dataSource": "vn"
     },
+    "SupplierContainer": {		
+        "dataSource": "supplierStorage"		
+    },
     "SupplierAddress": {
         "dataSource": "vn"
     },

modules/ticket/back/methods/ticket-collection/hasUncheckedTicket.js

@@ -35,6 +35,6 @@ module.exports = Self => {
                 WHERE tc.ticketFk = ? AND s.order < s2.id
                 LIMIT 1;`,
         [ticketFk], myOptions);
-        return result.length > 0 && result[0]['ticketFk'] > 0;
+        return result[0]?.ticketFk > 0 && result[0].ticketFk;
     };
 };

modules/ticket/back/methods/ticket-collection/spec/hasUncheckedTicket.spec.js

@@ -27,7 +27,7 @@ describe('ticketCollection hasUncheckedTicket()', () => {
             }, myOptions);
             const result = await models.TicketCollection.hasUncheckedTicket(ticketFk, myOptions);
 
-            expect(result).toBe(true);
+            expect(result).toBeTruthy();
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

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

@@ -53,8 +53,8 @@ module.exports = Self => {
                     JOIN province p ON p.id = c.provinceFk
                     JOIN country co ON co.id = p.countryFk
                     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-                    AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) AND util.dayEnd(?)
+                    AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                     AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
@@ -64,18 +64,83 @@ module.exports = Self => {
                 VALUES ('nightInvoicing', ?)
         `, [ticketIds.join(',')]);
 
+        await Self.rawSql(`
+        WITH ticketNotInvoiceable AS(
+            SELECT JSON_OBJECT(
+                'tickets',
+                JSON_ARRAYAGG(
+                    JSON_OBJECT(
+                        'ticketId', ticketFk,
+                        'reason', reason
+                    )
+                )
+            )errors
+            FROM (
+                SELECT ticketFk,
+                        CONCAT_WS(', ',
+                            IF(hasErrorToInvoice, 'Facturar', NULL),
+                            IF(hasErrorTaxDataChecked, 'Datos comprobados', NULL),
+                            IF(hasErrorDeleted, 'Eliminado', NULL),
+                            IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
+                            IF(hasErrorAddress, 'Sin dirección', NULL),
+                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason
+                    FROM (
+                        SELECT t.id ticketFk,
+                                SUM(NOT c.hasToInvoice) hasErrorToInvoice,
+                                SUM(NOT c.isTaxDataChecked) hasErrorTaxDataChecked,
+                                SUM(t.isDeleted) hasErrorDeleted,
+                                SUM(itc.id IS NULL) hasErrorItemTaxCountry,
+                                SUM(a.id IS NULL) hasErrorAddress,
+                                SUM(ios.code IS NOT NULL 
+                                    AND(ad.customsAgentFk IS NULL 
+                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld
+                            FROM ticket t
+                                LEFT JOIN address ad ON ad.id = t.addressFk
+                                JOIN sale s ON s.ticketFk = t.id
+                                JOIN item i ON i.id = s.itemFk
+                                JOIN supplier su ON su.id = t.companyFk
+                                JOIN agencyMode am ON am.id = t.agencyModeFk
+                                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                                JOIN ticketState ts ON ts.ticketFk = t.id
+                                JOIN alertLevel al ON al.id = ts.alertLevel
+                                JOIN client c ON c.id = t.clientFk
+                                JOIN province p ON p.id = c.provinceFk
+                                LEFT JOIN autonomy a ON a.id = p.autonomyFk
+                                JOIN country co ON co.id = p.countryFk
+                                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                                LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+                                    AND itc.countryFk = su.countryFk
+                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD' 
+                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'M')
+                            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
+                                AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
+                                AND t.refFk IS NULL
+                                AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
+                            GROUP BY ticketFk   
+                            HAVING hasErrorToInvoice 
+                                OR hasErrorTaxDataChecked 
+                                OR hasErrorDeleted 
+                                OR hasErrorItemTaxCountry 
+                                OR hasErrorAddress 
+                                OR hasErrorInfoTaxAreaWorld
+                    )sub
+                )sub2
+            ) SELECT IF(errors = '{"tickets": null}',
+                    'No errors',
+                    util.notification_send('invoice-ticket-closure', errors, NULL)) 
+                FROM ticketNotInvoiceable`, [toDate, toDate]);
+
         await closure(ctx, Self, tickets);
 
         await Self.rawSql(`
             UPDATE ticket t
-                JOIN ticketState ts ON t.id = ts.ticketFk
+                    JOIN ticketState ts ON t.id = ts.ticketFk
-                JOIN alertLevel al ON al.id = ts.alertLevel
+                    JOIN alertLevel al ON al.id = ts.alertLevel
-                JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN agencyMode am ON am.id = t.agencyModeFk
-                JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+                    JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-                JOIN zone z ON z.id = t.zoneFk
+                    JOIN zone z ON z.id = t.zoneFk
-            SET t.routeFk = NULL
+                SET t.routeFk = NULL
-                WHERE DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
+                WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
-                    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});

modules/ticket/back/methods/ticket/closure.js

@@ -147,6 +147,10 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                 );
             }
         } catch (error) {
+            await Self.rawSql(`
+                INSERT INTO util.debug (variable, value)
+                    VALUES ('invoicingTicketError', ?)
+            `, [ticket.id + ' - ' + error]);
             // Domain not found
             if (error.responseCode == 450) return invalidEmail(ticket);
 
@@ -171,7 +175,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
             to: config.app.reportEmail,
             subject: '[API] Nightly ticket closure report',
             html: body,
-        });
+        }).catch(err => console.error(err));
     }
 
     async function invalidEmail(ticket) {
@@ -202,6 +206,6 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
             to: ticket.salesPersonEmail,
             subject: 'No se ha podido enviar el albarán',
             html: body,
-        });
+        }).catch(err => console.error(err));
     }
 };

modules/ticket/back/methods/ticket/deliveryNoteCsv.js

@@ -38,7 +38,7 @@ module.exports = Self => {
             path: '/:id/delivery-note-csv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.deliveryNoteCsv = async id => {

modules/ticket/back/methods/ticket/deliveryNotePdf.js

@@ -42,7 +42,7 @@ module.exports = Self => {
             path: '/:id/delivery-note-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');

modules/travel/back/methods/travel/extraCommunityPdf.js

@@ -79,7 +79,7 @@ module.exports = Self => {
             path: '/extra-community-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community');

modules/worker/back/methods/worker-dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        //accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

myt.config.yml

@@ -11,6 +11,7 @@ schemas:
   - cache
   - dipole
   - edi
+  - floranet
   - hedera
   - pbx
   - psico

print/core/email.js

@@ -88,7 +88,7 @@ class Email extends Component {
             force: options.force
         };
 
-        return smtp.send(mailOptions);
+        return await smtp.send(mailOptions);
     }
 }
 

print/templates/email/invoice-ticket-closure/assets/css/import.js

@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();

print/templates/email/invoice-ticket-closure/invoice-ticket-closure.html

@@ -0,0 +1,13 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-px-ml centered">
+            <h1>{{ $t('title') }}</h1>
+            <hr>
+        </div>
+        <div v-for="ticket in tickets" class="grid-block vn-px-ml">
+            <p v-if="ticket.ticketId"><b>{{ $t('ticketId') }}:</b> {{ticket.ticketId}}</p>
+            <p v-if="ticket.reason"><b>{{ $t('reason') }}:</b> {{ticket.reason}}</p>
+            <hr>
+        </div>
+    </div>
+</email-body>

print/templates/email/invoice-ticket-closure/invoice-ticket-closure.js

@@ -0,0 +1,15 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'invoice-ticket-closure',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        tickets: {
+            type: Array,
+            required: true
+        },
+    }
+};

print/templates/email/invoice-ticket-closure/locale/en.yml

@@ -0,0 +1,4 @@
+subject: Nightly ticket closing process report
+title: Nightly ticket closing process report
+reason: Reason
+ticketId: Ticket 

print/templates/email/invoice-ticket-closure/locale/es.yml

@@ -0,0 +1,4 @@
+subject: Informe proceso de cierre de tickets nocturno
+title: Informe proceso de cierre de tickets nocturno
+reason: Motivo
+ticketId: Ticket

print/templates/email/zone-included/zone-included.html

@@ -18,7 +18,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="zone in zoneCollisions">
+                <tr v-for="zone in zones" v-bind:key="zone.zoneFk">
                     <td>{{ zone.zn.name }}</td>
                     <td>{{ zone.zoneFk }}</td>
                     <td>{{ zone.z.price }}</td>

print/templates/email/zone-included/zone-included.js

@@ -8,5 +8,10 @@ module.exports = {
     },
     props: {
         zoneCollisions: {type: Array, required: true}
+    },
+    computed: {
+        zones() {
+            return JSON.parse(this.zoneCollisions);
+        }
     }
 };

print/templates/reports/credit-request/assets/css/style.css

@@ -16,7 +16,6 @@ p {
 
 td > span {
     width: 100%;
-    margin-bottom: 15px
 }
 
 .green-background {
@@ -28,7 +27,7 @@ td > span {
 }
 
 .info-panel td, .info-panel th {
-    padding: 1em 1em;
+    padding: 1%;
 }
 
 .info-panel {
@@ -37,16 +36,28 @@ td > span {
 
 table {
     width: 100%;
+    text-align: end;
 }
 
 th {
-    width: 30%;
-}
-
-td {
     width: 20%;
 }
 
-.field {
+td {
-    float: none
+    width: 10%;
 }
+
+.field {
+    width: 100%;
+    float: none;
+}
+
+th > input {
+    float: none;
+    border: 0;
+    background-color: rgb(236, 236, 236);
+    width: 100%;
+    height: 3em;
+}
+
+

print/templates/reports/credit-request/credit-request.html

@@ -9,9 +9,13 @@
             <tr>
                 <td style="width: 70%; text-align: right; padding-right: 2em">{{$t('fields.date')}}:</td>
                 <th>
-                    <div class="field wide-rectangle">
+                    <input/>
-                        <span></span>
+                </th>
-                    </div>
+            </tr>
+            <tr>
+                <td style="width: 70%; text-align: right;">{{$t('fields.importCredit')}}:
+                <th colspan="3">
+                    <input/>
                 </th>
             </tr>
         </tbody>
@@ -28,65 +32,47 @@
                             <tr>
                                 <td>{{$t('fields.companyName')}}:</td>
                                 <th colspan="3">
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                             <tr>
                                 <td>{{$t('fields.businessType')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                                 <td>{{$t('fields.antiquity')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                             <tr>
                                 <td>{{$t('fields.surface')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                                 <td>{{$t('fields.numberOfEmployees')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                             <tr>
                                 <td>{{$t('fields.owner')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                                 <td>{{$t('fields.phone')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                             <tr>
                                 <td>{{$t('fields.payer')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                                 <td>{{$t('fields.phone')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                         </tbody>
@@ -105,27 +91,15 @@
                     <table>
                         <tbody>
                             <tr class="row-oriented">
-                                <td>{{$t('fields.previousSalesVolume')}}:</td>
+                                <td>{{$t('fields.previousSellsVolume')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                             <tr class="row-oriented">
                                 <td>{{$t('fields.forecastedSalesVolume')}}:</td>
                                 <th>
-                                    <div class="field wide-rectangle">
+                                    <input/>
-                                        <span></span>
-                                    </div>
-                                </th>
-                            </tr>
-                            <tr class="row-oriented">
-                                <td>{{$t('fields.forecastedPurchases')}}:</td>
-                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
                                 </th>
                             </tr>
                         </tbody>
@@ -142,15 +116,11 @@
                         <tr class="row-oriented" style="width: 100%">
                             <td>{{$t('fields.personFilling')}}:</td>
                             <th>
-                                <div class="field wide-rectangle">
+                                <input/>
-                                    <span></span>
-                                </div>
                             </th>
                             <td>{{$t('fields.phone')}}:</td>
                             <th>
-                                <div class="field wide-rectangle">
+                                <input/>
-                                    <span></span>
-                                </div>
                             </th>
                         </tr>
                     </tbody>

print/templates/reports/credit-request/locale/es.yml

@@ -3,10 +3,11 @@ fields:
   title: Solicitud de crédito
   date: Fecha
   companyName: Nombre de la empresa
+  importCredit: Importe del crédito solicitado
   businessType: Tipo de negocio
   antiquity: Antigüedad
   surface: Superficie (m²)
-  numberOfEmployees: Número de empleados
+  numberOfEmployees: Nº empleados
   owner: Contacto propietario o Administrador
   phone: Teléfono
   payer: Contacto responsable de pagos
@@ -16,3 +17,4 @@ fields:
   personFilling: Persona que rellena el formulario
   companyInfo: Información general sobre la empresa
   economicInfo: Información económica
+  previousSellsVolume: Volumen de ventas del año anterior

print/templates/reports/driver-route/assets/css/style.css

@@ -1,3 +1,9 @@
+td{
+    overflow: hidden;
+    max-width: 100px;
+    text-overflow: ellipsis;
+}
+
 h1 {
     text-align: center;
 }

print/templates/reports/driver-route/sql/routes.sql

@@ -1,19 +1,18 @@
-SELECT
+SELECT r.id,
-    r.id,
+        r.m3,
-    r.m3,
+        r.created,
-    r.created,
+        r.time,
-    r.time,
+        u.nickName userNickName,
-    u.nickName userNickName,
+        v.tradeMark vehicleTradeMark,
-    v.tradeMark vehicleTradeMark,
+        v.model vehicleModel,
-    v.model vehicleModel,
+        v.numberPlate plateNumber,
-    v.numberPlate plateNumber,
+        IFNULL(s.name, am.name) agencyName
-    IFNULL(s.name, am.name) AS agencyName
+    FROM route r
-FROM route r
+        LEFT JOIN vehicle v ON v.id = r.vehicleFk
-    LEFT JOIN vehicle v ON v.id = r.vehicleFk
+        LEFT JOIN worker w ON w.id = r.workerFk
-    LEFT JOIN worker w ON w.id = r.workerFk
+        LEFT JOIN account.user u ON u.id = w.id
-    LEFT JOIN account.user u ON u.id = w.id
+        LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
-    LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+        LEFT JOIN agency a ON a.id = am.agencyFk
-    LEFT JOIN agency a ON a.id = am.agencyFk
+        LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
-    LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
+        LEFT JOIN supplier s ON s.id = sa.supplierFk
-    LEFT JOIN supplier s ON s.id = sa.supplierFk
+    WHERE r.id IN(?)
-WHERE r.id IN(?)

print/templates/reports/driver-route/sql/tickets.sql

@@ -1,43 +1,42 @@
-SELECT
+SELECT t.nickname addressName,
-    t.nickname addressName,
+        t.packages,
-    t.packages,
+        t.priority,
-    t.priority,
+        t.id,
-    t.id,
+        t.clientFk,
-    t.clientFk,
+        t.companyFk,
-    t.companyFk,
+        t.routeFk,
-    t.routeFk,
+        if(a.phone, a.phone, c.phone) phone,
-    if(a.phone, a.phone, c.phone) AS phone,
+        if(a.mobile, a.mobile, c.mobile) mobile,
-    if(a.mobile, a.mobile, c.mobile) AS mobile,
+        wh.name warehouseName,
-    wh.name warehouseName,
+        a.city,
-    a.city,
+        a.street,
-    a.street,
+        a.postalCode,
-    a.postalCode,
+        LPAD(a.id, 5, '0') addressFk,
-    LPAD(a.id, 5, '0') AS addressFk,
+        p.name province,
-    p.name province,
+        0 import,
-    0 AS import,
+        am.name ticketAgency,
-    am.name ticketAgency,
+        tob.description,
-    tob.description,
+        u.nickName salesPersonName,
-    u.nickName salesPersonName,
+        ipkg.itemPackingTypes
-    ipkg.itemPackingTypes
+    FROM route r
-FROM route r
+        JOIN ticket t ON t.routeFk = r.id
-    JOIN ticket t ON t.routeFk = r.id
+        LEFT JOIN address a ON a.id = t.addressFk
-    LEFT JOIN address a ON a.id = t.addressFk
+        LEFT JOIN client c ON c.id = t.clientFk
-    LEFT JOIN client c ON c.id = t.clientFk
+        LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
-    LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
+        LEFT JOIN account.user u ON u.id = w.id
-    LEFT JOIN account.user u ON u.id = w.id
+        LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
-    LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
+        LEFT JOIN province p ON a.provinceFk = p.id
-    LEFT JOIN province p ON a.provinceFk = p.id
+        LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
-    LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
+        LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-    LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+        LEFT JOIN (
-    LEFT JOIN (
+            SELECT t.id AS ticketFk, 
-        SELECT t.id AS ticketFk, 
+                GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
-               GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
+            FROM route r
-        FROM route r
+                JOIN ticket t ON t.routeFk = r.id
-            JOIN ticket t ON t.routeFk = r.id
+                JOIN sale s ON s.ticketFk = t.id
-            JOIN sale s ON s.ticketFk = t.id
+                JOIN item i ON i.id = s.itemFk
-            JOIN item i ON i.id = s.itemFk
+            WHERE r.id IN (?)
-        WHERE r.id IN (?)
+            GROUP BY t.id
-        GROUP BY t.id
+        ) ipkg ON ipkg.ticketFk = t.id
-    ) ipkg ON ipkg.ticketFk = t.id
+    WHERE r.id IN (?)
-WHERE r.id IN (?)
+    ORDER BY t.priority, t.id;
-ORDER BY t.priority, t.id;