Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity

2024-09-22 05:29:26 +00:00 · 2024-09-22 05:29:26 +00:00 · 0bf2935c23
parent 753f6d7866 ada3fbe019
commit 0bf2935c23
32 changed files with 5063 additions and 4647 deletions
--- a/back/methods/quadminds-api-config/sendOrders.js
+++ b/back/methods/quadminds-api-config/sendOrders.js
@ -0,0 +1,88 @@
+const axios = require('axios');
+const UserError = require('vn-loopback/util/user-error');
+const moment = require('moment');
+
+module.exports = Self => {
+    Self.remoteMethod('sendOrders', {
+        description: 'Sends a set of orders',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'tickets',
+            type: ['number'],
+            required: true
+        }
+        ],
+        returns: {
+            type: 'string',
+            root: true
+        },
+        http: {
+            path: `/sendOrders`,
+            verb: 'POST'
+        }
+    });
+    Self.sendOrders = async tickets => {
+        const config = await Self.app.models.QuadmindsApiConfig.findOne();
+        if (!config) throw new UserError('Config params not set');
+
+        if (tickets.length > config.maxObjects)
+            throw new UserError(`Quadminds does not support more than ${config.maxObjects} tickets`);
+
+        let poisData = [];
+        let isOk;
+        for (let offset = 0; !isOk; offset = offset + config.limit) {
+            const pois = await axios.get(`${config.url}pois/search?limit=${config.limit}&offset=${offset}`, {
+                headers: {
+                    'Accept': 'application/json',
+                    'X-Saas-Apikey': config.key
+                }
+            });
+            pois.data.data.length ? poisData.push(...pois.data.data) : isOk = true;
+        }
+
+        const poiMap = new Map(poisData.map(poi => [poi.code, poi._id]));
+
+        let orders = await Self.rawSql(`
+            SELECT a.id poiCode,
+                    t.id code,
+                    t.shipped date,
+                    'PEDIDO' operation,
+                    t.totalWithVat totalAmount,
+                    t.totalWithoutVat totalAmountWithoutTaxes,
+                    SUM(sv.volume) volume
+                FROM ticket t
+                    JOIN address a ON a.id = t.addressFk
+                    JOIN saleVolume sv ON sv.ticketFk = t.id
+                WHERE t.id IN (?)
+                GROUP BY t.id
+        `, [tickets]);
+
+        // Transformo code en string ya que lo obtenermos como integer
+        orders = orders.map(order => {
+            return {
+                ...order,
+                poiId: poiMap.get(order.poiCode.toString()) || undefined,
+                code: order.code.toString(),
+                date: moment(order.date).format('YYYY-MM-DD'),
+                totalAmount: order.totalAmount || undefined,
+                totalAmountWithoutTaxes: order.totalAmountWithoutTaxes || undefined,
+                timeWindow: [{
+                    from: config.orderTimeFrom,
+                    to: config.orderTimeTo
+                }],
+                orderMeasures: [{
+                    constraintId: 3, // Volumen
+                    value: order.volume
+                }]
+            };
+        });
+
+        await axios.post(`${config.url}orders`, orders, {
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+                'X-Saas-Apikey': config.key
+            }
+        });
+    };
+};
--- a/back/methods/quadminds-api-config/sendPois.js
+++ b/back/methods/quadminds-api-config/sendPois.js
@ -0,0 +1,87 @@
+const axios = require('axios');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('sendPois', {
+        description: 'Sends a set of pois',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'tickets',
+            type: ['number'],
+            required: true
+        }
+        ],
+        returns: {
+            type: 'string',
+            root: true
+        },
+        http: {
+            path: `/sendPois`,
+            verb: 'POST'
+        }
+    });
+    Self.sendPois = async tickets => {
+        const config = await Self.app.models.QuadmindsApiConfig.findOne();
+        if (!config) throw new UserError('Config params not set');
+
+        if (tickets.length > config.maxObjects)
+            throw new UserError(`Quadminds does not support more than ${config.maxObjects} tickets`);
+
+        let pois = await Self.rawSql(`
+            WITH deliveryNotes AS (
+                SELECT t.id, t.routeFk, tn.description
+                    FROM ticket t
+                        JOIN ticketObservation tn ON tn.ticketFk = t.id
+                        JOIN observationType ot ON ot.id = tn.observationTypeFk
+                    WHERE ot.code = 'delivery'
+            )
+            SELECT a.id code,
+                    c.socialName name,
+                    IF(ABS(a.latitude - ROUND(a.latitude)) < 0.000001, NULL, a.latitude) latitude,
+                    IF(ABS(a.longitude - ROUND(a.longitude)) < 0.000001, NULL, a.longitude) longitude,
+                    a.street,
+                    a.city locality,
+                    p.name state,
+                    co.name country,
+                    CONCAT_WS(', ', IFNULL(a.street, ''), IFNULL(a.city, ''), IFNULL(p.name, '')) longAddress,
+                    CONCAT(IFNULL(a.mobile, c.mobile)) phoneNumber,
+                    dn.description poiDeliveryComments,
+                    c.email email
+                FROM ticket t
+                    JOIN address a ON a.id = t.addressFk
+                    JOIN province p ON p.id = a.provinceFk
+                    JOIN country co ON co.id = p.countryFk
+                    JOIN client c ON c.id = t.clientFk
+                    LEFT JOIN deliveryNotes dn ON dn.id = t.id
+                WHERE t.id IN (?)
+                GROUP BY t.id
+        `, [tickets]);
+
+        // Transformo code en string ya que lo obtenermos como integer
+        pois = pois.map(poi => {
+            return {
+                ...poi,
+                code: poi.code.toString(),
+                latitude: poi.latitude || undefined,
+                longitude: poi.longitude || undefined,
+                address: {
+                    street: poi.street || undefined,
+                    locality: poi.locality || undefined,
+                    state: poi.state || undefined,
+                    country: poi.country || undefined
+                },
+                poiDeliveryComments: poi.poiDeliveryComments || undefined,
+                phoneNumber: poi.phoneNumber || undefined,
+                email: poi.email || undefined
+            };
+        });
+
+        await axios.post(`${config.url}pois`, pois, {
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+                'X-Saas-Apikey': config.key
+            }
+        });
+    };
+};
--- a/back/model-config.json
+++ b/back/model-config.json
@ -124,6 +124,9 @@
    "Province": {
        "dataSource": "vn"
    },
+    "QuadmindsApiConfig": {
+        "dataSource": "vn"
+    },
    "Autonomy": {
        "dataSource": "vn"
    },
--- a/back/models/quadminds-api-config.js
+++ b/back/models/quadminds-api-config.js
@ -0,0 +1,4 @@
+module.exports = Self => {
+    require('../methods/quadminds-api-config/sendPois')(Self);
+    require('../methods/quadminds-api-config/sendOrders')(Self);
+};
--- a/back/models/quadminds-api-config.json
+++ b/back/models/quadminds-api-config.json
@ -0,0 +1,34 @@
+{
+	"name": "QuadmindsApiConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "quadmindsApiConfig"
+		}
+	},
+	"properties": {
+		"id": {
+			"type": "number",
+			"id": true,
+			"required": true
+		},
+		"url": {
+			"type": "string"
+		},
+		"key": {
+			"type": "string"
+		},
+		"maxObjects": {
+			"type": "number"
+		},
+		"limit": {
+			"type": "number"
+		},
+		"orderTimeFrom": {
+			"type": "string"
+		},
+		"orderTimeTo": {
+			"type": "string"
+		}
+	}
+}
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@ -1,9 +1,10 @@
 USE `util`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!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','11209','3cc19549e4a9d61542b5ba906ccaf9fc90a805ce','2024-09-03 15:04:20','11212');
+INSERT INTO `version` VALUES ('vn-database','11196','91ee956fbd1557848e4ab522bc5d39b2ec10e9b2','2024-09-18 07:28:14','11245');

 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);
