Merge branch 'dev' into 6738-cleanTables2008Part2to2

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
2024-04-05 10:23:55 +00:00 · 2024-04-05 10:33:47 +02:00 · 2024-04-05 10:33:26 +02:00 · 2024-04-05 08:32:07 +00:00 · 2024-04-05 10:05:51 +02:00 · 2024-04-05 10:00:34 +02:00
61 changed files with 1436 additions and 1083 deletions
--- a/back/methods/dms/downloadFile.js
+++ b/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) {
--- a/back/methods/docuware/download.js
+++ b/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) {
--- a/back/methods/image/download.js
+++ b/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) {
--- a/back/methods/osticket/sendToSupport.js
+++ b/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] ' +
--- a/db/dump/.dump/data.sql
+++ b/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','7ea917dc4db761955007c73bbd4667a0e44b8e9c','2024-04-05 07:49:24','10981');

 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 */;
@ -736,7 +763,7 @@ INSERT INTO `role` VALUES (2,'customer','Privilegios básicos de un cliente',1,'
 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 (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','developer');

 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');
--- a/db/dump/.dump/privileges.sql
+++ b/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,9 @@ 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','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;

 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@ -1657,9 +1662,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 +1689,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 +1697,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 +1716,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 +1794,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 +2048,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}');
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
--- a/db/dump/.dump/triggers.sql
+++ b/db/dump/.dump/triggers.sql
@ -2289,17 +2289,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 +2418,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 +2478,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
@ -2558,9 +2578,10 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_beforeDelete`
-    BEFORE DELETE ON buy
+	BEFORE DELETE ON `buy`
 	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 +4696,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 +4802,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 +10113,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 +10156,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 +10862,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10856,6 +10883,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10865,11 +10893,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_results = utf8mb3 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!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 +10908,7 @@ BEGIN
 			`changedModel` = 'zoneIncluded',
 			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10962,4 +10991,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-05  8:00:14
--- a/db/dump/fixtures.before.sql
+++ b/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,
--- a/db/routines/vn/events/clientsDisable.sql
+++ b/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
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/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);

--- a/db/routines/vn/procedures/collection_new.sql
+++ b/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
--- a/db/routines/vn/procedures/duaInvoiceInBooking.sql
+++ b/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;

--- a/db/routines/vn/procedures/inventoryMake.sql
+++ b/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',
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/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
--- a/db/versions/10967-wheatLilium/00-firstScript.sql
+++ b/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');
--- a/db/versions/10975-whiteIvy/00-action.sql
+++ b/db/versions/10975-whiteIvy/00-action.sql
@ -0,0 +1 @@
+CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);
--- a/db/versions/10975-whiteIvy/01-expeditionFk.sql
+++ b/db/versions/10975-whiteIvy/01-expeditionFk.sql
@ -0,0 +1 @@
+CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);
--- a/db/versions/10977-wheatFern/00-firstScript.sql
+++ b/db/versions/10977-wheatFern/00-firstScript.sql
@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.buy DROP COLUMN packageFk;
--- a/e2e/paths/14-account/02_alias_create_and_basic_data.spec.js
+++ b/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');
    });

--- a/front/core/components/link-phone/index.html
+++ b/front/core/components/link-phone/index.html
@ -5,7 +5,6 @@
            flat
            round
            icon="phone"
-            title="MicroSIP"
            ng-click="$event.stopPropagation();"
        >
        </vn-icon>
--- a/front/core/services/token.js
+++ b/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);
--- a/loopback/server/datasources.json
+++ b/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",
--- a/modules/claim/back/methods/claim/claimPickupPdf.js
+++ b/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');
--- a/modules/claim/back/methods/claim/downloadFile.js
+++ b/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) {
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/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();
--- a/modules/client/back/methods/client/campaignMetricsPdf.js
+++ b/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');
--- a/modules/entry/back/methods/entry/entryOrderPdf.js
+++ b/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');
--- a/modules/invoiceOut/back/methods/invoiceOut/download.js
+++ b/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) {
--- a/modules/invoiceOut/back/methods/invoiceOut/downloadZip.js
+++ b/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) {
--- a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
+++ b/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');
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js
+++ b/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 => {
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js
+++ b/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) => {
--- a/modules/item/back/methods/item-image-queue/download.js
+++ b/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() => {
--- a/modules/item/back/methods/item-shelving/hasItemOlder.js
+++ b/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;
+    };
+};
--- a/modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js
+++ b/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;
+        }
+    });
+});
--- a/modules/item/back/models/item-shelving.js
+++ b/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);
 };
--- a/modules/route/back/methods/route/downloadCmrsZip.js
+++ b/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) {
--- a/modules/route/back/methods/route/downloadZip.js
+++ b/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) {
--- a/modules/route/back/methods/route/driverRoutePdf.js
+++ b/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']

    });

--- a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
+++ b/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');
--- a/modules/supplier/back/model-config.json
+++ b/modules/supplier/back/model-config.json
@ -8,6 +8,9 @@
    "SupplierDms": {
        "dataSource": "vn"
    },
+    "SupplierContainer": {		
+        "dataSource": "supplierStorage"		
+    },
    "SupplierAddress": {
        "dataSource": "vn"
    },
--- a/modules/ticket/back/methods/ticket-collection/hasUncheckedTicket.js
+++ b/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;
    };
 };
--- a/modules/ticket/back/methods/ticket-collection/spec/hasUncheckedTicket.spec.js
+++ b/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();
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/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));
    }
 };
--- a/modules/ticket/back/methods/ticket/deliveryNoteCsv.js
+++ b/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 => {
--- a/modules/ticket/back/methods/ticket/deliveryNotePdf.js
+++ b/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');
--- a/modules/travel/back/methods/travel/extraCommunityPdf.js
+++ b/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');
--- a/modules/worker/back/methods/worker-dms/downloadFile.js
+++ b/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) {
--- a/print/core/email.js
+++ b/print/core/email.js
@ -88,7 +88,7 @@ class Email extends Component {
            force: options.force
        };

-        return smtp.send(mailOptions);
+        return await smtp.send(mailOptions);
    }
 }

--- a/print/templates/email/zone-included/zone-included.html
+++ b/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>
--- a/print/templates/email/zone-included/zone-included.js
+++ b/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);
+        }
    }
 };
--- a/print/templates/reports/credit-request/assets/css/style.css
+++ b/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 {
-    float: none
+td {
+    width: 10%;
 }
+
+.field {
+    width: 100%;
+    float: none;
+}
+
+th > input {
+    float: none;
+    border: 0;
+    background-color: rgb(236, 236, 236);
+    width: 100%;
+    height: 3em;
+}
+
+
--- a/print/templates/reports/credit-request/credit-request.html
+++ b/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">
-                        <span></span>
-                    </div>
+                    <input/>
+                </th>
+            </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">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                            </tr>
                            <tr>
                                <td>{{$t('fields.businessType')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                                <td>{{$t('fields.antiquity')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                            </tr>
                            <tr>
                                <td>{{$t('fields.surface')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                                <td>{{$t('fields.numberOfEmployees')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                            </tr>
                            <tr>
                                <td>{{$t('fields.owner')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                                <td>{{$t('fields.phone')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                            </tr>
                            <tr>
                                <td>{{$t('fields.payer')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                                <td>{{$t('fields.phone')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </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">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </th>
                            </tr>
                            <tr class="row-oriented">
                                <td>{{$t('fields.forecastedSalesVolume')}}:</td>
                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
-                                </th>
-                            </tr>
-                            <tr class="row-oriented">
-                                <td>{{$t('fields.forecastedPurchases')}}:</td>
-                                <th>
-                                    <div class="field wide-rectangle">
-                                        <span></span>
-                                    </div>
+                                    <input/>
                                </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">
-                                    <span></span>
-                                </div>
+                                <input/>
                            </th>
                            <td>{{$t('fields.phone')}}:</td>
                            <th>
-                                <div class="field wide-rectangle">
-                                    <span></span>
-                                </div>
+                                <input/>
                            </th>
                        </tr>
                    </tbody>
--- a/print/templates/reports/credit-request/locale/es.yml
+++ b/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
--- a/print/templates/reports/driver-route/assets/css/style.css
+++ b/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;
 }
--- a/print/templates/reports/driver-route/sql/routes.sql
+++ b/print/templates/reports/driver-route/sql/routes.sql
@ -1,5 +1,4 @@
-SELECT
-    r.id,
+SELECT r.id,
        r.m3,
        r.created,
        r.time,
@ -7,8 +6,8 @@ SELECT
        v.tradeMark vehicleTradeMark,
        v.model vehicleModel,
        v.numberPlate plateNumber,
-    IFNULL(s.name, am.name) AS agencyName
-FROM route r
+        IFNULL(s.name, am.name) agencyName
+    FROM route r
        LEFT JOIN vehicle v ON v.id = r.vehicleFk
        LEFT JOIN worker w ON w.id = r.workerFk
        LEFT JOIN account.user u ON u.id = w.id
@ -16,4 +15,4 @@ FROM route r
        LEFT JOIN agency a ON a.id = am.agencyFk
        LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
        LEFT JOIN supplier s ON s.id = sa.supplierFk
-WHERE r.id IN(?)
+    WHERE r.id IN(?)
--- a/print/templates/reports/driver-route/sql/tickets.sql
+++ b/print/templates/reports/driver-route/sql/tickets.sql
@ -1,25 +1,24 @@
-SELECT
-    t.nickname addressName,
+SELECT t.nickname addressName,
        t.packages,
        t.priority,
        t.id,
        t.clientFk,
        t.companyFk,
        t.routeFk,
-    if(a.phone, a.phone, c.phone) AS phone,
-    if(a.mobile, a.mobile, c.mobile) AS mobile,
+        if(a.phone, a.phone, c.phone) phone,
+        if(a.mobile, a.mobile, c.mobile) mobile,
        wh.name warehouseName,
        a.city,
        a.street,
        a.postalCode,
-    LPAD(a.id, 5, '0') AS addressFk,
+        LPAD(a.id, 5, '0') addressFk,
        p.name province,
-    0 AS import,
+        0 import,
        am.name ticketAgency,
        tob.description,
        u.nickName salesPersonName,
        ipkg.itemPackingTypes
-FROM route r
+    FROM route r
        JOIN ticket t ON t.routeFk = r.id
        LEFT JOIN address a ON a.id = t.addressFk
        LEFT JOIN client c ON c.id = t.clientFk
@ -39,5 +38,5 @@ FROM route r
            WHERE r.id IN (?)
            GROUP BY t.id
        ) ipkg ON ipkg.ticketFk = t.id
-WHERE r.id IN (?)
-ORDER BY t.priority, t.id;
+    WHERE r.id IN (?)
+    ORDER BY t.priority, t.id;
Author	SHA1	Message	Date
Robert Ferrús	cf5113c5a6	Merge branch 'dev' into 6738-cleanTables2008Part2to2 gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-05 10:23:55 +00:00
Alex Moreno	0af3713a07	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev gitea/salix/pipeline/head This commit looks good Details	2024-04-05 10:33:47 +02:00
Alex Moreno	03fb52bf6f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test gitea/salix/pipeline/head This commit looks good Details	2024-04-05 10:33:26 +02:00
Alex Moreno	273507d3b7	Merge pull request 'refs #7167 deploy: dump' (!2260 ) from 7167-dump into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2260 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-05 08:32:07 +00:00
Alex Moreno	2f4cd2bc7b	refs #7167 fix: acl mailAlias gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-05 10:05:51 +02:00
Alex Moreno	ed95545de6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7167-dump	2024-04-05 10:00:34 +02:00
Javier Casado	db618b819c	Merge pull request 'refs #6816 remove tittle MicroSip' (!2248 ) from 6816-removeMicroSip into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2248 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 07:56:44 +00:00
Javier Casado	6f2b3ea059	Merge pull request 'refs #6324 remove column and dependencies' (!2255 ) from 6324-removePackageFk into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2255 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 07:55:46 +00:00
Javier Casado	bf3eb51bad	Merge pull request '#7123 - creditRequestChange' (!2238 ) from 7123-creditRequestChange into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2238 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 07:29:43 +00:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev gitea/salix/pipeline/head This commit looks good Details	2024-04-05 07:51:19 +02:00
Guillermo Bonet	f067adb6b9	Merge branch 'master' into test gitea/salix/pipeline/head This commit looks good Details	2024-04-05 07:50:46 +02:00
Guillermo Bonet	7ea917dc4d	hotfix: #6875 packing DEFAULT 1 gitea/salix/pipeline/pr-test This commit looks good Details gitea/salix/pipeline/head This commit looks good Details	2024-04-05 07:49:37 +02:00
Sergio De la torre	cf10ed0f13	Merge pull request '#6964 _ itemOlder' (!2197 ) from 6964_itemOlder into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2197 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-04 14:18:19 +00:00
Sergio De la torre	2ed5237568	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-04 13:45:20 +00:00
Alex Moreno	a6e4bdd7ac	refs #7167 deploy: dump gitea/salix/pipeline/pr-master There was a failure building this commit Details	2024-04-04 15:02:41 +02:00
Robert Ferrús	efcb7a9d50	Merge pull request 'refs #169673 item_getSimilar' (!2252 ) from 169673-item_getSimilar into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2252 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-04 12:43:26 +00:00
jcasado	f9ef45f1d9	refs #6324 remove doc gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-04 14:01:30 +02:00
jcasado	f5943e4445	refs #6324 remove column and dependencies gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-04 13:57:23 +02:00
Alex Moreno	20e4ab1d2c	Merge pull request 'hotFix: handle mail error' (!2253 ) from hotFix_handleMailErrors into master gitea/salix/pipeline/pr-test This commit looks good Details gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2253 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-04 11:35:09 +00:00
Alex Moreno	dd9c7283c3	hotFix: handle mail error gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-04 13:32:39 +02:00
Robert Ferrús	9801279370	refs #169673 item_getSimilar gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-04 13:28:29 +02:00
Javier Segarra	0ef2166004	Merge pull request '5858_fix_zone-incldued_HTML' (!2245 ) from 5858_fix_zone-incldued_HTML into master gitea/salix/pipeline/pr-test This commit looks good Details gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2245 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-04 10:49:47 +00:00
Javier Segarra	ab173e8b67	Merge branch 'master' into 5858_fix_zone-incldued_HTML gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-04 09:40:47 +00:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev gitea/salix/pipeline/head This commit looks good Details	2024-04-04 11:30:03 +02:00
Guillermo Bonet	3145335824	Merge branch 'master' into test gitea/salix/pipeline/head This commit looks good Details	2024-04-04 11:29:39 +02:00
Guillermo Bonet	573b57a745	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix gitea/salix/pipeline/head This commit looks good Details gitea/salix/pipeline/pr-test This commit looks good Details	2024-04-04 11:25:10 +02:00
Guillermo Bonet	8702a6808c	hotfix: #7024 Modified duaInvoiceInBooking	2024-04-04 11:25:03 +02:00
Sergio De la torre	b0c3f8ef98	Merge pull request 'refs #3520 hotFix: hasUncheckedTickets' (!2249 ) from 3520_hotFix-hasUnCheckedTicket into master gitea/salix/pipeline/head This commit looks good Details gitea/salix/pipeline/pr-test There was a failure building this commit Details Reviewed-on: #2249 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-04 08:43:24 +00:00
Sergio De la torre	9423a2d043	refs #3520 hotFix: hasUncheckedTickets gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-04 10:38:55 +02:00
Guillermo Bonet	c685000b47	hotfix: refs #6930 Rollback tokenMultimedia gitea/salix/pipeline/head This commit looks good Details	2024-04-04 10:13:56 +02:00
Javier Segarra	d71b5a167e	Merge pull request '#5858 FIX render HTML' (!2237 ) from 5858_fix_zone-incldued_HTML into test gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2237 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-04 07:50:21 +00:00
jcasado	0f8b80d533	refs #6816 remove tittle MicroSip gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-04 09:40:43 +02:00
Pablo Natek	2cf5e94002	Merge pull request '7145-wordBreak' (!2247 ) from 7145-wordBreak into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2247 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-04 07:38:52 +00:00
Alex Moreno	b75cd3b768	Merge pull request 'fix: refs #7152 add supplier storage' (!2246 ) from 7152-hotFix_addSupplierStorage into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2246 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-04 06:58:05 +00:00
Pablo Natek	2a7807a4ab	remove: refs #7145 dev code gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-04 08:49:47 +02:00
Pablo Natek	de5e954ce2	fix: refs #7145 fix overFlow on driver-route	2024-04-04 08:48:58 +02:00
Jon Elias	3e044a8efe	fix: refs #7152 add supplier storage gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-04 08:16:37 +02:00
Javier Segarra	a99ea23d43	Merge branch 'master' into 5858_fix_zone-incldued_HTML gitea/salix/pipeline/pr-test This commit looks good Details gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-04 05:43:09 +00:00
Javier Segarra	b7c0ce0852	Merge branch 'test' into 5858_fix_zone-incldued_HTML gitea/salix/pipeline/pr-test This commit looks good Details gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-04 05:41:26 +00:00
Alex Moreno	016b314e0b	Merge pull request '7167-testToMaster_2414' (!2244 ) from 7167-testToMaster_2414 into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2244 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-04 05:32:40 +00:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test gitea/salix/pipeline/pr-master This commit looks good Details gitea/salix/pipeline/head This commit looks good Details	2024-04-03 16:24:45 +02:00
Alex Moreno	927f2e9ebf	Merge pull request 'debug(closure): add log' (!2243 ) from hotFix_closure_logErrors into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2243 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-03 13:32:16 +00:00
Alex Moreno	59ead0c2e5	debug(closure): add log gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-03 15:29:56 +02:00
Javier Casado	e753c14421	Merge pull request 'hotfix claimStateLanguage' (!2242 ) from hotfix_languageClaimNotification into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2242 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-03 11:39:37 +00:00
Javier Casado	3968d88a8d	Merge branch 'master' into hotfix_languageClaimNotification gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-03 11:37:15 +00:00
jcasado	09f023090e	hotfix claimStateLanguage gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-03 13:33:56 +02:00
Guillermo Bonet	d9ea126fd8	Merge pull request 'feat: refs #6829 Added two indexes' (!2241 ) from 6829-indexesSrtExpeditionLog into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2241 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-04-03 10:01:40 +00:00
Guillermo Bonet	064d6dbb64	feat: refs #6829 Added two indexes gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-03 11:57:28 +02:00
Ivan Mas	cd7ed5f17b	Merge pull request 'hotfix_clientsDisable' (!2240 ) from hotfix_clientsDisable into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2240 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-03 08:46:46 +00:00
Ivan Mas	b9520b53ab	hotfix_clientsDisable gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-03 10:03:59 +02:00
Javier Segarra	3449e27150	Actualizar print/templates/email/zone-included/zone-included.js gitea/salix/pipeline/pr-test There was a failure building this commit Details	2024-04-03 05:50:04 +00:00
Javier Segarra	1f8afc074d	Actualizar print/templates/email/zone-included/zone-included.html	2024-04-03 05:49:40 +00:00
jcasado	09e1e4de19	refactor: #7123 change credit document gitea/salix/pipeline/pr-dev This commit looks good Details	2024-04-03 07:23:36 +02:00
Javier Segarra	1b72572440	FIX render HTML	2024-04-02 11:58:30 +00:00
Pako Natek	3b0209977b	Merge pull request 'hotfix-collection_assign_releaseLock' (!2234 ) from hotfix-collection_assign_releaseLock into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2234 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-01 12:29:16 +00:00
Pako Natek	cb745b0f4d	release_lock gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-01 14:21:34 +02:00
Pako Natek	bfa59bdcea	release_lock	2024-04-01 14:20:25 +02:00
Pako Natek	3ac0af24d1	Merge pull request 'lines and volume' (!2233 ) from hotfix-collection_new_20240401 into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2233 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-01 10:05:12 +00:00
Pako Natek	3a1f5109d9	lines and volume gitea/salix/pipeline/pr-master This commit looks good Details	2024-04-01 11:58:16 +02:00
Robert Ferrús	5f12e498d5	Merge pull request 'fix: riesgos' (!2225 ) from hotFixCompany_getSuppliersDebt into master gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #2225 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 14:10:44 +00:00
Robert Ferrús	9a7bcdf104	fix: company_getSuppliersDebt gitea/salix/pipeline/pr-master This commit looks good Details	2024-03-28 13:26:09 +01:00
Sergio De la torre	b62905c5ef	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-test This commit looks good Details gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-28 10:08:56 +00:00
Robert Ferrús	1c18b09531	fix: company_getSuppliersDebt gitea/salix/pipeline/pr-master This commit looks good Details	2024-03-28 10:47:47 +01:00
Robert Ferrús	063745167e	fix: modificar company_getSuppliersDebt gitea/salix/pipeline/pr-master This commit looks good Details	2024-03-28 10:30:41 +01:00
Sergio De la torre	7634d82d8b	refs #6964 feat:hasItemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-28 07:15:30 +01:00
Robert Ferrús	1f819ab16a	fix: riesgos gitea/salix/pipeline/pr-master This commit looks good Details	2024-03-27 19:02:05 +01:00
Sergio De la torre	9240732c00	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-27 07:49:51 +01:00
Alex Moreno	5a19c1ebb1	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-27 06:30:00 +00:00
Sergio De la torre	ff8522cfd1	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-27 07:09:18 +01:00
Sergio De la torre	43b042a616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-27 07:08:47 +01:00
Sergio De la torre	678eb2928f	refs #6964 feat:hasItemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-26 10:30:17 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-26 10:24:27 +01:00
Sergio De la torre	e8ad5b1d17	Merge branch '6964_itemOlder' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-25 16:08:25 +01:00
Sergio De la torre	1840117b3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:11 +01:00
Sergio De la torre	e84805508a	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-25 15:07:54 +00:00
Sergio De la torre	8b684442f5	refs #6276 hotFix: setUserError and return gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-25 16:07:20 +01:00
Sergio De la torre	1b09c5b4ba	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-25 07:24:57 +00:00
Sergio De la torre	a40234ba9b	refs #6964 feat:hasItemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-25 08:20:08 +01:00
Sergio De la torre	22f78dbb91	refs #6964 feat:hasItemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-25 07:54:51 +01:00
Sergio De la torre	8e1ba54616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 07:54:07 +01:00
jcasado	f6ba5224e6	refs #7123 first edit pdf	2024-03-22 15:00:30 +01:00
Sergio De la torre	c4fcb2cd12	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-22 13:04:16 +01:00
Sergio De la torre	61b649fdc5	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev There was a failure building this commit Details	2024-03-22 11:47:12 +01:00
Sergio De la torre	c10e8d6733	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev There was a failure building this commit Details	2024-03-22 10:43:39 +00:00
Sergio De la torre	976c5b7ba8	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev There was a failure building this commit Details	2024-03-22 11:42:19 +01:00
Sergio De la torre	4dca49360e	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-22 09:10:32 +00:00
Sergio De la torre	027aa86662	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev There was a failure building this commit Details	2024-03-22 10:08:20 +01:00
Sergio De la torre	d8da317339	Merge branch 'dev' into 6964_itemOlder gitea/salix/pipeline/pr-dev Build started... Details	2024-03-21 10:10:57 +00:00
Sergio De la torre	def9aaf41a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-13 07:15:45 +01:00
Sergio De la torre	09923d2509	refs #6964 feat:advice for olderItem gitea/salix/pipeline/pr-dev There was a failure building this commit Details	2024-03-04 18:35:36 +01:00
				`@ -0,0 +1 @@`
				CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);
				`@ -0,0 +1 @@`
				`CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);`