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
+            }
+        });
+    };
+};

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
+            }
+        });
+    };
+};

back/model-config.json

@@ -124,6 +124,9 @@
     "Province": {
         "dataSource": "vn"
     },
+    "QuadmindsApiConfig": {
+        "dataSource": "vn"
+    },
     "Autonomy": {
         "dataSource": "vn"
     },

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);
+};

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"
+		}
+	}
+}

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 (286,'ACL','*','READ','ALLOW','ROLE','developer',10578);
-INSERT INTO `ACL` VALUES (287,'AccessToken','*','*','ALLOW','ROLE','developer',NULL);
+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 (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',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 (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',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 (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',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 (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',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 (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',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 (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',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 (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',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 (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 (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',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 (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 (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',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 (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',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 (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 (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',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 (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',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 (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 (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 (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 (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 (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 (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 (43,'Kubernetes','Container management','https://kube.verdnatura.es/','docker');
-INSERT INTO `link` VALUES (44,'Proxmox','Virtual environment','https://mox.verdnatura.es','proxmox');
+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 (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 (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 */;

db/dump/.dump/privileges.sql

@@ -1,4 +1,5 @@
 USE `mysql`;
+/*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 */;
@@ -885,7 +886,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketCollection',
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','ticketDocumentation','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketDms','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','ektEntryAssign','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','intrastat','alexm@%','0000-00-00 00:00:00','Insert','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','intrastat','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','supplierAgencyTerm','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','entryConfig','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packager','franceExpressConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1416,7 +1417,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','clientUnpaid
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','pay_dem','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','invoiceOut','guillermo@10.5.1.3','0000-00-00 00:00:00','Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','invoiceOut','guillermo@10.5.1.3','0000-00-00 00:00:00','Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','accountDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1463,7 +1464,13 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerBoss','rate','guillermo@
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleDms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleInvoiceIn','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleNotes','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionBoss','saleGroup','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','production','saleGroup','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','bufferLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','supplierAccount','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','tillSerial','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','stockBuyed','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','alertLevel','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerActivityType','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1849,8 +1856,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','subordinatege
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','dayend','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','buffer_settypebyname','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','barcodeToItem','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticket_splititempackingtype','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_getCommission','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1894,7 +1899,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionBoss','saleSplit','P
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','grafana','client_getDebt','FUNCTION','guillermo@db-proxy1.servers.dc.verdnatura.es','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 ('','vn','cooler','buyultimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','employee','log_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -2068,7 +2072,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelving_addb
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemShelvingSale_addByCollection','PROCEDURE','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelving_addlist','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelving_selfconsumption','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','item_getsimilar','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','cooler','item_getSimilar','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelvingsale_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','collection_printsticker','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','deviceproductionuser_getworker','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2119,7 +2123,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_filter
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_addbyclaim','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_addlist','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelving_selfconsumption','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','item_getsimilar','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','reviewer','item_getSimilar','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemshelvingsale_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','collection_printsticker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','deviceproductionuser_getworker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2209,6 +2213,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buy_getUltimate','PRO
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `mysql`;
+/*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 */;
@@ -2230,7 +2235,7 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_i
 INSERT IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','customer','{\"access\": 0, \"max_questions\": 0, \"max_updates\": 30000, \"max_connections\": 300000, \"max_user_connections\": 400, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','deliveryAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','deliveryBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','developer','{\"access\": 5909905728, \"is_role\": true, \"version_id\": 101106}');
@@ -2271,6 +2276,7 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','production','{\"access\":0,\"versi
 INSERT IGNORE INTO `global_priv` VALUES ('','productionAssi','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','productionBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','productionPlus','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT IGNORE INTO `global_priv` VALUES ('','reviewer','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','root','{\"access\": 549755781119, \"version_id\": 100705, \"is_role\": true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','salesAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','salesBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');

db/dump/dump.after.sql

@@ -1,12 +1 @@
-CREATE USER 'vn'@'localhost';
+-- Executed after dump
-
-GRANT SELECT,
-        INSERT,
-        UPDATE,
-        DELETE,
-        DROP,
-        CREATE TEMPORARY TABLES,
-        EXECUTE,
-        EVENT,
-        TRIGGER
-    ON *.* TO 'vn'@'localhost';

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';

db/dump/fixtures.before.sql

@@ -1506,7 +1506,8 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7),
         (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10),
         (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10),
-        (11, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4);
+        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4),
+        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
     VALUES
@@ -1520,7 +1521,7 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
         (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  ''),
         (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  ''),
         (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, 1,  ''),
-        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 1, 1, '');
+        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, 0, '');
 
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@@ -3186,7 +3187,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

db/routines/vn/procedures/catalog_calculate.sql

@@ -126,7 +126,10 @@ BEGIN
 					AND a.available > 0
 					AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
 					AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize)
-					AND (itc.isReclining OR it.`size` IS NULL OR it.`size` < z.itemMaxSize OR z.itemMaxSize IS NULL)
+					AND (it.`size` IS NULL
+						OR IF(itc.isReclining,
+							it.size <= z.itemMaxLength OR z.itemMaxLength IS NULL,
+							it.size <= z.itemMaxSize OR z.itemMaxSize IS NULL))
 					AND cit.id IS NULL
 					AND zit.id IS NULL
 					AND ait.id IS NULL;

db/routines/vn/procedures/catalog_componentCalculate.sql

@@ -7,7 +7,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`catalog_componentCalc
 )
 BEGIN
 /**
- * Calcula los componentes de los articulos de tmp.ticketLot
+ * Calcula los componentes de los articulos de la tabla tmp.ticketLot
  *
  * @param vZoneFk para calcular el transporte
  * @param vAddressFk Consignatario
@@ -25,6 +25,26 @@ BEGIN
 		FROM address
 		WHERE id = vAddressFk;
 
+	CREATE OR REPLACE TEMPORARY TABLE tPriceDelta
+	(INDEX (itemFk))
+	ENGINE = MEMORY
+	SELECT i.id itemFk,
+		SUM(IFNULL(pd.absIncreasing,0)) absIncreasing,
+		SUM(IFNULL(pd.ratIncreasing,0)) ratIncreasing,
+		pd.warehouseFk
+		FROM item i
+			JOIN priceDelta pd 
+				ON pd.itemTypeFk = i.typeFk
+				AND (pd.minSize IS NULL OR pd.minSize <= i.`size`)
+				AND (pd.maxSize IS NULL OR pd.maxSize >= i.`size`)
+				AND (pd.inkFk IS NULL OR pd.inkFk = i.inkFk)
+				AND (pd.originFk IS NULL OR pd.originFk = i.originFk)
+				AND (pd.producerFk IS NULL OR pd.producerFk = i.producerFk)
+				AND (pd.warehouseFk IS NULL OR pd.warehouseFk = vWarehouseFk)
+		WHERE (pd.fromDated IS NULL OR pd.fromDated <= vShipped)
+			AND (pd.toDated IS NULL OR pd.toDated >= vShipped)
+		GROUP BY i.id;
+
 	CREATE OR REPLACE TEMPORARY TABLE tSpecialPrice
 	(INDEX (itemFk))
 	ENGINE = MEMORY
@@ -108,6 +128,19 @@ BEGIN
 				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
 			GROUP BY tc.itemFk, warehouseFk;
 
+	-- Bonus del comprador a un rango de productos
+	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+		SELECT 
+			tcb.warehouseFk,
+			tcb.itemFk,
+			c.id,
+			IFNULL(tcb.base * tpd.ratIncreasing / 100,0) + IFNULL(tpd.absIncreasing,0)
+			FROM tmp.ticketComponentBase tcb
+				JOIN component c ON c.code = 'bonus'
+				JOIN tPriceDelta tpd 
+					ON tpd.itemFk = tcb.itemFk 
+					AND tpd.warehouseFk = tcb.warehouseFk;
+
 	-- RECOBRO
 	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
 		SELECT tcb.warehouseFk, tcb.itemFk, c2.id,
@@ -303,6 +336,7 @@ BEGIN
 		tmp.ticketComponentBase,
 		tmp.ticketComponentRate,
 		tmp.ticketComponentCopy,
+		tPriceDelta,
 		tSpecialPrice;
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_new.sql

@@ -1,8 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_new`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_new`(vUserFk INT, OUT vCollectionFk INT)
-	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,
+				vStateFk,
 				vWagons,
 				vTrainFk,
 				vLinesLimit,
 				vVolumeLimit,
-			vSizeLimit
+				vSizeLimit,
-		FROM worker w
+				vLockName
-			JOIN operator o ON o.workerFk = w.id 
+		FROM productionConfig pc
+			JOIN worker w ON w.id = vUserFk
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
-			JOIN productionConfig pc
+			JOIN operator o ON o.workerFk = vUserFk;
-		WHERE w.id = 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)
+	WHILE vWagons > vWagonCounter DO
-		WITH RECURSIVE wagonSequence AS (
+		SET vWagonCounter = vWagonCounter + 1;
-		SELECT vWagonCounter wagon
+
-		UNION ALL
+		INSERT INTO tTrain(wagon, shelve, liters, `lines`, height)
-		SELECT wagon + 1 wagon
+			SELECT vWagonCounter, cv.`level` , cv.liters , cv.`lines` , cv.height
-			FROM wagonSequence
+				FROM collectionVolumetry cv
-			WHERE wagon < vWagonCounter + vWagons -1
+				WHERE cv.trainFk = vTrainFk
-		) 
-		SELECT ws.wagon, cv.`level`, cv.liters, cv.`lines`, cv.height
-			FROM wagonSequence ws
-				JOIN vn.collectionVolumetry cv ON 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 
+	-- Comprobamos si hay tickets asignados. En ese caso, nos centramos
-	-- y los sacamos independientemente de problemas o tamaños
+	-- exclusivamente en esos tickets y los sacamos independientemente
-
+	-- de problemas o tamaños
-	SELECT EXISTS (
+	SELECT COUNT(*) INTO vHasAssignedTickets
-		SELECT TRUE 
 		FROM tmp.productionBuffer pb
 			JOIN state s ON s.id = pb.state
 		WHERE s.code = 'PICKER_DESIGNED'
-				AND pb.workerCode = vWorkerCode
+			AND pb.workerCode = vWorkerCode;
-		) INTO vHasAssignedTickets;
 
 	-- 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,17 +193,24 @@ 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;
 
-	-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede
+	-- Es importante que el primer ticket se coja en todos los casos
-	IF vHasUniqueCollectionTime THEN
+	SELECT ticketFk,
-		
+			HH,
-		SELECT ticketFk INTO vFirstTicketFk
+			mm,
+			`lines`,
+			m3
+		INTO vFirstTicketFk,
+			vHour,
+			vMinute,
+			vTicketLines,
+			vTicketVolume
 		FROM tmp.productionBuffer
 		ORDER BY HH,
 			mm,
@@ -186,44 +222,44 @@ BEGIN
 			ticketFk
 		LIMIT 1;
 
-		DELETE pb 
+	-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede
-			FROM tmp.productionBuffer pb
+	IF vHasUniqueCollectionTime THEN
-				JOIN tmp.productionBuffer pb2 ON pb2.ticketFk = vFirstTicketFk
+		DELETE FROM tmp.productionBuffer
-					AND (pb.HH <> pb2.HH OR pb.mm <> pb2.mm);
+			WHERE HH <> vHour
-			
+				OR mm <> vMinute;
 	END IF;
 
-	OPEN vTickets;
+	SET vTicketFk = vFirstTicketFk;
-	l: LOOP
+	SET @lines = 0;
+	SET @volume = 0;
+
+	OPEN c1;
+	read_loop: LOOP
 		SET vDone = FALSE;
-		FETCH vTickets INTO vTicketFk, vTicketLines, vTicketVolume;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
 
 		-- Buscamos un ticket que cumpla con los requisitos en el listado
-
+		IF ((vTicketLines + @lines) <= vLinesLimit OR vLinesLimit IS NULL)
-		IF (vLinesLimit IS NULL OR (vTotalLines + vTicketLines) <= vLinesLimit)
+			AND ((vTicketVolume + @volume) <= vVolumeLimit OR vVolumeLimit IS NULL) THEN
-			AND (vVolumeLimit IS NULL OR (vTotalVolume + vTicketVolume) <= vVolumeLimit) THEN
 
 			CALL ticket_splitItemPackingType(vTicketFk, vItemPackingTypeFk);
 			DROP TEMPORARY TABLE tmp.ticketIPT;
 
-			SELECT COUNT(*), SUM(litros), MAX(i.`size`), SUM(sv.volume)
+			UPDATE tmp.productionBuffer pb
-					INTO vLines, vLiters, vHeight, vVolume
+					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;
+							WHERE sv.ticketFk = vTicketFk
-
+					) sub
-			SET vTotalVolume = vTotalVolume + vVolume,
+				SET pb.liters = sub.liters,
-				vTotalLines = vTotalLines + vLines;
+					pb.`lines` = sub.`lines`,
-
+					pb.height = sub.height
-			UPDATE tmp.productionBuffer pb
-				SET pb.liters = vLiters,
-					pb.`lines` = vLines,
-					pb.height = vHeight
 				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
+				SELECT tt.wagon
+					INTO vFreeWagonFk
+					FROM tTrain tt
+						LEFT JOIN (
+							SELECT DISTINCT wagon
 								FROM tTrain
-					GROUP BY wagon
+								WHERE ticketFk IS NOT NULL
-					HAVING SUM(IFNULL(ticketFk, 0)) = 0
+						) 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, 
+					-- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo
-					-- máximo un carro con pedido excesivo
+					DELETE tt.*
-
-					DELETE tt
 						FROM tTrain tt
-							JOIN (SELECT wagon
+							LEFT JOIN (
+								SELECT DISTINCT wagon
 									FROM tTrain
-								GROUP BY wagon
+									WHERE ticketFk IS NOT NULL
-								HAVING SUM(IFNULL(ticketFk, 0)) = 0
+							) nn ON nn.wagon = tt.wagon
-							) sub ON sub.wagon = tt.wagon;
+						WHERE nn.wagon IS NULL;
 				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
+		UPDATE collection c
-
+				JOIN state st ON st.code = 'ON_PREPARATION'
-		INSERT INTO collection
+			SET c.stateFk = st.id
-			SET itemPackingTypeFk = vItemPackingTypeFk,
+			WHERE c.id = vCollectionFk;
-				trainFk = vTrainFk,
-				wagons = vWagons,
-				warehouseFk = vWarehouseFk;
-
-		SELECT LAST_INSERT_ID() INTO 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, vStateFk);
-		CALL collection_setState(vCollectionFk, vStateCode);
 
 		-- 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
+				) sub
 			SET c.saleTotalCount = sub.saleTotalCount,
 				c.salePickedCount = sub.salePickedCount
 			WHERE c.id = vCollectionFk;
+
 	ELSE
+		DELETE FROM `collection`
+			WHERE id = vCollectionFk;
 			SET vCollectionFk = NULL;
 	END IF;
 
+	DO RELEASE_LOCK(vLockName);
+
 	DROP TEMPORARY TABLE
 		tTrain,
 		tmp.productionBuffer;

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 ;

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
@@ -58,6 +65,7 @@ proc: BEGIN
 		WHERE s.id = vSaleFk;
 		
 	IF vOutStanding <= 0 THEN
+		COMMIT;
 		LEAVE proc;
 	END IF;
 
@@ -85,8 +93,6 @@ proc: BEGIN
 			LEAVE l;
 		END IF;
 	
-		START TRANSACTION;
-
 	SELECT id INTO vItemShelvingFk 
 			FROM itemShelving 
 			WHERE id = vItemShelvingFk 
@@ -115,9 +121,8 @@ proc: BEGIN
 				WHERE id = vItemShelvingFk;
 
 		END IF;
-
-		COMMIT;	
 	END LOOP;
 	CLOSE vItemShelvingAvailable;
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/item_calculateStock.sql

@@ -1,15 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockTraslation`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_calculateStock`(
 	vDated DATE
 )
 BEGIN
 /**
- * Calcula el stock del almacén de subasta desde FechaInventario hasta vDated
+ * Calculate the stock of the auction warehouse from the inventory date to vDated
- * sin tener en cuenta las salidas del mismo dia vDated
- * para ver el transporte a reservar
  *
- * @param vDated Fecha hasta la cual calcula el stock
+ * @param vDated Date to calculate the stock.
- * @return tmp.item
+ * @return tmp.item, tmp.buyUltimate
  */
 	DECLARE vAuctionWarehouseFk INT;
 

db/routines/vn/procedures/previousSticker_get.sql

@@ -1,58 +1,64 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`previousSticker_get`(vSaleGroupFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`previousSticker_get`(
+	vSaleGroupFk INT
+)
 BEGIN
 /**
  * Devuelve los campos a imprimir en una etiqueta de preparación previa.
- * Actualiza el valor de vn.saleGroup.parkingFk en el caso de que exista un
+ * Actualiza el valor de saleGroup.parkingFk en el caso de que exista un
  * saleGroup del mismo ticket con parking, del mismo sector, para que todos se
  * pongan juntos.
  *
- * @param vSaleGroupFk Identificador de vn.saleGroup
+ * @param vSaleGroupFk Identificador de saleGroup
  */
 	DECLARE vTicketFk INT;
 	DECLARE vParkingFk INT;
 	DECLARE vSectorFk INT;
+	DECLARE vTicketLines INT;
 
-	SELECT s.ticketFk
+	WITH ticketData AS(
-		INTO vTicketFk
+		SELECT DISTINCT s.ticketFk 
 			FROM vn.saleGroupDetail sgd
 				JOIN vn.sale s ON s.id = sgd.saleFk
 			WHERE sgd.saleGroupFk = vSaleGroupFk
-		LIMIT 1;
+	)
+	SELECT COUNT(*), s.ticketFk INTO vTicketLines, vTicketFk 
+		FROM vn.sale s 
+			JOIN ticketData td ON td.ticketFk = s.ticketFk;
 
 	SELECT sg.parkingFk, sc.sectorFk
 		INTO vParkingFk, vSectorFk
-		FROM vn.saleGroup sg
+		FROM saleGroup sg
-			JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
+			JOIN sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
-			JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
+			JOIN sectorCollection sc ON sc.id = scsg.sectorCollectionFk
-			JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
+			JOIN saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
-			JOIN vn.sale s ON s.id = sgd.saleFk
+			JOIN sale s ON s.id = sgd.saleFk
 		WHERE s.ticketFk = vTicketFk
 			AND sg.parkingFk IS NOT NULL
 		LIMIT 1;
 
-	UPDATE vn.saleGroup sg
+	UPDATE saleGroup sg
 		SET sg.parkingFk = vParkingFk
 		WHERE sg.id = vSaleGroupFk
 			AND sg.sectorFk = vSectorFk;
 
 	SELECT sgd.saleGroupFk,
 			t.id ticketFk,
-			p.code as location,
+			COUNT(*) previousLines,
-			t.observations,
 			IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) shippingHour,
 			IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) shippingMinute ,
 			IFNULL(MAX(i.itemPackingTypeFk),'H') itemPackingTypeFk ,
-			count(*) items,
+			vTicketLines ticketLines,
+			p.code `location`,
 			sc.description sector
-		FROM vn.sale s
+		FROM sale s
-			JOIN vn.item i ON i.id = s.itemFk
+			JOIN item i ON i.id = s.itemFk
-			JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
+			JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
-			JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
+			JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
-			JOIN vn.sector sc ON sc.id = sg.sectorFk
+			JOIN sector sc ON sc.id = sg.sectorFk
-			JOIN vn.ticket t ON t.id = s.ticketFk
+			JOIN ticket t ON t.id = s.ticketFk
-			LEFT JOIN vn.parking p ON p.id = sg.parkingFk
+			LEFT JOIN parking p ON p.id = sg.parkingFk
-			LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
+			LEFT JOIN `zone` z ON z.id = t.zoneFk
 		WHERE sgd.saleGroupFk = vSaleGroupFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/productionControl.sql

@@ -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 cache.last_buy lb ON lb.warehouse_id = vWarehouseFk
-			JOIN itemCategory ic ON ic.id = it.categoryFk
+				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
+		SET pb.hasPlantTray = TRUE
-		WHERE ic.code = 'plant'
+		WHERE p.isPlantTray
-			AND p.`depth` >= pc.minPlantTrayLength
+			AND s.quantity >= b.packing
 			AND pb.isOwn;
 
 	DROP TEMPORARY TABLE

db/routines/vn/procedures/shelving_clean.sql

@@ -25,8 +25,9 @@ UPDATE shelving sh
 		AND (
 			sh.parked IS NULL
 			OR
-			sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+			sh.parked < util.VN_CURDATE() - INTERVAL 2 WEEK
 		)
+			
 		AND IF(code REGEXP '^[A-Za-z]{2}[0-9]', LEFT (code, 2) NOT IN (
 				SELECT DISTINCT LEFT(its.shelvingFk, 2)
 					FROM itemShelving its

db/routines/vn/procedures/stockBought_calculate.sql

@@ -1,12 +1,17 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`stockBought_calculate`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`stockBought_calculate`(
-BEGIN
+	vDated DATE
+)
+proc: BEGIN
 /**
- * Inserts the purchase volume per buyer
+ * Calculate the stock of the auction warehouse from the inventory date to vDated
- * into stockBought according to the current date.
+ * without taking into account the outputs of the same day vDated
+ *
+ * @param vDated Date to calculate the stock.
  */
-	DECLARE vDated DATE;
+	IF vDated < util.VN_CURDATE() THEN
-	SET vDated = util.VN_CURDATE();
+		LEAVE proc;
+	END IF;
 
 	CREATE OR REPLACE TEMPORARY TABLE tStockBought
 		SELECT workerFk, reserve 
@@ -16,26 +21,27 @@ BEGIN
 
 	DELETE FROM stockBought WHERE dated = vDated;
 
-	INSERT INTO stockBought (workerFk, bought, dated)
+	CALL item_calculateStock(vDated);
+
+	INSERT INTO stockBought(workerFk, bought, dated)
 		SELECT it.workerFk,
 				ROUND(SUM(
-					(ac.conversionCoefficient * 
+						(ti.quantity / b.packing) *
-						(b.quantity / b.packing) * 
 						buy_getVolume(b.id)
-					) / (vc.trolleyM3 * 1000000)
+					) / vc.palletM3 / 1000000, 1) bought,
-				), 1),
 				vDated
-			FROM entry e
+			FROM itemType it
-				JOIN travel t ON t.id = e.travelFk 
+				JOIN item i ON i.typeFk = it.id
-				JOIN warehouse w ON w.id = t.warehouseInFk
+				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN buy b ON b.entryFk = e.id
+				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN item i ON i.id = b.itemFk 
+				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN itemType it ON it.id = i.typeFk
+				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id 
-				JOIN auctionConfig ac
+					AND bu.warehouseFk = wh.id
+				JOIN buy b ON b.id = bu.buyFk
 				JOIN volumeConfig vc
-			WHERE t.shipped = vDated
+			WHERE ic.display
-				AND t.warehouseInFk = ac.warehouseFk
+			GROUP BY it.workerFk
-			GROUP BY it.workerFk;
+			HAVING bought;
 
 	UPDATE stockBought s
 			JOIN tStockBought ts ON ts.workerFk = s.workerFk
@@ -45,8 +51,12 @@ BEGIN
 	INSERT INTO stockBought (workerFk, reserve, dated)
 		SELECT ts.workerFk, ts.reserve, vDated
 			FROM tStockBought ts
-			WHERE ts.workerFk NOT IN (SELECT workerFk FROM stockBought WHERE dated = vDated);
+			WHERE ts.workerFk NOT IN (
+				SELECT workerFk
+					FROM stockBought
+					WHERE dated = vDated
+			);
 
-	DROP TEMPORARY TABLE tStockBought;
+	DROP TEMPORARY TABLE tStockBought, tmp.item, tmp.buyUltimate;
 END$$
 DELIMITER ;

db/routines/vn/procedures/stockBuyedByWorker.sql

@@ -23,7 +23,7 @@ BEGIN
 		WHERE dated = vDated
 			AND userFk = vWorker;
 
-	CALL stockTraslation(vDated);
+	CALL item_calculateStock(vDated);
 
 	INSERT INTO stockBuyed(userFk, buyed, `dated`, reserved, requested, description)
 		SELECT it.workerFk,

db/routines/vn/procedures/stockBuyed_add.sql

@@ -18,7 +18,7 @@ BEGIN
 
 	DELETE FROM stockBuyed WHERE dated = vDated;
 
-	CALL stockTraslation(vDated);
+	CALL item_calculateStock(vDated);
 
 	INSERT INTO stockBuyed(userFk, buyed, `dated`, description)
 		SELECT it.workerFk,

db/routines/vn/procedures/ticket_mergeSales.sql

@@ -3,19 +3,12 @@ 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
@@ -25,25 +18,26 @@ BEGIN
 				JOIN itemType it ON it.id = i.typeFk
 			WHERE s.ticketFk = vSelf
 				AND it.isMergeable
-			GROUP BY s.itemFk, s.price, s.discount
+			GROUP BY s.itemFk, s.price, s.discount;
-			HAVING COUNT(*) > 1;
 
-	SELECT COUNT(*) INTO vHasSalesToMerge
+	START TRANSACTION;
-	 	FROM tSalesToPreserve;
 
-	IF vHasSalesToMerge THEN 
 	UPDATE sale s 
 			JOIN tSalesToPreserve stp ON stp.id = s.id
-			SET s.quantity = newQuantity;
+		SET s.quantity = newQuantity
+		WHERE s.ticketFk = vSelf;
 
-		DELETE s
+	DELETE s.*
 		FROM sale s
-				JOIN tSalesToPreserve stp ON stp.itemFk = s.itemFk
+			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 s.id <> stp.id;
+			AND stp.id IS NULL
-	END IF;
+			AND it.isMergeable;
 
 	COMMIT;
+
 	DROP TEMPORARY TABLE tSalesToPreserve;
 END$$
 DELIMITER ;

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
  */

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
+	DECLARE vTicket INT;
-		(PRIMARY KEY (id))
+	DECLARE vDone BOOL;
-		ENGINE = MEMORY
+
-		SELECT t.id, SUM(s.quantity * ic.cm3delivery / 1000000) volume
+	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
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-			JOIN tTicket tt ON tt.id = t.id
-		SET t.volume = tt.volume;
 
-	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 ;

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -5,54 +5,81 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 )
 BEGIN
 /**
- * Clona y reparte las líneas de ventas de un ticket en funcion del tipo de empaquetado.
+ * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
- * Respeta el id de ticket inicial para el tipo de empaquetado propuesto.
+ * 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 vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
-	DECLARE vHasItemPackingType BOOL;
-	DECLARE vItemPackingTypeFk INT;
 	DECLARE vNewTicketFk INT;
+	DECLARE vPackingTypesToSplit INT;
+	DECLARE vDone INT DEFAULT FALSE;
 
-	DECLARE vItemPackingTypes CURSOR FOR 
+	DECLARE vSaleGroup CURSOR FOR
-		SELECT DISTINCT itemPackingTypeFk 
+		SELECT itemPackingTypeFk
-			FROM tSalesToMove;
+			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
+	START TRANSACTION;
-			FROM ticket t	
+
-				JOIN sale s ON s.ticketFk = t.id
+	SELECT id
+		FROM sale
+		WHERE ticketFk = vSelf
+			AND NOT quantity
+		FOR UPDATE;
+
+	DELETE FROM sale
+		WHERE NOT quantity
+		AND ticketFk = vSelf;
+
+	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
-			WHERE t.id = vSelf
+				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
-				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
+			WHERE s.ticketFk = vSelf;
 
-	IF NOT vHasItemPackingType THEN
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
-		CALL util.throw('The ticket has not sales with the itemPackingType');	
+		ENGINE = MEMORY
-	END IF;
+		SELECT itemPackingTypeFk, SUM(litros) totalLitros
+			FROM tSale
+			GROUP BY itemPackingTypeFk;
 
-	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
+	SELECT COUNT(*) INTO vPackingTypesToSplit
+		FROM tSaleGroup
+		WHERE itemPackingTypeFk IS NOT NULL;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
-		saleFk INT,
+		itemPackingTypeFk VARCHAR(1)
-		itemPackingTypeFk INT
+	) ENGINE = MEMORY;
-	) ENGINE=MEMORY;
 
-	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
+	CASE vPackingTypesToSplit
-		SELECT s.id, i.itemPackingTypeFk 
+		WHEN 0 THEN
-			FROM ticket t	
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				JOIN sale s ON s.ticketFk = t.id
+				VALUES(vSelf, vItemPackingTypeFk);
-				JOIN item i ON i.id = s.itemFk 
+		WHEN 1 THEN
-			WHERE t.id = vSelf
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
+				SELECT vSelf, itemPackingTypeFk
+					FROM tSaleGroup
+					WHERE itemPackingTypeFk IS NOT NULL;
+		ELSE
+			OPEN vSaleGroup;
+			FETCH vSaleGroup INTO vItemPackingTypeFk;
 
-	OPEN vItemPackingTypes;
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				VALUES(vSelf, vItemPackingTypeFk);
 
 			l: LOOP
 				SET vDone = FALSE;
-		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
+				FETCH vSaleGroup INTO vItemPackingTypeFk;
 
 				IF vDone THEN
 					LEAVE l;
@@ -60,29 +87,40 @@ BEGIN
 
 				CALL ticket_Clone(vSelf, vNewTicketFk);
 
-		UPDATE tSalesToMove
+				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-			SET ticketFk = vNewTicketFk
+					VALUES(vNewTicketFk, vItemPackingTypeFk);
-			WHERE itemPackingTypeFk = vItemPackingTypeFk;
-
 			END LOOP;
 
-	CLOSE vItemPackingTypes;
+			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  tSalesToMove stm ON stm.saleFk = s.id
+					JOIN tSale ts ON ts.id = s.id
-		SET s.ticketFk = stm.ticketFk
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
-		WHERE stm.ticketFk;
+				SET s.ticketFk = t.ticketFk;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
-		ticketFk INT,
+				FROM tSaleGroup sg
-		itemPackingTypeFk VARCHAR(1)
+				WHERE sg.itemPackingTypeFk IS NOT NULL
-	) ENGINE=MEMORY
+				ORDER BY sg.itemPackingTypeFk
-		SELECT ticketFk, itemPackingTypeFk
+				LIMIT 1;
-			FROM tSalesToMove
-			GROUP BY ticketFk
-		UNION
-		SELECT vSelf, vOriginalItemPackingTypeFk;
 
-	DROP TEMPORARY TABLE tSalesToMove;
+			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 ;

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,13 +14,14 @@ 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 *
 			FROM workerHierarchy

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';

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.';

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.';

db/versions/11246-whiteMonstera/00-firstScript.sql

@@ -0,0 +1 @@
+DELETE FROM salix.ACL WHERE model = 'Worker' AND property = 'findById' AND principalId = 'employee';

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');

db/versions/11248-azureOrchid/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.`zone`
+	ADD COLUMN IF NOT EXISTS itemMaxLength int(11) NULL COMMENT 'Longitud maxima para articulos acostados que esa agencia puede transportar',
+	MODIFY COLUMN itemMaxSize int(11) DEFAULT NULL NULL COMMENT 'Altura maxima de los articulos que esa agencia puede transportar';

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;

db/versions/11253-limeChico/00-firstScript.sql

@@ -0,0 +1,3 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Postcode','*','WRITE','ALLOW','ROLE','administrative');
+

db/versions/11255-maroonRaphis/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.worker
+	CHANGE isF11Allowed isF11Allowed__ TINYINT(1) NOT NULL DEFAULT 0 COMMENT '@deprecated 2024-09-22';

db/versions/11256-grayFern/00-firstScript.sql

@@ -0,0 +1,6 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Province','*','WRITE','ALLOW','ROLE','administrative');
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Town','*','WRITE','ALLOW','ROLE','administrative');
+

db/versions/11258-silverTulip/00-firstScript.sql

@@ -0,0 +1,31 @@
+-- vn.priceDelta definition
+
+CREATE OR REPLACE TABLE vn.priceDelta (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `itemTypeFk` smallint(5) unsigned NOT NULL,
+  `minSize` int(10) unsigned DEFAULT NULL COMMENT 'Minimum item.size',
+  `maxSize` int(10) unsigned DEFAULT NULL COMMENT 'Maximum item.size',
+  `inkFk` varchar(3) DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `producerFk` mediumint(3) unsigned DEFAULT NULL,
+  `fromDated` date DEFAULT NULL,
+  `toDated` date DEFAULT NULL,
+  `absIncreasing` decimal(10,3) DEFAULT NULL COMMENT 'Absolute increasing of final price',
+  `ratIncreasing` int(11) DEFAULT NULL COMMENT 'Increasing ratio for the cost price',
+  `warehouseFk` smallint(6) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `editorFk` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `priceDelta_itemType_FK` (`itemTypeFk`),
+  KEY `priceDelta_ink_FK` (`inkFk`),
+  KEY `priceDelta_producer_FK` (`producerFk`),
+  KEY `priceDelta_warehouse_FK` (`warehouseFk`),
+  KEY `priceDelta_worker_FK` (`editorFk`),
+  CONSTRAINT `priceDelta_ink_FK` FOREIGN KEY (`inkFk`) REFERENCES `ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_itemType_FK` FOREIGN KEY (`itemTypeFk`) REFERENCES `itemType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_producer_FK` FOREIGN KEY (`producerFk`) REFERENCES `producer` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_warehouse_FK` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_worker_FK` FOREIGN KEY (`editorFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Defines the increasing o decreasing for ranges of items';
+
+GRANT INSERT, SELECT, UPDATE, DELETE ON TABLE vn.priceDelta TO buyer;	

db/versions/11260-navyCyca/00-firstScript.sql

@@ -0,0 +1,32 @@
+-- Place your SQL code here
+-- vn.priceDelta definition
+
+CREATE OR REPLACE TABLE vn.priceDelta (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `itemTypeFk` smallint(5) unsigned NOT NULL,
+  `minSize` int(10) unsigned DEFAULT NULL COMMENT 'Minimum item.size',
+  `maxSize` int(10) unsigned DEFAULT NULL COMMENT 'Maximum item.size',
+  `inkFk` varchar(3) DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `producerFk` mediumint(3) unsigned DEFAULT NULL,
+  `fromDated` date DEFAULT NULL,
+  `toDated` date DEFAULT NULL,
+  `absIncreasing` decimal(10,3) DEFAULT NULL COMMENT 'Absolute increasing of final price',
+  `ratIncreasing` int(11) DEFAULT NULL COMMENT 'Increasing ratio for the cost price',
+  `warehouseFk` smallint(6) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `editorFk` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `priceDelta_itemType_FK` (`itemTypeFk`),
+  KEY `priceDelta_ink_FK` (`inkFk`),
+  KEY `priceDelta_producer_FK` (`producerFk`),
+  KEY `priceDelta_warehouse_FK` (`warehouseFk`),
+  KEY `priceDelta_worker_FK` (`editorFk`),
+  CONSTRAINT `priceDelta_ink_FK` FOREIGN KEY (`inkFk`) REFERENCES `ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_itemType_FK` FOREIGN KEY (`itemTypeFk`) REFERENCES `itemType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_producer_FK` FOREIGN KEY (`producerFk`) REFERENCES `producer` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_warehouse_FK` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_worker_FK` FOREIGN KEY (`editorFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Defines the increasing o decreasing for ranges of items';
+
+GRANT INSERT, SELECT, UPDATE, DELETE ON TABLE vn.priceDelta TO buyer;	

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}}});
+        if (!ctx.accessToken) return false;
-
+        const httpCtx = {req: {accessToken: {userId: ctx.accessToken.userId}}};
-        const isSubordinate = await models.Worker.isSubordinate(ctx, +ctx.modelId);
+        return models.Worker.isSubordinate(httpCtx, +ctx.modelId);
-        if (!isSubordinate) throw new UserError(`You don't have enough privileges`);
     });
 };

modules/entry/back/methods/stock-bought/getStockBought.js

@@ -29,15 +29,13 @@ module.exports = Self => {
         dated.setHours(0, 0, 0, 0);
         today.setHours(0, 0, 0, 0);
 
-        if (dated.getTime() === today.getTime())
+        await models.StockBought.rawSql(`CALL vn.stockBought_calculate(?)`, [dated]);
-            await models.StockBought.rawSql(`CALL vn.stockBought_calculate()`);
 
         const filter = {
-            where: {
+            where: {dated},
-                dated: dated
-            },
             include: [
                 {
+                    fields: ['workerFk', 'reserve', 'bought'],
                     relation: 'worker',
                     scope: {
                         include: [

modules/entry/back/methods/stock-bought/getStockBoughtDetail.js

@@ -11,6 +11,7 @@ module.exports = Self => {
             arg: 'dated',
             type: 'string',
             description: 'The date to filter',
+            required: true,
         }
         ],
         returns: {
@@ -24,35 +25,50 @@ module.exports = Self => {
     });
 
     Self.getStockBoughtDetail = async(workerFk, dated) => {
-        if (!dated) {
+        const models = Self.app.models;
-            dated = Date.vnNew();
+        const myOptions = {};
-            dated.setHours(0, 0, 0, 0);
+        let tx;
+        let result;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
         }
-        return Self.rawSql(
+
-            `SELECT e.id entryFk,
+        try {
+            await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], myOptions);
+            result = await Self.rawSql(
+                `SELECT b.entryFk entryFk,
                         i.id itemFk,
-                    i.longName itemName,
+                        i.name itemName,
-                    b.quantity,
+                        ti.quantity,
-                    ROUND((ac.conversionCoefficient * 
+                        (ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
-                            (b.quantity / b.packing) * 
+                            / (vc.trolleyM3 * 1000000) volume,
-                            buy_getVolume(b.id)
+                        b.packagingFk packagingFk,
-                        ) / (vc.trolleyM3 * 1000000), 
-                        2
-                    ) volume,
-                    b.packagingFk,
                         b.packing
-                FROM entry e
+                    FROM tmp.item ti
-                    JOIN travel t ON t.id = e.travelFk 
+                        JOIN item i ON i.id = ti.itemFk
-                    JOIN buy b ON b.entryFk = e.id
+                        JOIN itemType it ON i.typeFk = it.id
-                    JOIN item i ON i.id = b.itemFk 
+                        JOIN itemCategory ic ON ic.id = it.categoryFk
-                    JOIN itemType it ON it.id = i.typeFk
                         JOIN worker w ON w.id = it.workerFk
                         JOIN auctionConfig ac
+                        JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+                            AND bu.warehouseFk = ac.warehouseFk
+                        JOIN buy b ON b.id = bu.buyFk
                         JOIN volumeConfig vc
-                WHERE t.warehouseInFk = ac.warehouseFk
+                    WHERE ic.display
-                    AND it.workerFk = ?
+                        AND w.id = ?`,
-                    AND t.shipped = util.VN_CURDATE()`,
+                [workerFk], myOptions
-            [workerFk]
             );
+            await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], myOptions);
+            if (tx) await tx.commit();
+            return result;
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     };
 };

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

@@ -63,7 +63,7 @@ module.exports = Self => {
                     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;`,
         [shelvingFk, shelvingFk], myOptions);
         return result;
     };

modules/item/back/methods/item/specs/lastEntriesFilter.spec.js

@@ -1,6 +1,6 @@
 const {models} = require('vn-loopback/server/server');
 describe('item lastEntriesFilter()', () => {
-    it('should return one entry for the given item', async() => {
+    it('should return two entry for the given item', async() => {
         const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
         const maxDate = Date.vnNew();
@@ -13,7 +13,7 @@ describe('item lastEntriesFilter()', () => {
             const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
             const result = await models.Item.lastEntriesFilter(filter, options);
 
-            expect(result.length).toEqual(1);
+            expect(result.length).toEqual(2);
 
             await tx.rollback();
         } catch (e) {
@@ -22,7 +22,7 @@ describe('item lastEntriesFilter()', () => {
         }
     });
 
-    it('should return five entries for the given item', async() => {
+    it('should return six entries for the given item', async() => {
         const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
         minDate.setMonth(minDate.getMonth() - 2, 1);
@@ -37,7 +37,7 @@ describe('item lastEntriesFilter()', () => {
             const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
             const result = await models.Item.lastEntriesFilter(filter, options);
 
-            expect(result.length).toEqual(5);
+            expect(result.length).toEqual(6);
 
             await tx.rollback();
         } catch (e) {

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;
+        if (user?.active && account)
-        else ctx.args.recipient = reportMail;
+            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');
     };
 };

modules/supplier/back/methods/supplier/filter.js

@@ -92,10 +92,13 @@ module.exports = Self => {
                     s.payDay,
                     s.phone,
                     s.city,
+                    s.countryFk,
+                    c.name country,
                     pm.name AS payMethod,
                     pd.payDem AS payDem
                 FROM vn.supplier s
                     LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+                    LEFT JOIN vn.country c ON c.id = s.countryFk
                     LEFT JOIN vn.payDem pd ON pd.id = s.payDemFk`
         );
 

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"

modules/travel/back/methods/travel/filter.js

@@ -79,6 +79,10 @@ module.exports = Self => {
                 arg: 'landingHour',
                 type: 'string',
                 description: 'The landing hour'
+            }, {
+                arg: 'daysOnward',
+                type: 'number',
+                description: 'The days onward'
             }
         ],
         returns: {
@@ -92,8 +96,11 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter) => {
-        let conn = Self.dataSource.connector;
+        const conn = Self.dataSource.connector;
-        let where = buildFilter(ctx.args, (param, value) => {
+        const today = Date.vnNew();
+        const future = Date.vnNew();
+
+        const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
@@ -109,6 +116,12 @@ module.exports = Self => {
                 return {'t.landed': {gte: value}};
             case 'landedTo':
                 return {'t.landed': {lte: value}};
+            case 'daysOnward':
+
+                today.setHours(0, 0, 0, 0);
+                future.setDate(today.getDate() + value);
+                future.setHours(23, 59, 59, 999);
+                return {'t.landed': {between: [today, future]}};
             case 'id':
             case 'agencyModeFk':
             case 'warehouseOutFk':

modules/worker/back/locale/worker/en.yml

@@ -14,7 +14,6 @@ columns:
     hasMachineryAuthorized: machinery authorized
     seniority: seniority
     isTodayRelative: today relative
-    isF11Allowed: F11 allowed
     sectorFk: sector
     maritalStatus: marital status
     labelerFk: labeler

modules/worker/back/locale/worker/es.yml

@@ -14,7 +14,6 @@ columns:
     hasMachineryAuthorized: maquinaria autorizada
     seniority: antigüedad
     isTodayRelative: relativo hoy
-    isF11Allowed: F11 autorizado
     sectorFk: sector
     maritalStatus: estado civil
     labelerFk: etiquetadora

modules/worker/back/models/worker.json

@@ -55,9 +55,6 @@
         "birth": {
             "type": "date"
         },
-        "isF11Allowed": {
-            "type": "boolean"
-        },
         "sex": {
             "type": "string"
         },
@@ -205,6 +202,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"
+            ]
         }
     }
 }

modules/zone/back/models/zone.json

@@ -42,6 +42,9 @@
 		},
 		"itemMaxSize": {
 			"type": "number"
+		},
+		"itemMaxLength": {
+			"type": "number"
 		}
 	},
 	"relations": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.40.0",
+    "version": "24.42.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/reports/previa-label/previa-label.html

@@ -19,7 +19,7 @@
                     <div class="packing">{{previa.itemPackingTypeFk}}</div>
                     <div class="dated">{{previa.shippingHour}}:{{previa.shippingMinute}}</div>
                 </div>
-                <div class="size">{{previa.items}}</div>
+                <div class="size">{{previa.previousLines}}</div>
             </div>
         </div>
     </div>