@ -874,9 +875,11 @@ INSERT INTO `versionLog` VALUES ('vn-database','11103','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11104','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11105','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-20 15:36:07',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11106','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:49',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11108','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:39',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11109','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-18 19:09:56',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11110','00-clientUnpaid.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11111','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11112','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:40',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11114','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:49',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11116','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11117','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',NULL,NULL);
@ -884,6 +887,8 @@ INSERT INTO `versionLog` VALUES ('vn-database','11118','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11119','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:13',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11120','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11121','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11124','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11124','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:40',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11126','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11128','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11129','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
@ -940,6 +945,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11177','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11179','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-08-20 08:34:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11180','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-08-20 08:34:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11182','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-08-09 08:19:36',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11183','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11185','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:57:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11187','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:57:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11189','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:00',NULL,NULL);
@ -953,16 +959,27 @@ INSERT INTO `versionLog` VALUES ('vn-database','11193','01-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11193','02-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11194','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11195','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11196','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-18 07:28:14',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11197','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11201','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-08-27 13:04:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11204','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11205','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-04 13:54:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11206','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11207','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11209','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11211','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11213','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-06 06:31:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11215','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11217','00-hederaMessages.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-09 12:21:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11229','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-16 08:24:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11239','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 12:57:06',NULL,NULL);

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 USE `account`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@ -1089,7 +1106,6 @@ INSERT INTO `roleInherit` VALUES (37,34,1,NULL);
 INSERT INTO `roleInherit` VALUES (38,34,13,NULL);
 INSERT INTO `roleInherit` VALUES (39,34,33,NULL);
 INSERT INTO `roleInherit` VALUES (40,35,1,NULL);
-INSERT INTO `roleInherit` VALUES (42,36,47,NULL);
 INSERT INTO `roleInherit` VALUES (43,37,1,NULL);
 INSERT INTO `roleInherit` VALUES (44,38,37,NULL);
 INSERT INTO `roleInherit` VALUES (45,38,64,NULL);
@ -1328,6 +1344,7 @@ INSERT INTO `roleInherit` VALUES (372,126,13,19295);
 INSERT INTO `roleInherit` VALUES (373,131,2,19295);
 INSERT INTO `roleInherit` VALUES (375,120,131,1437);
 INSERT INTO `roleInherit` VALUES (376,124,21,19336);
+INSERT INTO `roleInherit` VALUES (377,47,49,19295);

 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);

@ -1340,6 +1357,7 @@ INSERT INTO `mailConfig` VALUES (1,'verdnatura.es');
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 USE `salix`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@ -1559,8 +1577,8 @@ INSERT INTO `ACL` VALUES (279,'MailAlias','*','READ','ALLOW','ROLE','marketing',
 INSERT INTO `ACL` VALUES (283,'EntryObservation','*','*','ALLOW','ROLE','buyer',NULL);
 INSERT INTO `ACL` VALUES (284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin',NULL);
 INSERT INTO `ACL` VALUES (285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin',NULL);
-INSERT INTO `ACL` VALUES (286,'ACL','*','*','ALLOW','ROLE','developer',NULL);
-INSERT INTO `ACL` VALUES (287,'AccessToken','*','*','ALLOW','ROLE','developer',NULL);
+INSERT INTO `ACL` VALUES (286,'ACL','*','READ','ALLOW','ROLE','developer',10578);
+INSERT INTO `ACL` VALUES (287,'AccessToken','*','*','ALLOW','ROLE','developerBoss',10578);
 INSERT INTO `ACL` VALUES (293,'RoleInherit','*','*','ALLOW','ROLE','it',NULL);
 INSERT INTO `ACL` VALUES (294,'RoleRole','*','*','ALLOW','ROLE','it',NULL);
 INSERT INTO `ACL` VALUES (295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin',NULL);
@ -1569,7 +1587,7 @@ INSERT INTO `ACL` VALUES (297,'Sale','clone','WRITE','ALLOW','ROLE','invoicing',
 INSERT INTO `ACL` VALUES (298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (302,'AgencyTerm','*','*','ALLOW','ROLE','administrative',NULL);
-INSERT INTO `ACL` VALUES (303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager',NULL);
+INSERT INTO `ACL` VALUES (303,'ClaimLog','*','READ','ALLOW','ROLE','employee',19294);
 INSERT INTO `ACL` VALUES (304,'Edi','updateData','WRITE','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (305,'EducationLevel','*','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee',NULL);
@ -1863,7 +1881,6 @@ INSERT INTO `ACL` VALUES (611,'State','find','READ','ALLOW','ROLE','employee',NU
 INSERT INTO `ACL` VALUES (612,'State','findById','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (613,'State','findOne','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (614,'Worker','find','READ','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (615,'Worker','findById','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (616,'Worker','findOne','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (617,'Worker','filter','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee',NULL);
@ -1887,7 +1904,7 @@ INSERT INTO `ACL` VALUES (654,'Ticket','editZone','WRITE','ALLOW','ROLE','logist
 INSERT INTO `ACL` VALUES (655,'Entry','addFromPackaging','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (656,'Entry','addFromBuy','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (657,'Supplier','getItemsPackaging','READ','ALLOW','ROLE','production',NULL);
-INSERT INTO `ACL` VALUES (658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system',NULL);
+INSERT INTO `ACL` VALUES (658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system',19295);
 INSERT INTO `ACL` VALUES (659,'Account','*','*','ALLOW','ROLE','developerBoss',NULL);
 INSERT INTO `ACL` VALUES (664,'MailForward','*','*','ALLOW','ROLE','itManagement',NULL);
 INSERT INTO `ACL` VALUES (667,'VnUser','*','*','ALLOW','ROLE','itManagement',NULL);
@ -1959,7 +1976,7 @@ INSERT INTO `ACL` VALUES (746,'Claim','getSummary','READ','ALLOW','ROLE','claimV
 INSERT INTO `ACL` VALUES (747,'CplusRectificationType','*','READ','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (748,'SiiTypeInvoiceOut','*','READ','ALLOW','ROLE','salesPerson',NULL);
 INSERT INTO `ACL` VALUES (749,'InvoiceCorrectionType','*','READ','ALLOW','ROLE','salesPerson',NULL);
-INSERT INTO `ACL` VALUES (750,'InvoiceOut','transfer','WRITE','ALLOW','ROLE','administrative',NULL);
+INSERT INTO `ACL` VALUES (750,'InvoiceOut','transferInvoice','WRITE','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (751,'Application','executeProc','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (752,'Application','executeFunc','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (753,'NotificationSubscription','getList','READ','ALLOW','ROLE','employee',NULL);
@ -2107,6 +2124,19 @@ INSERT INTO `ACL` VALUES (905,'AddressWaste','*','READ','ALLOW','ROLE','producti
 INSERT INTO `ACL` VALUES (906,'Entry','print','READ','ALLOW','ROLE','supplier',NULL);
 INSERT INTO `ACL` VALUES (907,'Expedition_PrintOut','*','*','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (908,'Docuware','upload','WRITE','ALLOW','ROLE','hrBuyer',13657);
+INSERT INTO `ACL` VALUES (909,'Entry','getBuysCsv','READ','ALLOW','ROLE','supplier',19295);
+INSERT INTO `ACL` VALUES (910,'MedicalReview','*','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (911,'MedicalCenter','*','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (912,'Worker','__get__medicalReview','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (913,'VnToken','*','READ','ALLOW','ROLE','developer',10578);
+INSERT INTO `ACL` VALUES (914,'VnToken','killSession','*','ALLOW','ROLE','developer',10578);
+INSERT INTO `ACL` VALUES (915,'ACL','*','WRITE','ALLOW','ROLE','developerBoss',10578);
+INSERT INTO `ACL` VALUES (916,'Entry','getBuysCsv','READ','ALLOW','ROLE','supplier',10578);
+INSERT INTO `ACL` VALUES (917,'InvoiceOut','refundAndInvoice','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (918,'Worker','__get__descriptor','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (919,'Worker','findById','READ','ALLOW','ROLE','$subordinate',10578);
+INSERT INTO `ACL` VALUES (920,'QuadmindsApiConfig','*','*','ALLOW','ROLE','delivery',19295);
+INSERT INTO `ACL` VALUES (921,'Worker','findById','READ','ALLOW','ROLE','employee',NULL);

 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@ -2202,6 +2232,7 @@ INSERT INTO `defaultViewMultiConfig` VALUES ('routesList','{\"ID\":true,\"worker
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 USE `vn`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@ -2426,7 +2457,7 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');

-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,112,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,114,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
@ -2437,28 +2468,28 @@ INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,37,NULL,72,1,1,1,11,1
 INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_PREPARATION');
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
 INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',38,39,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',40,71,NULL,0,0,0,1,15,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',78,79,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',40,73,NULL,0,0,0,1,16,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',80,81,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',21,22,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',23,24,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',86,89,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',88,91,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,1,1,0,0,NULL,NULL,NULL,'CLAIM');
-INSERT INTO `department` VALUES (61,NULL,'VNH',92,95,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (61,NULL,'VNH',94,97,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',25,26,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',98,99,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',100,101,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',45,46,4250,0,0,0,2,0,43,'/1/43/','es5_equipo',1,'es5@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (89,NULL,'COORDINACION',102,103,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (90,NULL,'TRAILER',93,94,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',104,105,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',95,96,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',47,48,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',49,50,3797,0,0,0,2,0,43,'/1/43/','es2_equipo',1,'es2@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
@ -2466,22 +2497,23 @@ INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',51,52,24065,
 INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',53,54,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',55,56,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',57,58,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',106,107,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',59,60,1118,0,0,0,2,0,43,'/1/43/','es3_equipo',1,'es3@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
 INSERT INTO `department` VALUES (130,NULL,'REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',87,88,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',89,90,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',61,62,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',63,64,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
 INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',65,66,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
-INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',106,107,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (137,'sorter','SORTER',110,111,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',110,111,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (137,'sorter','SORTER',112,113,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',67,68,3803,0,0,0,2,0,43,'/1/43/','es4_equipo',1,'es4@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
 INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',69,70,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',71,72,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',0,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);

 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
@ -2575,7 +2607,7 @@ INSERT INTO `siiTypeInvoiceOut` VALUES (9,'R5','Factura rectificativa en factura

 INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL,1,0,0,0,0,0,0,4,1,'alert');
 INSERT INTO `state` VALUES (2,'Libre',2,0,'FREE',NULL,2,0,0,0,0,0,0,4,1,'notice');
-INSERT INTO `state` VALUES (3,'OK',3,0,'OK',3,28,1,0,0,0,1,1,3,0,'success');
+INSERT INTO `state` VALUES (3,'OK',3,0,'OK',3,28,1,0,1,0,1,1,3,0,'success');
 INSERT INTO `state` VALUES (4,'Impreso',4,0,'PRINTED',2,29,1,0,1,0,0,1,2,0,'success');
 INSERT INTO `state` VALUES (5,'Preparación',6,2,'ON_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning');
 INSERT INTO `state` VALUES (6,'En Revisión',7,2,'ON_CHECKING',NULL,6,0,1,0,3,0,0,1,0,'warning');
@ -2643,6 +2675,7 @@ INSERT INTO `workerTimeControlError` VALUES (9,'UNDEFINED_ERROR','Error sin defi
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 USE `cache`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@ -2667,6 +2700,7 @@ INSERT INTO `cache` VALUES (14,'lastBuy','23:59:00');
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 USE `hedera`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@ -2701,7 +2735,7 @@ INSERT INTO `language` VALUES ('mn','Португалий','Mongolian',1);
 INSERT INTO `language` VALUES ('pt','Português','Portuguese',1);

 INSERT INTO `link` VALUES (16,'Printing server','Manage the CUPS printing server','http://printnatura.verdnatura.es','printer');
-INSERT INTO `link` VALUES (20,'Webmail','Verdnatura webmail','https://webmail.verdnatura.es/','mail');
+INSERT INTO `link` VALUES (20,'Webmail','Verdnatura webmail','https://mail.verdnatura.es/','mail');
 INSERT INTO `link` VALUES (23,'Verdnatura Beta','Trial version of the web page','https://test-shop.verdnatura.es/','vn');
 INSERT INTO `link` VALUES (25,'Shared folder','Shared folder','https://cdn.verdnatura.es/share','backup');
 INSERT INTO `link` VALUES (29,'phpMyAdmin','Manage MySQL database','https://pma.verdnatura.es/','pma');
@ -2710,16 +2744,16 @@ INSERT INTO `link` VALUES (33,'Gitea','Version control system','https://gitea.ve
 INSERT INTO `link` VALUES (34,'Wiknatura','Verdnatura wiki page','https://wiki.verdnatura.es/','wiki');
 INSERT INTO `link` VALUES (35,'phpLDAPadmin','Manage the LDAP database','https://pla.verdnatura.es/','pla');
 INSERT INTO `link` VALUES (36,'Applications','Access applications repository','https://cdn.verdnatura.es/vn-access','access');
-INSERT INTO `link` VALUES (37,'Jenkins','CI and CD system','https://jenkins.verdnatura.es','jenkins');
-INSERT INTO `link` VALUES (38,'osTicket','User service center','https://cau.verdnatura.es','osticket');
-INSERT INTO `link` VALUES (39,'Redmine','Flexible project management','https://redmine.verdnatura.es','redmine');
-INSERT INTO `link` VALUES (40,'Grafana','Analytics & monitoring solution','https://grafana.verdnatura.es','grafana');
-INSERT INTO `link` VALUES (41,'Rocket.Chat','Communications platform','https://chat.verdnatura.es','rocketchat');
-INSERT INTO `link` VALUES (42,'Salix','ERP software','https://salix.verdnatura.es','salix');
-INSERT INTO `link` VALUES (43,'Docker','Container management','https://docker.verdnatura.es','docker');
-INSERT INTO `link` VALUES (44,'Proxmox','Virtual environment','https://mox.verdnatura.es','proxmox');
-INSERT INTO `link` VALUES (45,'Shinobi','Network video recorder','https://shinobi.verdnatura.es','shinobi');
-INSERT INTO `link` VALUES (46,'DokuWiki','Internal documentation','https://doku.verdnatura.es','dokuwiki');
+INSERT INTO `link` VALUES (37,'Jenkins','CI and CD system','https://jenkins.verdnatura.es/','jenkins');
+INSERT INTO `link` VALUES (38,'osTicket','User service center','https://cau.verdnatura.es/','osticket');
+INSERT INTO `link` VALUES (39,'Redmine','Flexible project management','https://redmine.verdnatura.es/','redmine');
+INSERT INTO `link` VALUES (40,'Grafana','Analytics & monitoring solution','https://grafana.verdnatura.es/','grafana');
+INSERT INTO `link` VALUES (41,'Rocket.Chat','Communications platform','https://chat.verdnatura.es/','rocketchat');
+INSERT INTO `link` VALUES (42,'Salix','ERP software','https://salix.verdnatura.es/','salix');
+INSERT INTO `link` VALUES (43,'Kubernetes','Container management','https://kube.verdnatura.es/','docker');
+INSERT INTO `link` VALUES (44,'Proxmox','Virtual environment','https://pve.verdnatura.es/','proxmox');
+INSERT INTO `link` VALUES (45,'Shinobi','Network video recorder','https://shinobi.verdnatura.es/','shinobi');
+INSERT INTO `link` VALUES (46,'xWiki','Internal documentation','https://xwiki.verdnatura.es/','dokuwiki');

 INSERT INTO `location` VALUES (2,'39.2095886','-0.4173501','Valencia','Calle Fenollar, 2','46680','Algemesi','Valencia','963 242 100','es');
 INSERT INTO `location` VALUES (3,'40.4564969','-3.4875829','Madrid','Avenida de la Constitución, 3 - Nave E','28850','Torrejón de Ardoz','Madrid','963 242 100',NULL);
@ -2769,6 +2803,8 @@ INSERT INTO `message` VALUES (18,'orderNotOwnedByUser','The order belongs to ano
 INSERT INTO `message` VALUES (19,'orderConfirmed','The order has already been confirmed and cannot be modified');
 INSERT INTO `message` VALUES (20,'clientNotVerified','Incomplete tax data, please contact your sales representative');
 INSERT INTO `message` VALUES (21,'quantityLessThanMin','The quantity cannot be less than the minimum');
+INSERT INTO `message` VALUES (22,'ORDER_ROW_UNAVAILABLE','The ordered quantity exceeds the available');
+INSERT INTO `message` VALUES (23,'AMOUNT_NOT_MATCH_GROUPING','The quantity ordered does not match the grouping');

 INSERT INTO `metatag` VALUES (2,'title','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración');
 INSERT INTO `metatag` VALUES (3,'description','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración. Envío a toda España, pedidos por internet o por teléfono.');
@ -2935,6 +2971,7 @@ INSERT INTO `tpvResponse` VALUES (9999,'Operación que ha sido redirigida al emi
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 USE `sage`;
+/*M!999999\- enable the sandbox mode */ 
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--- a/db/dump/.dump/privileges.sql
+++ b/db/dump/.dump/privileges.sql
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
--- a/db/dump/.dump/triggers.sql
+++ b/db/dump/.dump/triggers.sql
--- a/db/dump/dump.after.sql
+++ b/db/dump/dump.after.sql
@ -1,12 +1 @@
-CREATE USER 'vn'@'localhost';
-
-GRANT SELECT,
-        INSERT,
-        UPDATE,
-        DELETE,
-        DROP,
-        CREATE TEMPORARY TABLES,
-        EXECUTE,
-        EVENT,
-        TRIGGER
-    ON *.* TO 'vn'@'localhost';
+-- Executed after dump
--- a/db/dump/dump.before.sql
+++ b/db/dump/dump.before.sql
@ -1 +1,14 @@
 -- Executed before dump
+
+CREATE USER 'vn'@'localhost';
+
+GRANT SELECT,
+        INSERT,
+        UPDATE,
+        DELETE,
+        DROP,
+        CREATE TEMPORARY TABLES,
+        EXECUTE,
+        EVENT,
+        TRIGGER
+    ON *.* TO 'vn'@'localhost';
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -3186,7 +3186,7 @@ UPDATE vn.department
    SET workerFk = null;

 INSERT INTO vn.packaging
-    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0);
+    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0);


 INSERT IGNORE INTO vn.intrastat
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@ -1,8 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_new`(
-	vUserFk INT,
-	OUT vCollectionFk INT
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_new`(vUserFk INT, OUT vCollectionFk INT)
 BEGIN
 /**
 * Genera colecciones de tickets sin asignar trabajador.
@ -15,29 +12,30 @@ BEGIN
 	DECLARE vLinesLimit INT;
 	DECLARE vTicketLines INT;
 	DECLARE vVolumeLimit DECIMAL;
-	DECLARE vSizeLimit INT;
 	DECLARE vTicketVolume DECIMAL;
+	DECLARE vSizeLimit INT;
 	DECLARE vMaxTickets INT;
-	DECLARE vStateCode VARCHAR(45);
+	DECLARE vStateFk VARCHAR(45);
 	DECLARE vFirstTicketFk INT;
+	DECLARE vHour INT;
+	DECLARE vMinute INT;
 	DECLARE vWorkerCode VARCHAR(3);
-	DECLARE vWagonCounter INT DEFAULT 1;
+	DECLARE vWagonCounter INT DEFAULT 0;
 	DECLARE vTicketFk INT;
 	DECLARE vItemPackingTypeFk VARCHAR(1);
-	DECLARE vHasAssignedTickets BOOL;
+	DECLARE vHasAssignedTickets BOOLEAN;
 	DECLARE vHasUniqueCollectionTime BOOL;
-	DECLARE vHeight INT;
-	DECLARE vVolume INT;
-	DECLARE vLiters INT;
-	DECLARE vLines INT;
-	DECLARE vTotalLines INT DEFAULT 0;
-	DECLARE vTotalVolume INT DEFAULT 0;
-	DECLARE vFreeWagonFk INT;
 	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vLockName VARCHAR(215);
+	DECLARE vLockTime INT DEFAULT 30;
+	DECLARE vFreeWagonFk INT;
+	DECLARE vErrorNumber INT;
+	DECLARE vErrorMsg TEXT;

-	DECLARE vTickets CURSOR FOR
+	DECLARE c1 CURSOR FOR
 		SELECT ticketFk, `lines`, m3
 			FROM tmp.productionBuffer
+			WHERE ticketFk <> vFirstTicketFk
 			ORDER BY HH,
 				mm,
 				productionOrder DESC,
@ -50,6 +48,26 @@ BEGIN

 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		GET DIAGNOSTICS CONDITION 1
+			vErrorNumber = MYSQL_ERRNO,
+			vErrorMsg = MESSAGE_TEXT;
+
+		CALL util.debugAdd('collection_new', JSON_OBJECT(
+				'errorNumber', vErrorNumber,
+				'errorMsg', vErrorMsg,
+				'lockName', vLockName,
+				'userFk', vUserFk,
+				'ticketFk', vTicketFk
+			)); -- Tmp
+
+		IF vLockName IS NOT NULL THEN
+			DO RELEASE_LOCK(vLockName);
+		END IF;
+		RESIGNAL;
+	END;
+
 	SELECT pc.ticketTrolleyMax * o.numberOfWagons,
 			pc.hasUniqueCollectionTime,
 			w.code,
@ -60,26 +78,36 @@ BEGIN
 			o.trainFk,
 			o.linesLimit,
 			o.volumeLimit,
-			o.sizeLimit
+			o.sizeLimit,
+			pc.collection_new_lockname
 		INTO vMaxTickets,
-			vHasUniqueCollectionTime,
-			vWorkerCode,
-			vWarehouseFk,
-			vItemPackingTypeFk,
-			vStateCode,
-			vWagons,
-			vTrainFk,
-			vLinesLimit,
-			vVolumeLimit,
-			vSizeLimit
-		FROM worker w
-			JOIN operator o ON o.workerFk = w.id 
+				vHasUniqueCollectionTime,
+				vWorkerCode,
+				vWarehouseFk,
+				vItemPackingTypeFk,
+				vStateFk,
+				vWagons,
+				vTrainFk,
+				vLinesLimit,
+				vVolumeLimit,
+				vSizeLimit,
+				vLockName
+		FROM productionConfig pc
+			JOIN worker w ON w.id = vUserFk
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
-			JOIN productionConfig pc
-		WHERE w.id = vUserFk;
+			JOIN operator o ON o.workerFk = vUserFk;
+
+	SET vLockName = CONCAT_WS('/',
+		vLockName,
+		vWarehouseFk,
+		vItemPackingTypeFk
+	);
+
+	IF NOT GET_LOCK(vLockName, vLockTime) THEN
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
+	END IF;

 	-- Se prepara el tren, con tantos vagones como sea necesario.
-
 	CREATE OR REPLACE TEMPORARY TABLE tTrain
 		(wagon INT,
 		shelve INT,
@ -90,58 +118,59 @@ BEGIN
 		PRIMARY KEY(wagon, shelve))
 		ENGINE = MEMORY;

-	INSERT INTO tTrain (wagon, shelve, liters, `lines`, height)
-		WITH RECURSIVE wagonSequence AS (
-		SELECT vWagonCounter wagon
-		UNION ALL
-		SELECT wagon + 1 wagon
-			FROM wagonSequence
-			WHERE wagon < vWagonCounter + vWagons -1
-		) 
-		SELECT ws.wagon, cv.`level`, cv.liters, cv.`lines`, cv.height
-			FROM wagonSequence ws
-				JOIN vn.collectionVolumetry cv ON cv.trainFk = vTrainFk
+	WHILE vWagons > vWagonCounter DO
+		SET vWagonCounter = vWagonCounter + 1;
+
+		INSERT INTO tTrain(wagon, shelve, liters, `lines`, height)
+			SELECT vWagonCounter, cv.`level` , cv.liters , cv.`lines` , cv.height
+				FROM collectionVolumetry cv
+				WHERE cv.trainFk = vTrainFk
 					AND cv.itemPackingTypeFk = vItemPackingTypeFk;
+	END WHILE;

 	-- Esto desaparecerá cuando tengamos la table cache.ticket
-
 	CALL productionControl(vWarehouseFk, 0);

 	ALTER TABLE tmp.productionBuffer
 		ADD COLUMN liters INT,
 		ADD COLUMN height INT;

+	-- Se obtiene nº de colección.
+	INSERT INTO collection
+		SET itemPackingTypeFk = vItemPackingTypeFk,
+			trainFk = vTrainFk,
+			wagons = vWagons,
+			warehouseFk = vWarehouseFk;
+
+	SELECT LAST_INSERT_ID() INTO vCollectionFk;
+
 	-- Los tickets de recogida en Algemesí sólo se sacan si están asignados.
 	-- Los pedidos con riesgo no se sacan aunque se asignen.
-
-	DELETE pb
+	DELETE pb.*
 		FROM tmp.productionBuffer pb
 			JOIN state s ON s.id = pb.state
 		WHERE (pb.agency = 'REC_ALGEMESI'
 			AND s.code <> 'PICKER_DESIGNED')
 			OR pb.problem LIKE '%RIESGO%';

-	-- Si hay tickets asignados, nos centramos exclusivamente en esos tickets 
-	-- y los sacamos independientemente de problemas o tamaños
-
-	SELECT EXISTS (
-		SELECT TRUE 
-			FROM tmp.productionBuffer pb
-				JOIN state s ON s.id = pb.state
-			WHERE s.code = 'PICKER_DESIGNED'
-				AND pb.workerCode = vWorkerCode
-		) INTO vHasAssignedTickets;
+	-- Comprobamos si hay tickets asignados. En ese caso, nos centramos
+	-- exclusivamente en esos tickets y los sacamos independientemente
+	-- de problemas o tamaños
+	SELECT COUNT(*) INTO vHasAssignedTickets
+		FROM tmp.productionBuffer pb
+			JOIN state s ON s.id = pb.state
+		WHERE s.code = 'PICKER_DESIGNED'
+			AND pb.workerCode = vWorkerCode;

 	-- Se dejan en la tabla tmp.productionBuffer sólo aquellos tickets adecuados
-
 	IF vHasAssignedTickets THEN
-		DELETE pb
+		DELETE pb.*
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
 			WHERE s.code <> 'PICKER_DESIGNED'
 				OR pb.workerCode <> vWorkerCode;
 	ELSE
-		DELETE pb
+		DELETE pb.*
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
 				JOIN agencyMode am ON am.id = pb.agencyModeFk
@ -164,66 +193,73 @@ BEGIN
 				OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H')
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
-				OR LENGTH(pb.problem)
+				OR LENGTH(pb.problem) > 0
 				OR pb.lines > vLinesLimit
 				OR pb.m3 > vVolumeLimit
 				OR sub.maxSize > vSizeLimit
 				OR pb.hasPlantTray;
 	END IF;

+	-- Es importante que el primer ticket se coja en todos los casos
+	SELECT ticketFk,
+			HH,
+			mm,
+			`lines`,
+			m3
+		INTO vFirstTicketFk,
+			vHour,
+			vMinute,
+			vTicketLines,
+			vTicketVolume
+		FROM tmp.productionBuffer
+		ORDER BY HH,
+			mm,
+			productionOrder DESC,
+			m3 DESC,
+			agency,
+			zona,
+			routeFk,
+			ticketFk
+		LIMIT 1;
+
 	-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede
 	IF vHasUniqueCollectionTime THEN
-		
-		SELECT ticketFk INTO vFirstTicketFk
-			FROM tmp.productionBuffer
-			ORDER BY HH, 
-				mm,
-				productionOrder DESC,
-				m3 DESC,
-				agency,
-				zona,
-				routeFk,
-				ticketFk
-			LIMIT 1;
-		
-		DELETE pb 
-			FROM tmp.productionBuffer pb
-				JOIN tmp.productionBuffer pb2 ON pb2.ticketFk = vFirstTicketFk
-					AND (pb.HH <> pb2.HH OR pb.mm <> pb2.mm);
-			
+		DELETE FROM tmp.productionBuffer
+			WHERE HH <> vHour
+				OR mm <> vMinute;
 	END IF;

-	OPEN vTickets;
-	l: LOOP
-		SET vDone = FALSE;
-		FETCH vTickets INTO vTicketFk, vTicketLines, vTicketVolume;
+	SET vTicketFk = vFirstTicketFk;
+	SET @lines = 0;
+	SET @volume = 0;

-		IF vDone THEN
-			LEAVE l;
-		END IF;
+	OPEN c1;
+	read_loop: LOOP
+		SET vDone = FALSE;

 		-- Buscamos un ticket que cumpla con los requisitos en el listado
-
-		IF (vLinesLimit IS NULL OR (vTotalLines + vTicketLines) <= vLinesLimit)
-			AND (vVolumeLimit IS NULL OR (vTotalVolume + vTicketVolume) <= vVolumeLimit) THEN
+		IF ((vTicketLines + @lines) <= vLinesLimit OR vLinesLimit IS NULL)
+			AND ((vTicketVolume + @volume) <= vVolumeLimit OR vVolumeLimit IS NULL) THEN

 			CALL ticket_splitItemPackingType(vTicketFk, vItemPackingTypeFk);
 			DROP TEMPORARY TABLE tmp.ticketIPT;

-			SELECT COUNT(*), SUM(litros), MAX(i.`size`), SUM(sv.volume)
-					INTO vLines, vLiters, vHeight, vVolume
-				FROM saleVolume sv
-					JOIN sale s ON s.id = sv.saleFk
-					JOIN item i ON i.id = s.itemFk
-				WHERE sv.ticketFk = vTicketFk;
-
-			SET vTotalVolume = vTotalVolume + vVolume,
-				vTotalLines = vTotalLines + vLines;
-
 			UPDATE tmp.productionBuffer pb
-				SET pb.liters = vLiters,
-					pb.`lines` = vLines,
-					pb.height = vHeight
+					JOIN (
+						SELECT SUM(litros) liters,
+								@lines:= COUNT(*) + @lines,
+								COUNT(*) `lines`,
+								MAX(i.`size`) height,
+								@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
+							WHERE sv.ticketFk = vTicketFk
+					) sub
+				SET pb.liters = sub.liters,
+					pb.`lines` = sub.`lines`,
+					pb.height = sub.height
 				WHERE pb.ticketFk = vTicketFk;

 			UPDATE tTrain tt
@ -240,13 +276,17 @@ BEGIN
 					tt.height
 				LIMIT 1;

-			-- Si no le encuentra una balda, intentamos darle un carro entero libre
-
+			-- Si no le encuentra una balda adecuada, intentamos darle un carro entero si queda alguno libre
 			IF NOT (SELECT COUNT(*) FROM tTrain WHERE ticketFk) THEN
-				SELECT wagon INTO vFreeWagonFk
-					FROM tTrain
-					GROUP BY wagon
-					HAVING SUM(IFNULL(ticketFk, 0)) = 0
+				SELECT tt.wagon
+					INTO vFreeWagonFk
+					FROM tTrain tt
+						LEFT JOIN (
+							SELECT DISTINCT wagon
+								FROM tTrain
+								WHERE ticketFk IS NOT NULL
+						) nn ON nn.wagon = tt.wagon
+					WHERE nn.wagon IS NULL
 					ORDER BY wagon
 					LIMIT 1;

@ -255,35 +295,38 @@ BEGIN
 						SET ticketFk = vFirstTicketFk
 						WHERE wagon = vFreeWagonFk;

-					-- Se anulan el resto de carros libres, 
-					-- máximo un carro con pedido excesivo
-
-					DELETE tt
+					-- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo
+					DELETE tt.*
 						FROM tTrain tt
-							JOIN (SELECT wagon
-								FROM tTrain
-								GROUP BY wagon
-								HAVING SUM(IFNULL(ticketFk, 0)) = 0
-							) sub ON sub.wagon = tt.wagon;
+							LEFT JOIN (
+								SELECT DISTINCT wagon
+									FROM tTrain
+									WHERE ticketFk IS NOT NULL
+							) nn ON nn.wagon = tt.wagon
+						WHERE nn.wagon IS NULL;
 				END IF;
-			END IF;	
+			END IF;
+
+			FETCH c1 INTO vTicketFk, vTicketLines, vTicketVolume;
+			IF vDone OR NOT (SELECT COUNT(*) FROM tTrain WHERE ticketFk IS NULL) THEN
+				LEAVE read_loop;
+			END IF;
+		ELSE
+			FETCH c1 INTO vTicketFk, vTicketLines, vTicketVolume;
+			IF vDone THEN
+				LEAVE read_loop;
+			END IF;
 		END IF;
 	END LOOP;
-	CLOSE vTickets;
+	CLOSE c1;

 	IF (SELECT COUNT(*) FROM tTrain WHERE ticketFk) THEN
-		-- Se obtiene nº de colección
-
-		INSERT INTO collection
-			SET itemPackingTypeFk = vItemPackingTypeFk,
-				trainFk = vTrainFk,
-				wagons = vWagons,
-				warehouseFk = vWarehouseFk;
-
-		SELECT LAST_INSERT_ID() INTO vCollectionFk;
+		UPDATE collection c
+				JOIN state st ON st.code = 'ON_PREPARATION'
+			SET c.stateFk = st.id
+			WHERE c.id = vCollectionFk;

 		-- Asigna las bandejas
-
 		INSERT IGNORE INTO ticketCollection(ticketFk, collectionFk, `level`, wagon, liters)
 			SELECT tt.ticketFk, vCollectionFk, tt.shelve, tt.wagon, tt.liters
 				FROM tTrain tt
@ -291,34 +334,37 @@ BEGIN
 				ORDER BY tt.wagon, tt.shelve;

 		-- Actualiza el estado de los tickets
-
-		CALL collection_setState(vCollectionFk, vStateCode);
+		CALL collection_setState(vCollectionFk, vStateFk);

 		-- Aviso para la preparacion previa
-		
 		INSERT INTO ticketDown(ticketFk, collectionFk)
 			SELECT tc.ticketFk, tc.collectionFk
 				FROM ticketCollection tc
 				WHERE tc.collectionFk = vCollectionFk;

-		CALL collection_mergeSales(vCollectionFk);
+		CALL sales_mergeByCollection(vCollectionFk);

 		UPDATE `collection` c
-				JOIN(
+				JOIN (
 					SELECT COUNT(*) saleTotalCount,
 							SUM(s.isPicked <> 0) salePickedCount
 						FROM ticketCollection tc
 							JOIN sale s ON s.ticketFk = tc.ticketFk
-						WHERE tc.collectionFk = vCollectionFk
-							AND s.quantity > 0
-				)sub
+							WHERE tc.collectionFk = vCollectionFk
+								AND s.quantity > 0
+				) sub
 			SET c.saleTotalCount = sub.saleTotalCount,
 				c.salePickedCount = sub.salePickedCount
 			WHERE c.id = vCollectionFk;
+
 	ELSE
-		SET vCollectionFk = NULL;
+		DELETE FROM `collection`
+			WHERE id = vCollectionFk;
+			SET vCollectionFk = NULL;
 	END IF;

+	DO RELEASE_LOCK(vLockName);
+
 	DROP TEMPORARY TABLE
 		tTrain,
 		tmp.productionBuffer;
--- a/db/routines/vn/procedures/itemFuentesBalance.sql
+++ b/db/routines/vn/procedures/itemFuentesBalance.sql
@ -1,79 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemFuentesBalance`(vDaysInFuture INT)
-BEGIN
-
-	/*	Se utiliza para calcular la necesidad de mover mercancia entre el almacén de fuentes y el nuestro
-	 * 
-	 *  @param vDaysInFuture Rango de dias para calcular entradas y salidas
-	 * 
-	 */
-	
-	DECLARE vWarehouseFk INT;
-
-	SELECT s.warehouseFk INTO vWarehouseFk
-		FROM vn.sector s 
-		WHERE s.code = 'FUENTES_PICASSE';
-	
-	CALL cache.stock_refresh(FALSE);
-
-	SELECT 	i.id itemFk, 
-			i.longName,
-            i.size,
-            i.subName,
-			v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible, 
-			fue.Fuentes, 
-			alb.Albenfruit,
-			sale.venta, 
-			IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra, 
-			IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) 
-				- IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as saldo
-		FROM vn.item i 
-			JOIN vn.itemType it ON it.id = i.typeFk 
-			JOIN vn.itemCategory ic ON ic.id = it.categoryFk 
-		LEFT JOIN (
-				SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Fuentes
-					FROM vn.itemShelving ish
-						JOIN vn.shelving sh ON sh.code = ish.shelvingFk
-                        JOIN vn.parking p ON p.id = sh.parkingFk
-                        JOIN vn.sector s ON s.id = p.sectorFk
-					WHERE s.code = 'FUENTES_PICASSE'
-					GROUP BY ish.itemFk	
-			 ) fue ON fue.itemFk = i.id
-		LEFT JOIN (
-				SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Albenfruit
-					FROM vn.itemShelving ish
-						JOIN vn.shelving sh ON sh.code = ish.shelvingFk
-                        JOIN vn.parking p ON p.id = sh.parkingFk
-                        JOIN vn.sector s ON s.id = p.sectorFk
-					WHERE s.code = 'ALBENFRUIT'
-					GROUP BY ish.itemFk	
-			 ) alb ON alb.itemFk = i.id
-		LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk
-		LEFT JOIN (
-				SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as venta
-					FROM itemTicketOut
-					WHERE shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
-						AND warehouseFk = vWarehouseFk
-					GROUP BY itemFk
-			 ) sale ON sale.item_id = i.id
-		LEFT JOIN (
-				SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as compra
-					FROM itemEntryIn
-					WHERE landed BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
-						AND warehouseInFk = vWarehouseFk
-                        AND isVirtualStock = FALSE
-					GROUP BY itemFk
-			 ) buy ON buy.item_id = i.id
-		LEFT JOIN (
-				SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as traslado
-					FROM itemEntryOut
-					WHERE shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
-						AND warehouseOutFk = vWarehouseFk
-					GROUP BY itemFk
-			 ) mov ON mov.item_id = i.id
-		WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit)	 
-			AND i.itemPackingTypeFk = 'H'
-			AND ic.shortLife;
-
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
@ -48,6 +48,13 @@ proc: BEGIN
 			RESIGNAL;
 		END;
 	
+	START TRANSACTION;
+	
+	SELECT id INTO vSaleFk
+		FROM sale
+		WHERE id = vSaleFk 
+		FOR UPDATE;
+
 	SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0)), s.quantity
 		INTO vLastPickingOrder, vOutStanding, vSaleQuantity
 		FROM sale s
@ -57,7 +64,8 @@ proc: BEGIN
 			LEFT JOIN parking p ON p.id = sh.parkingFk
 		WHERE s.id = vSaleFk;
 		
-	IF vOutStanding <= 0 THEN 
+	IF vOutStanding <= 0 THEN
+		COMMIT;
 		LEAVE proc;
 	END IF;

@ -84,10 +92,8 @@ proc: BEGIN
 			END IF;
 			LEAVE l;
 		END IF;
-
-		START TRANSACTION;
-
-		SELECT id INTO vItemShelvingFk 
+	
+	SELECT id INTO vItemShelvingFk 
 			FROM itemShelving 
 			WHERE id = vItemShelvingFk 
 			FOR UPDATE;
@ -115,9 +121,8 @@ proc: BEGIN
 				WHERE id = vItemShelvingFk;

 		END IF;
-
-		COMMIT;	
 	END LOOP;
 	CLOSE vItemShelvingAvailable;
+	COMMIT;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/productionControl.sql
+++ b/db/routines/vn/procedures/productionControl.sql
@ -99,7 +99,7 @@ proc: BEGIN
 				LEFT JOIN `zone` z ON z.id = t.zoneFk
 				LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
 					AND DATE(t.shipped) = zc.dated
-				LEFT JOIN ticketParking  tp ON tp.ticketFk = t.id
+				LEFT JOIN ticketParking tp ON tp.ticketFk = t.id
 				LEFT JOIN parking pk ON pk.id = tp.parkingFk
 			WHERE t.warehouseFk = vWarehouseFk
 				AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
@ -124,8 +124,8 @@ proc: BEGIN
 		ADD COLUMN `collectionN` INT;

 	UPDATE tmp.productionBuffer pb
-		JOIN  tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
-		SET pb.problem = TRIM(CAST(CONCAT(  IFNULL(tp.itemShortage, ''),
+		JOIN tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
+		SET pb.problem = TRIM(CAST(CONCAT( IFNULL(tp.itemShortage, ''),
 				IFNULL(tp.itemDelay, ''),
 				IFNULL(tp.itemLost, ''),
 				IF(tp.isFreezed, ' CONGELADO',''),
@ -141,7 +141,7 @@ proc: BEGIN
 			LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = pb.clientFk
 			JOIN productionConfig pc
 		SET pb.problem = TRIM(CAST(CONCAT('NUEVO ', pb.problem) AS CHAR(255)))
-		WHERE (cnb.clientFk IS NULL  OR cnb.isRookie)
+		WHERE (cnb.clientFk IS NULL OR cnb.isRookie)
 			AND pc.rookieDays;

 	-- Líneas y volumen por ticket
@ -268,15 +268,14 @@ proc: BEGIN
 	UPDATE tmp.productionBuffer pb
 			JOIN sale s ON s.ticketFk = pb.ticketFk
 			JOIN item i ON i.id = s.itemFk
-			JOIN itemType it ON it.id = i.typeFk
-			JOIN itemCategory ic ON ic.id = it.categoryFk
-			JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk AND lb.item_id = s.itemFk
+			JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk
+				AND lb.item_id = s.itemFk
 			JOIN buy b ON b.id = lb.buy_id
 			JOIN packaging p ON p.id = b.packagingFk
 			JOIN productionConfig pc
-		SET hasPlantTray = TRUE
-		WHERE ic.code = 'plant'
-			AND p.`depth` >= pc.minPlantTrayLength
+		SET pb.hasPlantTray = TRUE
+		WHERE p.isPlantTray
+			AND s.quantity >= b.packing
 			AND pb.isOwn;

 	DROP TEMPORARY TABLE
--- a/db/routines/vn/procedures/ticket_mergeSales.sql
+++ b/db/routines/vn/procedures/ticket_mergeSales.sql
@ -3,47 +3,41 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
 	vSelf INT
 )
 BEGIN
-	DECLARE vHasSalesToMerge BOOL;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;

-	START TRANSACTION;
-
-	SELECT id INTO vSelf
-		FROM ticket
-		WHERE id = vSelf FOR UPDATE;
-
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
 		(PRIMARY KEY (id))
 		ENGINE = MEMORY
-		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity 
+		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
 			FROM sale s
 				JOIN item i ON i.id = s.itemFk
 				JOIN itemType it ON it.id = i.typeFk
 			WHERE s.ticketFk = vSelf
 				AND it.isMergeable
-			GROUP BY s.itemFk, s.price, s.discount
-			HAVING COUNT(*) > 1;
+			GROUP BY s.itemFk, s.price, s.discount;

-	SELECT COUNT(*) INTO vHasSalesToMerge
-	 	FROM tSalesToPreserve;
+	START TRANSACTION;

-	IF vHasSalesToMerge THEN 
-		UPDATE sale s 
-				JOIN tSalesToPreserve stp ON stp.id = s.id
-			SET s.quantity = newQuantity;
+	UPDATE sale s 
+			JOIN tSalesToPreserve stp ON stp.id = s.id
+		SET s.quantity = newQuantity
+		WHERE s.ticketFk = vSelf;

-		DELETE s
-			FROM sale s
-				JOIN tSalesToPreserve stp ON stp.itemFk = s.itemFk
-			WHERE s.ticketFk = vSelf
-				AND s.id <> stp.id;
-	END IF;
+	DELETE s.*
+		FROM sale s
+			LEFT JOIN tSalesToPreserve stp ON stp.id = s.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemType it ON it.id = i.typeFk
+		WHERE s.ticketFk = vSelf
+			AND stp.id IS NULL
+			AND it.isMergeable;

 	COMMIT;
+
 	DROP TEMPORARY TABLE tSalesToPreserve;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_setVolume.sql
+++ b/db/routines/vn/procedures/ticket_setVolume.sql
@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
 )
 BEGIN
 /**
- * Update the volume ticket
+ * Update the volume ticket.
 * 
 * @param vSelf Ticket id
 */
--- a/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
+++ b/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
@ -4,26 +4,36 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolumeIte
 )
 BEGIN
 /**
- * Update the volume tickets of item
+ * Update the volume of tickets containing the item.
 *
- * @param vSelf Ticket id
+ * @param vItemFk Item id
 */
-	CREATE OR REPLACE TEMPORARY TABLE tTicket
-		(PRIMARY KEY (id))
-		ENGINE = MEMORY
-		SELECT t.id, SUM(s.quantity * ic.cm3delivery / 1000000) volume
+	DECLARE vTicket INT;
+	DECLARE vDone BOOL;
+
+	DECLARE vTickets CURSOR FOR
+		SELECT DISTINCT t.id
 			FROM sale s
 				JOIN ticket t ON t.id = s.ticketFk
 				JOIN itemCost ic ON ic.itemFk = s.itemFk
 					AND ic.warehouseFk = t.warehouseFk
 			WHERE s.itemFk = vItemFk
 				AND t.shipped >= util.VN_CURDATE()
-			GROUP BY t.id;
+				AND t.refFk IS NULL;

-	UPDATE ticket t
-			JOIN tTicket tt ON tt.id = t.id
-		SET t.volume = tt.volume;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

-	DROP TEMPORARY TABLE tTicket;
+	OPEN vTickets;
+	l: LOOP
+		FETCH vTickets INTO vTicket;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		CALL ticket_setVolume(vTicket);
+
+	END LOOP l;
+	CLOSE vTickets;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ticket_splitItemPackingType.sql
+++ b/db/routines/vn/procedures/ticket_splitItemPackingType.sql
@ -3,86 +3,124 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 	vSelf INT,
 	vOriginalItemPackingTypeFk VARCHAR(1)
 )
-BEGIN
+proc: BEGIN
 /**
- * Clona y reparte las líneas de ventas de un ticket en funcion del tipo de empaquetado.
- * Respeta el id de ticket inicial para el tipo de empaquetado propuesto.
+ * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
+ * Respeta el id inicial para el tipo propuesto.
 *
 * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo empaquetado al que se mantiene el ticket original
+ * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
 * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
 */
-	DECLARE vDone INT DEFAULT FALSE;
-	DECLARE vHasItemPackingType BOOL;
-	DECLARE vItemPackingTypeFk INT;
+	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
 	DECLARE vNewTicketFk INT;
+	DECLARE vPackingTypesToSplit INT;
+	DECLARE vDone INT DEFAULT FALSE;

-	DECLARE vItemPackingTypes CURSOR FOR 
-		SELECT DISTINCT itemPackingTypeFk 
-			FROM tSalesToMove;
+	DECLARE vSaleGroup CURSOR FOR
+		SELECT itemPackingTypeFk
+			FROM tSaleGroup
+			WHERE itemPackingTypeFk IS NOT NULL
+			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;

 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

-	SELECT COUNT(*) INTO vHasItemPackingType
-			FROM ticket t	
-				JOIN sale s ON s.ticketFk = t.id
-				JOIN item i ON i.id = s.itemFk 
-			WHERE t.id = vSelf
-				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
+	START TRANSACTION;

-	IF NOT vHasItemPackingType THEN
-		CALL util.throw('The ticket has not sales with the itemPackingType');	
-	END IF;
+	SELECT id
+		FROM sale
+		WHERE ticketFk = vSelf
+			AND NOT quantity
+		FOR UPDATE;

-	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
-		ticketFk INT,
-		saleFk INT,
-		itemPackingTypeFk INT
-	) ENGINE=MEMORY;
+	DELETE FROM sale
+		WHERE NOT quantity
+		AND ticketFk = vSelf;

-	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
-		SELECT s.id, i.itemPackingTypeFk 
-			FROM ticket t	
-				JOIN sale s ON s.ticketFk = t.id
-				JOIN item i ON i.id = s.itemFk 
-			WHERE t.id = vSelf
-				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
+	CREATE OR REPLACE TEMPORARY TABLE tSale
+		(PRIMARY KEY (id))
+		ENGINE = MEMORY
+		SELECT s.id, i.itemPackingTypeFk, IFNULL(sv.litros, 0) litros
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
+			WHERE s.ticketFk = vSelf;

-	OPEN vItemPackingTypes;
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
+		ENGINE = MEMORY
+		SELECT itemPackingTypeFk, SUM(litros) totalLitros
+			FROM tSale
+			GROUP BY itemPackingTypeFk;

-	l: LOOP
-		SET vDone = FALSE;
-		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-
-		CALL ticket_Clone(vSelf, vNewTicketFk);
-
-		UPDATE tSalesToMove
-			SET ticketFk = vNewTicketFk
-			WHERE itemPackingTypeFk = vItemPackingTypeFk;
-
-	END LOOP;
-
-	CLOSE vItemPackingTypes;
-
-	UPDATE sale s
-			JOIN  tSalesToMove stm ON stm.saleFk = s.id
-		SET s.ticketFk = stm.ticketFk
-		WHERE stm.ticketFk;
+	SELECT COUNT(*) INTO vPackingTypesToSplit
+		FROM tSaleGroup
+		WHERE itemPackingTypeFk IS NOT NULL;

 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
 		itemPackingTypeFk VARCHAR(1)
-	) ENGINE=MEMORY
-		SELECT ticketFk, itemPackingTypeFk
-			FROM tSalesToMove
-			GROUP BY ticketFk
-		UNION
-		SELECT vSelf, vOriginalItemPackingTypeFk;
+	) ENGINE = MEMORY;

-	DROP TEMPORARY TABLE tSalesToMove;
+	CASE vPackingTypesToSplit
+		WHEN 0 THEN
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				VALUES(vSelf, vItemPackingTypeFk);
+		WHEN 1 THEN
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				SELECT vSelf, itemPackingTypeFk
+					FROM tSaleGroup
+					WHERE itemPackingTypeFk IS NOT NULL;
+		ELSE
+			OPEN vSaleGroup;
+			FETCH vSaleGroup INTO vItemPackingTypeFk;
+
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				VALUES(vSelf, vItemPackingTypeFk);
+
+			l: LOOP
+				SET vDone = FALSE;
+				FETCH vSaleGroup INTO vItemPackingTypeFk;
+
+				IF vDone THEN
+					LEAVE l;
+				END IF;
+
+				CALL ticket_Clone(vSelf, vNewTicketFk);
+
+				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+					VALUES(vNewTicketFk, vItemPackingTypeFk);
+			END LOOP;
+
+			CLOSE vSaleGroup;
+
+			SELECT s.id
+				FROM sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
+				FOR UPDATE;
+
+			UPDATE sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
+				SET s.ticketFk = t.ticketFk;
+
+			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
+				FROM tSaleGroup sg
+				WHERE sg.itemPackingTypeFk IS NOT NULL
+				ORDER BY sg.itemPackingTypeFk
+				LIMIT 1;
+
+			UPDATE sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = vItemPackingTypeFk
+				SET s.ticketFk = t.ticketFk
+				WHERE ts.itemPackingTypeFk IS NULL;
+	END CASE;
+
+	COMMIT;
+
+	DROP TEMPORARY TABLE
+		tSale,
+		tSaleGroup;
 END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/routines/vn/procedures/worker_getHierarchy.sql
+++ b/db/routines/vn/procedures/worker_getHierarchy.sql
@ -1,5 +1,7 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`worker_getHierarchy`(vUserFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`worker_getHierarchy`(
+	vUserFk INT
+)
 BEGIN
 /**
 * Retorna una tabla temporal con los trabajadores que tiene
@ -12,15 +14,16 @@ BEGIN
 		(PRIMARY KEY (workerFk))
 		ENGINE = MEMORY
 		WITH RECURSIVE workerHierarchy AS (
-			SELECT id workerFk, bossFk, 0 depth
+			SELECT id workerFk, bossFk, 0 `depth`, CAST(id AS CHAR(255)) `path`
 				FROM vn.worker
 				WHERE id = vUserFk
 			UNION ALL
-			SELECT w.id, w.bossFk, wh.depth + 1
+			SELECT w.id, w.bossFk, wh.`depth` + 1, CONCAT(wh.`path`, ',', w.id)
 				FROM vn.worker w
 					JOIN workerHierarchy wh ON w.bossFk = wh.workerFk
+				WHERE NOT FIND_IN_SET(w.id, wh.`path`)
 		)
-		SELECT * 
+		SELECT *
 			FROM workerHierarchy
 			ORDER BY depth, workerFk;
 END$$
--- a/db/versions/11196-blackCymbidium/00-firstScript.sql
+++ b/db/versions/11196-blackCymbidium/00-firstScript.sql
@ -0,0 +1,7 @@
+RENAME TABLE vn.quadMindsApiConfig TO vn.quadmindsApiConfig;
+
+ALTER TABLE vn.quadmindsApiConfig
+    ADD maxObjects INT NULL COMMENT 'Número máximo de objetos en el array por petición',
+    ADD `limit` INT NULL COMMENT 'Limite de objetos solicitados por petición',
+    ADD `orderTimeFrom` VARCHAR(5) NULL COMMENT 'Inicio de ventana horaria de pedido',
+    ADD `orderTimeTo` VARCHAR(5) NULL COMMENT 'Fin de ventana horaria de pedido';
--- a/db/versions/11239-goldenBirch/00-firstScript.sql
+++ b/db/versions/11239-goldenBirch/00-firstScript.sql
@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.packaging ADD IF NOT EXISTS isPlantTray BOOL DEFAULT FALSE NOT NULL COMMENT 'The container is a plant tray. Used to restrict the picking of full plant trays, to make previous picking.';
--- a/db/versions/11241-grayPalmetto/00-firstScript.sql
+++ b/db/versions/11241-grayPalmetto/00-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.packaging ADD IF NOT EXISTS isPlantTray BOOL DEFAULT FALSE NOT NULL 
+    COMMENT 'The container is a plant tray. Used to restrict the picking of full plant trays, to make previous picking.';
--- a/db/versions/11246-whiteMonstera/00-firstScript.sql
+++ b/db/versions/11246-whiteMonstera/00-firstScript.sql
@ -0,0 +1 @@
+DELETE FROM salix.ACL WHERE model = 'Worker' AND property = 'findById' AND principalId = 'employee';
--- a/db/versions/11247-chocolateChico/00-firstScript.sql
+++ b/db/versions/11247-chocolateChico/00-firstScript.sql
@ -0,0 +1,4 @@
+UPDATE salix.ACL SET principalId = 'employee' WHERE model = 'Worker' AND principalId = '$subordinate';
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+VALUES ('Worker', '__get__advancedSummary', 'READ', 'ALLOW', 'ROLE', 'hr'),
+		('Worker', '__get__summary', 'READ', 'ALLOW', 'ROLE', 'employee');
--- a/db/versions/11249-crimsonPhormium/00-firstScript.sql
+++ b/db/versions/11249-crimsonPhormium/00-firstScript.sql
@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.parking DROP FOREIGN KEY IF EXISTS  parking_fk1;
+ALTER TABLE vn.parking ADD CONSTRAINT  parking_fk1 FOREIGN KEY (sectorFk) REFERENCES vn.sector(id) ON DELETE RESTRICT ON UPDATE CASCADE;
--- a/loopback/server/boot/role-resolver.js
+++ b/loopback/server/boot/role-resolver.js
@ -1,12 +1,9 @@
-const UserError = require('vn-loopback/util/user-error');
-
 module.exports = async function(app) {
    const models = app.models;

    models.VnRole.registerResolver('$subordinate', async(role, ctx) => {
-        Object.assign(ctx, {req: {accessToken: {userId: ctx.accessToken.userId}}});
-
-        const isSubordinate = await models.Worker.isSubordinate(ctx, +ctx.modelId);
-        if (!isSubordinate) throw new UserError(`You don't have enough privileges`);
+        if (!ctx.accessToken) return false;
+        const httpCtx = {req: {accessToken: {userId: ctx.accessToken.userId}}};
+        return models.Worker.isSubordinate(httpCtx, +ctx.modelId);
    });
 };
--- a/modules/item/back/methods/item-shelving/getListItemNewer.js
+++ b/modules/item/back/methods/item-shelving/getListItemNewer.js
@ -33,7 +33,7 @@ module.exports = Self => {

        const [isParkingToReview] = await Self.rawSql(`
            SELECT COUNT(p.id) parkingToReview
-            FROM vn.parking p 
+            FROM vn.parking p
                JOIN vn.sector s ON s.id = p.sectorFk
                JOIN vn.productionConfig pc
            WHERE p.code = ? AND s.code = pc.sectorToCode;`,
@ -59,11 +59,12 @@ module.exports = Self => {
                            JOIN vn.productionConfig pc
                        WHERE is2.shelvingFk <> ?
                        AND s.code = pc.sectorFromCode)
-            SELECT ti.itemFK, tis.shelvingFk 
+            SELECT ti.itemFK, tis.shelvingFk
                    FROM tItemShelving ti
                        JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
                        JOIN vn.productionConfig pc
-                    WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created ;`,
+                    WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created
+                    LIMIT 10;`,
        [shelvingFk, shelvingFk], myOptions);
        return result;
    };
--- a/modules/route/back/methods/route/driverRouteEmail.js
+++ b/modules/route/back/methods/route/driverRouteEmail.js
@ -39,6 +39,8 @@ module.exports = Self => {
        const {reportMail} = agencyMode();
        let user;
        let account;
+        let userEmail;
+        ctx.args.recipients = reportMail ? reportMail.split(',').map(email => email.trim()) : [];

        if (workerFk) {
            user = await models.VnUser.findById(workerFk, {
@ -48,10 +50,17 @@ module.exports = Self => {
            account = await models.Account.findById(workerFk);
        }

-        if (user?.active && account) ctx.args.recipient = user.emailUser().email;
-        else ctx.args.recipient = reportMail;
+        if (user?.active && account)
+            userEmail = user.emailUser().email;
+
+        if (userEmail)
+            ctx.args.recipients.push(userEmail);
+
+        ctx.args.recipients = [...new Set(ctx.args.recipients)];
+
+        if (!ctx.args.recipients.length)
+            throw new UserError('An email is necessary');

-        if (!ctx.args.recipient) throw new UserError('An email is necessary');
        return Self.sendTemplate(ctx, 'driver-route');
    };
 };
--- a/modules/ticket/front/descriptor-menu/index.html
+++ b/modules/ticket/front/descriptor-menu/index.html
@ -349,13 +349,6 @@
    message="Recalculate components">
 </vn-confirm>

-<!-- Client balance popup-->
-<vn-client-balance-create
-    vn-id="balance-create"
-    company-fk="$ctrl.vnConfig.companyFk"
-    client-fk="$ctrl.ticket.client.id">
-</vn-client-balance-create>
-
 <!-- Send pdf to tablet -->
 <vn-confirm
    vn-id="pdfToTablet"
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@ -205,6 +205,74 @@
                    }
                }
            ]
+        },
+        "summary": {
+            "include": [
+                {
+                    "relation": "user",
+                    "scope": {
+                        "fields": [
+                            "name",
+                            "nickname",
+                            "roleFk"
+                        ],
+                        "include": [
+                            {
+                                "relation": "role",
+                                "scope": {
+                                    "fields": [
+                                        "name"
+                                    ]
+                                }
+                            },
+                            {
+                                "relation": "emailUser",
+                                "scope": {
+                                    "fields": [
+                                        "email"
+                                    ]
+                                }
+                            }
+                        ]
+                    }
+                },
+                {
+                    "relation": "department",
+                    "scope": {
+                        "include": {
+                            "relation": "department",
+                            "scope": {
+                                "fields": [
+                                    "name"
+                                ]
+                            }
+                        }
+                    }
+                },
+                {
+                    "relation": "boss"
+                },
+                {
+                    "relation": "client"
+                },
+                {
+                    "relation": "sip"
+                }
+            ]
+        },
+        "advancedSummary": {
+            "fields": [
+                "id",
+                "fiDueDate",
+                "sex",
+                "seniority",
+                "fi",
+                "isFreelance",
+                "isSsDiscounted",
+                "hasMachineryAuthorized",
+                "isDisable",
+                "birth"
+            ]
        }
    }
 }
				`@ -0,0 +1 @@`
				`DELETE FROM salix.ACL WHERE model = 'Worker' AND property = 'findById' AND principalId = 'employee';`