Merge branch 'dev' into 6822-entryTransfer

CHANGELOG.md

@@ -1,3 +1,89 @@
+# Version 24.38 - 2024-09-17
+
+### Added 🆕
+
+- chore: refs #7323 filter data  by:jorgep
+- chore: refs #7323 fix test  by:jorgep
+- chore: refs #7323 worker changes  by:jorgep
+- chore: refs #7323 worker changes wip  by:jorgep
+- chore: refs #7524 add select limit  by:jorgep
+- feat(AccessToken&ACL): refs #7547 upgrade security  by:alexm
+- feat: deleted code and redirect to Lilium  by:Jon
+- feat: refs #4515 New throw buy_checkItem  by:guillermo
+- feat: refs #6650 Added saleGroupLog  by:guillermo
+- feat: refs #6650 new itemShelvingLog  by:guillermo
+- feat: refs #6760 refs #actualiza campo nickname  by:jgallego
+- feat: refs #7277 fdescribe  by:jgallego
+- feat: refs #7277 fit  by:jgallego
+- feat: refs #7277 refundInvoices  by:jgallego
+- feat: refs #7277 test with warehouse  by:jgallego
+- feat: refs #7277 traducciones  by:jgallego
+- feat: refs #7277 transfer addressFk  by:jgallego
+- feat: refs #7532 Requested changes  by:guillermo
+- feat: refs #7564 Added proc  by:guillermo
+- feat: refs #7564 Added ticket_setVolumeItemCost  by:guillermo
+- feat: refs #7564 Added volume column  by:guillermo
+- feat: refs #7564 Fix version  by:guillermo
+- feat: refs #7564 Requested changes  by:guillermo
+- feat: refs #7615 setDeleted  by:robert
+- feat: refs #7650 Added no transfer lines to inventory entry and fixtures  by:guillermo
+- feat: refs #7650 Fix tests  by:guillermo
+- feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval  by:ivanm
+- feat: refs #7759 Changed defined only of vn objects  by:guillermo
+- feat: refs #7759 Changed definer root to vn-admin  by:guillermo
+- feat: refs #7759 Changed name  by:guillermo
+- feat: refs #7759 Deleted version 11163-maroonEucalyptus  by:guillermo
+- feat: refs #7759 Revoke routine grants vn  by:guillermo
+- feat: refs #7811 Added comment  by:guillermo
+- feat: refs #7811 Added new params in datasources.json  by:guillermo
+- feat: refs #7898 Add column "floor" in vn.parking  by:ivanm
+- feat: refs #7898 Modify default  by:ivanm
+- feat: refs #7905 Added new method getBuysCsv  by:guillermo
+- feat: refs #7905 Added param toCsv  by:guillermo
+- feat: refs #7938 remove unnecessary insert in clientLog  by:alexm
+- feat: refs #7953 pullinfo  (7953-devToTest_2438) by:alexm
+- feat(salix): #7671 define isDestiny field in model  by:Javier Segarra
+- feat(salix): refs #7896 update version and changelog  (origin/7896_down_devToTest_2436) by:Javier Segarra
+- feat(salix): refs #7905 #7905 use getBuys toCSV flattened  by:Javier Segarra
+- feat(ssalix): refs #7671 #7671 checkDates  by:Javier Segarra
+- feat(ssalix): refs #7671 #7671 checkDates to present  by:Javier Segarra
+- feat: ticket 215005 Changed acl show transferClient  by:guillermo
+
+### Changed 📦
+
+- perf: refs #7671 improve showBadDates  by:Javier Segarra
+- perf(salix): refs #7671 #7671 imrpove and revert where changes  by:Javier Segarra
+- refactor: deleted e2e & added back descriptor and summary  by:Jon
+
+### Fixed 🛠️
+
+- chore: refs #7323 fix test  by:jorgep
+- feat: refs #7650 Added no transfer lines to inventory entry and fixtures  by:guillermo
+- fix  by:guillermo
+- fixes: refs #7760 collection problems  by:Carlos Andrés
+- fix merge dev  (7407-workerMedical) by:alexm
+- fix: refs #6727 No delete log tables data in clean procedures  by:guillermo
+- fix: refs #6897 back and tests  by:carlossa
+- fix: refs #6897 back  by:carlossa
+- fix: refs #6897 fix filter  by:carlossa
+- fix: refs #6897 fix json  by:carlossa
+- fix: refs #6897 travel filter  by:carlossa
+- fix: refs #6897 error test  by:jgallego
+- fix: refs #7323 fetch from right source  by:jorgep
+- fix: refs #7564 Deleted query  by:guillermo
+- fix: refs #7759 Added user 'vn'@'localhost' & grants  by:guillermo
+- fix: refs #7760 collection problems  by:Carlos Andrés
+- fix: refs #7760 tmp.ticketIPT  by:Carlos Andrés
+- fix: refs #7905 added comments to flatten.js  by:guillermo
+- fix: refs ##7905 Handle error  by:guillermo
+- fix(salix): refs #7905 #7905 use right fn to flatten data  by:Javier Segarra
+- perf(salix): refs #7671 #7671 imrpove and revert where changes  by:Javier Segarra
+- refs #6898 fix supplier remove  by:carlossa
+- refs #7407 fix acls fixtures  by:carlossa
+- test: fix connections e2e  (7547-accessToken-security) by:alexm
+- test: refs #7277 fix test proposal  by:Javier Segarra
+- test(salix): refs #7671 #7671 improve and revert where changes  by:Javier Segarra
+
 # Version 24.36 - 2024-09-03
 
 ### Added 🆕

back/methods/collection/assignCollection.js

@@ -19,8 +19,15 @@ module.exports = Self => {
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
-        const [info, info2, [{'@vCollectionFk': collectionFk}]] = await Self.rawSql(
+
-            'CALL vn.collection_getAssigned(?, @vCollectionFk);SELECT @vCollectionFk', [userId], myOptions);
+        const randStr = Math.random().toString(36).substring(3);
+        const result = await Self.rawSql(`
+            CALL vn.collection_getAssigned(?, @vCollectionFk);
+            SELECT @vCollectionFk ?
+            `, [userId, randStr], myOptions);
+
+        const collectionFk = result.find(item => item[0]?.[randStr] !== undefined)?.[0]?.[randStr];
+
         if (!collectionFk) throw new UserError('There are not picking tickets');
         await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);
 

back/methods/dms/updateFile.js

@@ -38,7 +38,7 @@ module.exports = Self => {
         {
             arg: 'hasFile',
             type: 'Boolean',
-            description: 'True if has an attached file'
+            description: 'True if has the original in paper'
         },
         {
             arg: 'hasFileAttached',

back/methods/mrw-config/specs/createShipment.spec.js

@@ -12,9 +12,8 @@ const ticket1 = {
     'addressFk': 1,
     'agencyModeFk': 999
 };
-
+let expedition;
 const expedition1 = {
-    'id': 17,
     'agencyModeFk': 999,
     'ticketFk': 44,
     'freightItemFk': 71,
@@ -47,7 +46,7 @@ describe('MRWConfig createShipment()', () => {
         await createMrwConfig();
 
         await models.Ticket.create(ticket1);
-        await models.Expedition.create(expedition1);
+        expedition = await models.Expedition.create(expedition1);
     });
 
     afterAll(async() => {
@@ -93,7 +92,7 @@ describe('MRWConfig createShipment()', () => {
     }
 
     it('should create a shipment and return a base64Binary label', async() => {
-        const {file} = await models.MrwConfig.createShipment(expedition1.id);
+        const {file} = await models.MrwConfig.createShipment(expedition.id);
 
         expect(file).toEqual(mockBase64Binary);
     });
@@ -101,7 +100,7 @@ describe('MRWConfig createShipment()', () => {
     it('should fail if mrwConfig has no data', async() => {
         let error;
         await models.MrwConfig.destroyAll();
-        await models.MrwConfig.createShipment(expedition1.id).catch(e => {
+        await models.MrwConfig.createShipment(expedition.id).catch(e => {
             error = e;
         }).finally(async() => {
             expect(error.message).toEqual(`MRW service is not configured`);
@@ -126,7 +125,7 @@ describe('MRWConfig createShipment()', () => {
         yesterday.setDate(yesterday.getDate() - 1);
 
         await models.Ticket.updateAll({id: ticket1.id}, {shipped: yesterday});
-        await models.MrwConfig.createShipment(expedition1.id).catch(e => {
+        await models.MrwConfig.createShipment(expedition.id).catch(e => {
             error = e;
         }).finally(async() => {
             expect(error.message).toEqual(`This ticket has a shipped date earlier than today`);
@@ -136,7 +135,7 @@ describe('MRWConfig createShipment()', () => {
 
     it('should send mail if you are past the dead line and is not notified today', async() => {
         await models.MrwConfig.updateAll({id: 1}, {expeditionDeadLine: '10:00:00', notified: null});
-        await models.MrwConfig.createShipment(expedition1.id);
+        await models.MrwConfig.createShipment(expedition.id);
         const notification = await getLastNotification();
 
         expect(notification.notificationFk).toEqual(filter.notificationFk);
@@ -144,7 +143,7 @@ describe('MRWConfig createShipment()', () => {
 
     it('should send mail if you are past the dead line and it is notified from another day', async() => {
         await models.MrwConfig.updateAll({id: 1}, {expeditionDeadLine: '10:00:00', notified: new Date()});
-        await models.MrwConfig.createShipment(expedition1.id);
+        await models.MrwConfig.createShipment(expedition.id);
         const notification = await getLastNotification();
 
         expect(notification.notificationFk).toEqual(filter.notificationFk);
@@ -152,7 +151,7 @@ describe('MRWConfig createShipment()', () => {
 
     it('should not send mail if you are past the dead line and it is notified', async() => {
         await models.MrwConfig.updateAll({id: 1}, {expeditionDeadLine: '10:00:00', notified: Date.vnNew()});
-        await models.MrwConfig.createShipment(expedition1.id);
+        await models.MrwConfig.createShipment(expedition.id);
         const notification = await getLastNotification();
 
         expect(notification).toEqual(null);

back/methods/postcode/specs/filter.spec.js

@@ -29,7 +29,7 @@ describe('Postcode filter()', () => {
                 }
             }, options);
 
-            expect(results.length).toEqual(4);
+            expect(results.length).toEqual(5);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -63,7 +63,7 @@ describe('Postcode filter()', () => {
                 search: 'one',
             }}, options);
 
-            expect(results.length).toEqual(4);
+            expect(results.length).toEqual(5);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

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/methods/vn-user/specs/renew-token.spec.js

@@ -72,9 +72,9 @@ describe('Renew Token', () => {
         }
 
         expect(error).toBeDefined();
-        const query = 'SELECT * FROM util.debug';
 
-        const debugLog = await models.Application.rawSql(query, null);
+        const query = 'SELECT * FROM util.debug WHERE variable = "renewToken"';
+        const debugLog = await models.Application.rawSql(query);
 
         expect(debugLog.length).toEqual(1);
     });

back/methods/vn-user/update-user.js

@@ -26,7 +26,7 @@ module.exports = Self => {
                 description: 'The user lang'
             }, {
                 arg: 'twoFactor',
-                type: 'string',
+                type: 'any',
                 description: 'The user twoFactor'
             }
         ],

back/model-config.json

@@ -124,6 +124,9 @@
     "Province": {
         "dataSource": "vn"
     },
+    "QuadmindsApiConfig": {
+        "dataSource": "vn"
+    },
     "Autonomy": {
         "dataSource": "vn"
     },
@@ -172,6 +175,9 @@
     "PrintConfig": {
         "dataSource": "vn"
     },
+    "QueueMember": {
+        "dataSource": "vn"
+    },
     "ViaexpressConfig": {
         "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"
+		}
+	}
+}

back/models/queue-member.json

@@ -0,0 +1,38 @@
+{
+    "name": "QueueMember",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "pbx.queueMember"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "queue": {
+            "type": "string"
+        },
+        "extension": {
+            "type": "string"
+        }
+    },
+    "relations": {
+        "queueRelation": {
+            "type": "belongsTo",
+            "model": "Queue",
+            "foreignKey": "queue",
+            "primaryKey": "name"
+        }
+    },
+    "acls": [
+        {
+            "property": "*",
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/vn-user.json

@@ -165,7 +165,8 @@
                 "hasGrant",
                 "realm",
                 "email",
-                "emailVerified"
+                "emailVerified",
+                "twoFactor"
             ]
         }
     }

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','11278','fe10f03459a153fc213bf64e352804c043f94590','2024-10-03 07:47:47','11281');
 
 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);
@@ -861,6 +862,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11083','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11084','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11086','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-27 10:02:02',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11087','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11088','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:48',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11089','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:16',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11090','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:35',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11092','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-07 08:21:23',NULL,NULL);
@@ -874,16 +876,45 @@ 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','11107','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','03-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','04-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:49',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','05-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:44:49',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','06-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:45:04',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','07-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:45:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','08-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:45:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','09-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:45:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','10-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:45:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','11-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:45:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','12-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','14-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','15-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','17-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','18-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','19-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:19',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','20-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:46:19',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','21-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','22-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','23-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11107','24-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',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','11113','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',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','11115','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',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);
 INSERT INTO `versionLog` VALUES ('vn-database','11118','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-07-19 12:28:49',NULL,NULL);
 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);
@@ -937,9 +968,11 @@ INSERT INTO `versionLog` VALUES ('vn-database','11172','14-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11172','15-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:57:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11175','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:57:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11177','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-07-30 12:42:28',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11178','00-aclSetWeight.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',NULL,NULL);
 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 +986,60 @@ 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','11210','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11210','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11210','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11210','03-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',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','11216','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',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','11219','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11221','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11222','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11223','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11224','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11225','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11225','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11225','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11227','00-addWorkerTimeControlMailAcl.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',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','11234','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:42',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11235','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11236','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11236','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11237','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',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);
+INSERT INTO `versionLog` VALUES ('vn-database','11240','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11241','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-20 09:08:25',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11246','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-18 12:39:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11247','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-19 12:10:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11248','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-23 11:12:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11249','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11253','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-20 14:41:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11255','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11256','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-23 12:18:24',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11262','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11263','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-27 12:05:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11278','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11279','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-10-02 08:05:24',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11280','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-02 08:46:50',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 +1166,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 +1404,9 @@ 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 `roleInherit` VALUES (378,101,15,19294);
+INSERT INTO `roleInherit` VALUES (379,103,121,19294);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -1340,6 +1419,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 */;
@@ -1427,7 +1507,7 @@ INSERT INTO `ACL` VALUES (112,'Defaulter','*','READ','ALLOW','ROLE','employee',N
 INSERT INTO `ACL` VALUES (113,'ClientRisk','*','READ','ALLOW','ROLE','trainee',NULL);
 INSERT INTO `ACL` VALUES (114,'Receipt','*','READ','ALLOW','ROLE','trainee',NULL);
 INSERT INTO `ACL` VALUES (115,'Receipt','*','WRITE','ALLOW','ROLE','administrative',NULL);
-INSERT INTO `ACL` VALUES (116,'BankEntity','*','*','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (116,'BankEntity','*','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (117,'ClientSample','*','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson',NULL);
 INSERT INTO `ACL` VALUES (119,'Travel','*','READ','ALLOW','ROLE','employee',NULL);
@@ -1523,8 +1603,6 @@ INSERT INTO `ACL` VALUES (234,'WorkerLog','find','READ','ALLOW','ROLE','hr',NULL
 INSERT INTO `ACL` VALUES (235,'CustomsAgent','*','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (236,'Buy','*','*','ALLOW','ROLE','buyer',NULL);
 INSERT INTO `ACL` VALUES (237,'WorkerDms','filter','*','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (238,'Town','*','WRITE','ALLOW','ROLE','deliveryAssistant',NULL);
-INSERT INTO `ACL` VALUES (239,'Province','*','WRITE','ALLOW','ROLE','deliveryAssistant',NULL);
 INSERT INTO `ACL` VALUES (241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (248,'RoleMapping','*','READ','ALLOW','ROLE','account',NULL);
 INSERT INTO `ACL` VALUES (249,'UserPassword','*','READ','ALLOW','ROLE','account',NULL);
@@ -1538,7 +1616,7 @@ INSERT INTO `ACL` VALUES (257,'FixedPrice','*','*','ALLOW','ROLE','buyer',NULL);
 INSERT INTO `ACL` VALUES (258,'PayDem','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant',NULL);
 INSERT INTO `ACL` VALUES (260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (261,'SupplierAccount','*','*','ALLOW','ROLE','administrative',NULL);
+INSERT INTO `ACL` VALUES (261,'SupplierAccount','*','WRITE','ALLOW','ROLE','administrative',783);
 INSERT INTO `ACL` VALUES (262,'Entry','*','*','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (263,'InvoiceIn','*','READ','ALLOW','ROLE','administrative',NULL);
 INSERT INTO `ACL` VALUES (264,'StarredModule','*','*','ALLOW','ROLE','$authenticated',NULL);
@@ -1559,8 +1637,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 +1647,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 +1941,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 +1964,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);
@@ -1914,7 +1991,7 @@ INSERT INTO `ACL` VALUES (699,'TicketSms','find','READ','ALLOW','ROLE','salesPer
 INSERT INTO `ACL` VALUES (701,'Docuware','upload','WRITE','ALLOW','ROLE','deliveryAssistant',NULL);
 INSERT INTO `ACL` VALUES (702,'Ticket','docuwareDownload','READ','ALLOW','ROLE','salesPerson',NULL);
 INSERT INTO `ACL` VALUES (703,'Worker','search','READ','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (704,'ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','delivery',NULL);
+INSERT INTO `ACL` VALUES (704,'ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','production',19294);
 INSERT INTO `ACL` VALUES (705,'SaleGroupDetail','deleteById','WRITE','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (706,'Ticket','setDeleted','WRITE','ALLOW','ROLE','buyer',NULL);
 INSERT INTO `ACL` VALUES (707,'DeviceLog','create','WRITE','ALLOW','ROLE','employee',NULL);
@@ -1959,7 +2036,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 +2184,35 @@ 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','employee',10578);
+INSERT INTO `ACL` VALUES (920,'QuadmindsApiConfig','*','*','ALLOW','ROLE','delivery',19295);
+INSERT INTO `ACL` VALUES (922,'SaleGroup','*','WRITE','ALLOW','ROLE','production',19294);
+INSERT INTO `ACL` VALUES (923,'Worker','__get__advancedSummary','READ','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (924,'Worker','__get__summary','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (925,'Postcode','*','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (926,'Province','*','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (927,'Town','*','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (928,'ExpeditionStateType','*','READ','ALLOW','ROLE','employee',19294);
+INSERT INTO `ACL` VALUES (929,'ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','delivery',19294);
+INSERT INTO `ACL` VALUES (930,'SupplierAccount','*','READ','ALLOW','ROLE','buyer',783);
+INSERT INTO `ACL` VALUES (931,'StockBought','*','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (932,'StockBought','*','WRITE','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (933,'Buyer','*','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (934,'Ticket','setWeight','WRITE','ALLOW','ROLE','salesPerson',10578);
+INSERT INTO `ACL` VALUES (935,'BankEntity','*','WRITE','ALLOW','ROLE','financial',10578);
+INSERT INTO `ACL` VALUES (936,'Device','handleUser','*','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (937,'WorkerTimeControlMail','count','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (938,'Worker','__get__mail','READ','ALLOW','ROLE','hr',10578);
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2202,6 +2308,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 */;
@@ -2406,6 +2513,7 @@ INSERT INTO `component` VALUES (45,'maná reclamacion',7,4,NULL,0,'manaClaim',0)
 INSERT INTO `component` VALUES (46,'recargo a particular',2,NULL,0.25,0,'individual',0);
 INSERT INTO `component` VALUES (48,'fusión de lineas',4,NULL,NULL,1,'lineFusion',0);
 INSERT INTO `component` VALUES (49,'sustitución',4,NULL,NULL,1,'substitution',0);
+INSERT INTO `component` VALUES (50,'bonus',4,NULL,NULL,1,'bonus',0);
 
 INSERT INTO `componentType` VALUES (1,'cost','coste',1,0);
 INSERT INTO `componentType` VALUES (2,NULL,'com ventas',1,1);
@@ -2426,7 +2534,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 +2545,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 +2574,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 (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
 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);
@@ -2536,7 +2645,7 @@ INSERT INTO `sample` VALUES (16,'letter-debtor-nd','Aviso reiterado por saldo de
 INSERT INTO `sample` VALUES (17,'client-lcr','Email de solicitud de datos bancarios LCR',0,1,1,0,NULL);
 INSERT INTO `sample` VALUES (18,'client-debt-statement','Extracto del cliente',1,0,1,1,'Clients');
 INSERT INTO `sample` VALUES (19,'credit-request','Solicitud de crédito',1,1,1,0,'Clients');
-INSERT INTO `sample` VALUES (20,'incoterms-authorization','Autorización de incoterms',1,1,1,0,'Clients');
+INSERT INTO `sample` VALUES (20,'incoterms-authorization','Entregas intracomunitarias recogidas por el cliente',1,1,1,0,'Clients');
 
 INSERT INTO `siiTrascendencyInvoiceIn` VALUES (1,'Operación de régimen general');
 INSERT INTO `siiTrascendencyInvoiceIn` VALUES (2,'Operaciones por las que los empresarios  satisfacen compensaciones REAGYP');
@@ -2573,48 +2682,50 @@ INSERT INTO `siiTypeInvoiceOut` VALUES (7,'R3','Factura rectificativa (Art. 80.4
 INSERT INTO `siiTypeInvoiceOut` VALUES (8,'R4','Factura rectificativa (Resto)');
 INSERT INTO `siiTypeInvoiceOut` VALUES (9,'R5','Factura rectificativa en facturas simplificadas');
 
-INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL,1,0,0,0,0,0,0,4,1,'alert');
+INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',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 (2,'Libre',2,0,'FREE',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',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 (4,'Impreso',4,0,'PRINTED',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 (5,'Preparación',6,2,'ON_PREPARATION',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');
+INSERT INTO `state` VALUES (6,'En Revisión',7,2,'ON_CHECKING',6,0,1,0,3,0,0,1,0,'warning');
-INSERT INTO `state` VALUES (7,'Sin Acabar',1,0,'NOT_READY',NULL,7,0,0,0,0,0,0,4,1,'alert');
+INSERT INTO `state` VALUES (7,'Sin Acabar',1,0,'NOT_READY',7,0,0,0,0,0,0,4,1,'alert');
-INSERT INTO `state` VALUES (8,'Revisado',8,2,'CHECKED',NULL,8,0,1,0,3,0,0,1,0,'warning');
+INSERT INTO `state` VALUES (8,'Revisado',8,2,'CHECKED',8,0,1,0,3,0,0,1,0,'warning');
-INSERT INTO `state` VALUES (9,'Encajando',9,3,'PACKING',NULL,9,0,1,0,0,0,0,1,0,NULL);
+INSERT INTO `state` VALUES (9,'Encajando',9,3,'PACKING',9,0,1,0,0,0,0,1,0,NULL);
-INSERT INTO `state` VALUES (10,'Encajado',10,3,'PACKED',NULL,10,0,1,0,0,0,0,0,0,NULL);
+INSERT INTO `state` VALUES (10,'Encajado',10,3,'PACKED',10,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (11,'Facturado',0,4,'INVOICED',NULL,11,0,1,0,0,0,0,0,0,NULL);
+INSERT INTO `state` VALUES (11,'Facturado',0,4,'INVOICED',11,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (12,'Bloqueado',0,0,'BLOCKED',NULL,12,0,0,0,0,0,0,4,1,'alert');
+INSERT INTO `state` VALUES (12,'Bloqueado',0,0,'BLOCKED',12,0,0,0,0,0,0,4,1,'alert');
-INSERT INTO `state` VALUES (13,'En Reparto',11,4,'ON_DELIVERY',NULL,13,0,1,0,0,0,0,0,0,NULL);
+INSERT INTO `state` VALUES (13,'En Reparto',11,4,'ON_DELIVERY',13,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (14,'Preparado',6,2,'PREPARED',NULL,14,0,1,0,2,0,0,1,0,'warning');
+INSERT INTO `state` VALUES (14,'Preparado',6,2,'PREPARED',14,0,1,0,2,0,0,1,0,'warning');
-INSERT INTO `state` VALUES (15,'Pte Recogida',12,4,'WAITING_FOR_PICKUP',NULL,15,0,1,0,0,0,0,0,0,NULL);
+INSERT INTO `state` VALUES (15,'Pte Recogida',12,4,'WAITING_FOR_PICKUP',15,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (16,'Entregado',13,4,'DELIVERED',NULL,16,0,1,0,0,0,0,0,0,NULL);
+INSERT INTO `state` VALUES (16,'Entregado',13,4,'DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (20,'Asignado',4,0,'PICKER_DESIGNED',NULL,20,1,0,0,0,0,0,2,0,'success');
+INSERT INTO `state` VALUES (20,'Asignado',4,0,'PICKER_DESIGNED',20,1,0,0,0,0,0,2,0,'success');
-INSERT INTO `state` VALUES (21,'Retornado',4,2,'PRINTED_BACK',6,21,0,0,0,0,0,0,2,0,'success');
+INSERT INTO `state` VALUES (21,'Retornado',4,2,'PRINTED_BACK',21,0,0,0,0,0,0,2,0,'success');
-INSERT INTO `state` VALUES (22,'Pte. Ampliar',2,0,'EXPANDABLE',NULL,22,0,0,0,0,0,0,4,1,'alert');
+INSERT INTO `state` VALUES (22,'Pte. Ampliar',2,0,'EXPANDABLE',22,0,0,0,0,0,0,4,1,'alert');
-INSERT INTO `state` VALUES (23,'URGENTE',5,2,'LAST_CALL',NULL,23,1,0,1,0,0,0,4,1,'success');
+INSERT INTO `state` VALUES (23,'URGENTE',5,2,'LAST_CALL',23,1,0,1,0,0,0,4,1,'success');
-INSERT INTO `state` VALUES (24,'Encadenado',4,0,'CHAINED',4,24,0,0,0,0,0,0,3,1,'success');
+INSERT INTO `state` VALUES (24,'Encadenado',4,0,'CHAINED',24,0,0,0,0,0,0,3,1,'success');
-INSERT INTO `state` VALUES (25,'Embarcando',3,0,'BOARDING',5,25,1,0,0,0,0,0,3,0,'alert');
+INSERT INTO `state` VALUES (25,'Embarcando',3,0,'BOARDING',25,1,0,0,0,0,0,3,0,'alert');
-INSERT INTO `state` VALUES (26,'Prep Previa',5,0,'PREVIOUS_PREPARATION',1,28,1,0,0,1,0,0,2,0,'warning');
+INSERT INTO `state` VALUES (26,'Prep Previa',5,0,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
-INSERT INTO `state` VALUES (27,'Prep Asistida',5,2,'ASSISTED_PREPARATION',7,27,0,0,0,0,0,0,2,0,'success');
+INSERT INTO `state` VALUES (27,'Prep Asistida',5,2,'ASSISTED_PREPARATION',27,0,0,0,0,0,0,2,0,'success');
-INSERT INTO `state` VALUES (28,'Previa OK',3,0,'OK PREVIOUS',3,28,1,0,1,1,1,1,3,0,'warning');
+INSERT INTO `state` VALUES (28,'Previa OK',3,0,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
-INSERT INTO `state` VALUES (29,'Previa Impreso',4,0,'PRINTED PREVIOUS',2,29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (29,'Previa Impreso',4,0,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (30,'Embarcado',4,2,'BOARD',5,30,0,0,0,2,0,0,3,0,'success');
+INSERT INTO `state` VALUES (30,'Embarcado',4,2,'BOARD',30,0,0,0,2,0,0,3,0,'success');
-INSERT INTO `state` VALUES (31,'Polizon Impreso',4,2,'PRINTED STOWAWAY',2,29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (31,'Polizon Impreso',4,2,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (32,'Polizon OK',3,2,'OK STOWAWAY',3,31,1,0,0,1,1,1,3,0,'warning');
+INSERT INTO `state` VALUES (32,'Polizon OK',3,2,'OK STOWAWAY',31,1,0,0,1,1,1,3,0,'warning');
-INSERT INTO `state` VALUES (33,'Auto_Impreso',4,0,'PRINTED_AUTO',2,29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (33,'Auto_Impreso',4,0,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',NULL,34,0,0,0,0,0,0,4,1,'alert');
+INSERT INTO `state` VALUES (34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',34,0,0,0,0,0,0,4,1,'alert');
-INSERT INTO `state` VALUES (35,'Semi-Encajado',9,3,'HALF_PACKED',NULL,10,0,1,0,0,0,0,1,0,NULL);
+INSERT INTO `state` VALUES (35,'Semi-Encajado',9,3,'HALF_PACKED',10,0,1,0,0,0,0,1,0,NULL);
-INSERT INTO `state` VALUES (36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',2,37,1,0,0,4,0,1,2,0,'warning');
+INSERT INTO `state` VALUES (36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
-INSERT INTO `state` VALUES (37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',2,29,1,0,1,0,0,1,2,0,'warning');
+INSERT INTO `state` VALUES (37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
-INSERT INTO `state` VALUES (38,'Prep Cámara',6,2,'COOLER_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning');
+INSERT INTO `state` VALUES (38,'Prep Cámara',6,2,'COOLER_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
-INSERT INTO `state` VALUES (41,'Prep Parcial',6,2,'PARTIAL_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning');
+INSERT INTO `state` VALUES (41,'Prep Parcial',6,2,'PARTIAL_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
-INSERT INTO `state` VALUES (42,'Entregado en parte',13,3,'PARTIAL_DELIVERED',NULL,16,0,1,0,0,0,0,0,0,NULL);
+INSERT INTO `state` VALUES (42,'Entregado en parte',13,3,'PARTIAL_DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (43,'Preparación por caja',6,2,'BOX_PICKING',7,42,0,0,0,2,0,0,2,0,'warning');
+INSERT INTO `state` VALUES (43,'Preparación por caja',6,2,'BOX_PICKING',42,0,0,0,2,0,0,2,0,'warning');
 
 INSERT INTO `ticketUpdateAction` VALUES (1,'Cambiar los precios en el ticket','renewPrices');
 INSERT INTO `ticketUpdateAction` VALUES (2,'Convertir en maná','mana');
 
+INSERT INTO `ticketCanAdvanceConfig` VALUES (1,5);
+
 INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0);
 
 INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL);
@@ -2627,6 +2738,7 @@ INSERT INTO `workCenter` VALUES (7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (8,'Silla-Agrario',26,NULL,NULL,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (9,'Algemesi',20,1354,60,'Fenollars, 2',523549,NULL);
 INSERT INTO `workCenter` VALUES (10,'Rubi',88,NULL,84,'Av. de la Llana, 131',549722,NULL);
+INSERT INTO `workCenter` VALUES (11,'Colombia',NULL,NULL,NULL,NULL,NULL,NULL);
 
 INSERT INTO `workerTimeControlError` VALUES (1,'IS_NOT_ALLOWED_FUTURE','No se permite fichar a futuro');
 INSERT INTO `workerTimeControlError` VALUES (2,'INACTIVE_BUSINESS','No hay un contrato en vigor');
@@ -2643,6 +2755,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 +2780,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 +2815,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 +2824,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 +2883,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 +3051,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.after.sql

@@ -1,10 +1 @@
-CREATE USER 'vn'@'localhost';
+-- Executed after dump
-
-GRANT SELECT,
-        INSERT,
-        UPDATE,
-        DELETE,
-        CREATE TEMPORARY TABLES,
-        EXECUTE,
-        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

@@ -185,6 +185,7 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
         (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 1,   1, 1, 0),
         (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 1),
         (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
+        (6,  'Warehouse six',   'vnh',   1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
         (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 1,   0, 0, 0),
         (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 1,   0, 0, 0);
 
@@ -335,21 +336,21 @@ INSERT INTO `vn`.`payDem`(`id`, `payDem`)
         (2, 20),
         (7, 0);
 
-INSERT INTO `vn`.`autonomy`(`id`, `name`, `countryFk`)
+INSERT INTO `vn`.`autonomy`(`id`, `name`, `countryFk`, `hasDailyInvoice`)
     VALUES
-        (1, 'Autonomy one',    1),
+        (1, 'Autonomy one',    1, 	1),
-        (2, 'Autonomy two',    1),
+        (2, 'Autonomy two',    1, 	0),
-        (3, 'Autonomy three',  2),
+        (3, 'Autonomy three',  2, 	0),
-        (4, 'Autonomy four',   13);
+        (4, 'Autonomy four',   13,	0);
 
 
 INSERT INTO `vn`.`province`(`id`, `name`, `countryFk`, `autonomyFk`, `warehouseFk`)
     VALUES
-        (1, 'Province one',     1, 1, NULL),
+        (1, 'Province one',     1, 	1, 	NULL),
-        (2, 'Province two',     1, 1, NULL),
+        (2, 'Province two',     1, 	1, 	NULL),
-        (3, 'Province three',   30, 2, NULL),
+        (3, 'Province three',   30,	2,	NULL),
-        (4, 'Province four',    2, 3, NULL),
+        (4, 'Province four',    2, 	3, 	NULL),
-        (5, 'Province five',    13, 4, NULL);
+        (5, 'Province five',    13,	4,	NULL);
 
 INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`)
     VALUES
@@ -365,6 +366,7 @@ INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`)
         ('46460', 2, 6),
         ('46680', 3, 6),
         ('46600', 4, 7),
+        ('46600',1, 6),
         ('EC170150', 5, 8);
 
 INSERT INTO `vn`.`clientType`(`code`, `type`)
@@ -397,7 +399,7 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
         (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
         (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
         (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
-        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 'florist','normal'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
         (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
         (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
 
@@ -544,7 +546,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (6, 'Weight',           'weight'),
         (7, 'InvoiceOut',       'invoiceOut'),
         (8, 'DropOff',          'dropOff'),
-		(9, 'Sustitución',		'substitution');
+		(9, 'Sustitución',		'substitution'),
+		(10, 'Finance',         'finance');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -821,10 +824,10 @@ INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `userFk`, `created`)
         (12, 3,  19, util.VN_NOW()),
         (13, 3,  19, util.VN_NOW()),
         (14, 3,  19, util.VN_NOW()),
-        (15, 2,  19, util.VN_NOW()),
+        (15, 10,  19, util.VN_NOW()),
         (16, 3,  19, util.VN_NOW()),
         (17, 2,  19, util.VN_NOW()),
-        (18, 2,  19, util.VN_NOW()),
+        (37, 10,  19, util.VN_NOW()),
         (19, 2,  19, util.VN_NOW()),
         (20, 1,  19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
         (21, 1,  19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
@@ -1031,19 +1034,20 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
 
 INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
     VALUES
-        (1,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, 'UR9000006041',   94, 1,   'pc1'),
+        (1,  1, 1,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, 'UR9000006041',   94, 1,   'pc1'),
-        (2,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  2,  18, 'UR9000006041',   94, 1,   NULL),
+        (2,  1, 1,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  2,  18, 'UR9000006041',   94, 1,   NULL),
-        (3,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  3,  18, 'UR9000006041',   94, 2,   NULL),
+        (3,  1, 1,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  3,  18, 'UR9000006041',   94, 2,   NULL),
-        (4,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  4,  18, 'UR9000006041',   94, 2,   NULL),
+        (4,  1, 1,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  4,  18, 'UR9000006041',   94, 2,   NULL),
-        (5,  1, 2, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 3,   NULL),
+        (5,  1, 2,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 3,   NULL),
-        (6,  7, 3, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1,  18, NULL,             94, 3,   NULL),
+        (6,  7, 3,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1,  18, NULL,             94, 3,   NULL),
-        (7,  2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),  1,  18, NULL,             94, NULL,NULL),
+        (7,  2, 4,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),  1,  18, NULL,             94, NULL,NULL),
-        (8,  3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),  1,  18, NULL,             94, 1,   NULL),
+        (8,  3, 5,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),  1,  18, NULL,             94, 1,   NULL),
-        (9,  3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 2,   NULL),
+        (9,  3, 6,  71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 2,   NULL),
-        (10, 7, 7, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (10, 7, 7,  71, util.VN_NOW(),                                   1,  18, NULL,             94, 3,   NULL),
-        (11, 7, 8, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (11, 7, 8,  71, util.VN_NOW(),                                   1,  18, NULL,             94, 3,   NULL),
-        (12, 7, 9, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (12, 7, 9,  71, util.VN_NOW(),                                   1,  18, NULL,             94, 3,   NULL),
-        (13, 1, 10,71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL);
+        (13, 1, 10, 71, util.VN_NOW(),                                   1,  18, NULL,             94, 3,   NULL),
+		(14, 1, 37, 71, util.VN_NOW(),                                   1,  18, NULL,             94, 3,   NULL);
 
 
 INSERT INTO `vn`.`expeditionState`(`id`, `created`, `expeditionFk`, `typeFk`, `userFk`)
@@ -1478,7 +1482,8 @@ INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
         (2, 1),
         (3, 2),
         (5, 6),
-        (15, 6);
+        (15, 6),
+        (17, 6);
 
 INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk)
     VALUES
@@ -1494,16 +1499,17 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
         (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);
 
 INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`)
-    VALUES
+    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1),
-        (1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000,  'first travel',     1, 1, 1),
+        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2),
-        (2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150,    2000,  'second travel',    2, 2, 2),
+        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3),
-        (3, util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00,  'third travel',     1, 1, 3),
+        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4),
-        (4, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,   'fourth travel',    0, 2, 4),
+        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5),
-        (5, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,   'fifth travel',     1, 1, 5),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6),
-        (6, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,   'sixth travel',     1, 2, 6),
+        (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),
-        (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),
-        (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),
-        (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() - 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
@@ -1516,30 +1522,31 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
         (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
         (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 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', 0, 0, '');
 
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
 
-INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleInternalWaste`, `saleExternalWaste`)
+INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleExternalWaste`, `saleFaultWaste`, `saleContainerWaste`, `saleBreakWaste`, `saleOtherWaste`)
     VALUES
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             1, 1, '1062',     '51',     '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             1, 1, '1062',     '51',     '56.20',   '56.20',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             2, 1, '35074',    '687',    '53.12',   '89.69'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             2, 1, '35074',    '687',    '53.12',   '89.69',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             3, 1, '1777',     '13',     '12.02',   '53.12'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             3, 1, '1777',     '13',     '12.02',   '53.12',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             4, 1, '3182',     '59',     '51',      '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             4, 1, '3182',     '59',     '51',      '56.20',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             5, 1, '1747',     '13',     '53.12',   '53.12'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             5, 1, '1747',     '13',     '53.12',   '53.12',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             6, 1, '7182',     '59',     '51',      '53.12'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             6, 1, '7182',     '59',     '51',      '53.12',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             7, 1, '1777',     '13',     '89.69',   '89.69'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             7, 1, '1777',     '13',     '89.69',   '89.69',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             8, 1, '4181',     '59',     '53.12',   '53.12'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             8, 1, '4181',     '59',     '53.12',   '53.12',   '56.20',   '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             9, 1, '7268',     '59',     '12.02',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             9, 1, '7268',     '59',     '12.02',   '56.20',   '56.20',   '56.20',   '56.20'),
-        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 2, 1, '-74',      '0',      '51',      '89.69'),
+        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 2, 1, '-74',      '0',      '51',      '89.69',   '56.20',   '56.20',   '56.20'),
-        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 3, 1, '-7',       '0',      '12.02',   '53.12'),
+        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 3, 1, '-7',       '0',      '12.02',   '53.12',   '56.20',   '56.20',   '56.20'),
-        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 4, 1, '1100',     '0',      '51',      '56.20'),
+        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 4, 1, '1100',     '0',      '51',      '56.20',   '56.20',   '56.20',   '56.20'),
-        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      5, 1, '848',      '-187',   '12.02',   '89.69'),
+        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      5, 1, '848',      '-187',   '12.02',   '89.69',   '56.20',   '56.20',   '56.20'),
-        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12'),
+        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
-        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20');
+        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
+	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
     VALUES
         (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
         (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
@@ -1555,7 +1562,8 @@ INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagi
         (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
         (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
         (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
+		(15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000');
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES
@@ -2436,30 +2444,32 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
         (1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1),
         (1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out',    1);
 
-INSERT INTO `vn`.`dmsType`(`id`, `name`, `readRoleFk`, `writeRoleFk`, `code`)
+INSERT INTO `vn`.`dmsType`
+		(`id`, `name`, 					`readRoleFk`, 	`writeRoleFk`, `code`)
     VALUES
-        (1,  'Facturas Recibidas',  NULL,   NULL,   'invoiceIn'),
+        (1,  	'Facturas Recibidas',  	NULL,   		NULL,   		'invoiceIn'),
-        (2,  'Doc oficial',         NULL,   NULL,   'officialDoc'),
+        (2,  	'Doc oficial',         	NULL,   		NULL,   		'officialDoc'),
-        (3,  'Laboral',             37,     37,     'hhrrData'),
+        (3,  	'Laboral',             	37,     		37,     		'hhrrData'),
-        (4,  'Albaranes recibidos', NULL,   NULL,   'deliveryNote'),
+        (4,  	'Albaranes recibidos', 	NULL,   		NULL,   		'deliveryNote'),
-        (5,  'Otros',               1,      1,      'miscellaneous'),
+        (5,  	'Otros',               	1,      		1,      		'miscellaneous'),
-        (6,  'Pruebas',             NULL,   NULL,   'tests'),
+        (6,  	'Pruebas',             	NULL,   		NULL,   		'tests'),
-        (7,  'IAE Clientes',        1,      1,      'economicActivitiesTax'),
+        (7,  	'IAE Clientes',        	1,      		1,      		'economicActivitiesTax'),
-        (8,  'Fiscal',              NULL,   NULL,   'fiscal'),
+        (8,  	'Fiscal',              	NULL,   		NULL,   		'fiscal'),
-        (9,  'Vehiculos',           NULL,   NULL,   'vehicles'),
+        (9,  	'Vehiculos',           	NULL,   		NULL,   		'vehicles'),
-        (10, 'Plantillas',          NULL,   NULL,   'templates'),
+        (10, 	'Plantillas',          	NULL,   		NULL,   		'templates'),
-        (11, 'Contratos',           NULL,   NULL,   'contracts'),
+        (11, 	'Contratos',           	NULL,   		NULL,   		'contracts'),
-        (12, 'ley de pagos',        1,      1,      'paymentsLaw'),
+        (12, 	'ley de pagos',        	1,      		1,      		'paymentsLaw'),
-        (13, 'Basura',              1,      1,      'trash'),
+        (13, 	'Basura',              	1,      		1,      		'trash'),
-        (14, 'Ticket',              1,      1,      'ticket'),
+        (14, 	'Ticket',              	1,      		1,      		'ticket'),
-        (15, 'Presupuestos',        NULL,   NULL,   'budgets'),
+        (15, 	'Presupuestos',        	NULL,   		NULL,   		'budgets'),
-        (16, 'Logistica',           NULL,   NULL,   'logistics'),
+        (16, 	'Logistica',           	NULL,   		NULL,   		'logistics'),
-        (17, 'cmr',                 1,      1,      'cmr'),
+        (17, 	'cmr',                 	1,      		1,      		'cmr'),
-        (18, 'dua',                 NULL,   NULL,   'dua'),
+        (18, 	'dua',                 	NULL,   		NULL,   		'dua'),
-        (19, 'inmovilizado',        NULL,   NULL,   'fixedAssets'),
+        (19, 	'inmovilizado',        	NULL,   		NULL,   		'fixedAssets'),
-        (20, 'Reclamación',         1,      1,      'claim'),
+        (20, 	'Reclamación',         	1,      		1,      		'claim'),
-        (21, 'Entrada',             1,      1,      'entry'),
+        (21, 	'Entrada',             	1,      		1,      		'entry'),
-		(22, 'Proveedor',           1,      1,      'supplier');
+		(22, 	'Proveedor',           	1,      		1,      		'supplier'),
+		(23, 	'Termografos',			35,    			35,    			'thermograph');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2467,7 +2477,7 @@ INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `wa
         (2, 5,  '2.txt', 'text/plain', 5, 1, 442, 1,    TRUE, 'Client:104',      'Client:104 dms for the client',               util.VN_CURDATE()),
         (3, 5,  '3.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Client: 104',     'Client:104 readme',                           util.VN_CURDATE()),
         (4, 3,  '4.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Worker: 106',     'Worker:106 readme',                           util.VN_CURDATE()),
-        (5, 5,  '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1',       'dmsForThermograph',                           util.VN_CURDATE()),
+        (5, 23,  '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1',       'dmsForThermograph',                           util.VN_CURDATE()),
         (6, 5,  '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists',       'DoesNotExists',                               util.VN_CURDATE()),
         (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
         (8, 20, '8.mp4', 'video/mp4',  9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
@@ -2488,7 +2498,7 @@ INSERT INTO `vn`.`clientDms`(`clientFk`, `dmsFk`)
         (1104, 2),
         (1104, 3);
 
-INSERT INTO `vn`.`workerDocument`(`id`, `worker`, `document`,`isReadableByWorker`)
+INSERT INTO `vn`.`workerDms`(`id`, `workerFk`, `dmsFk`,`isReadableByWorker`)
     VALUES
         (1, 1106, 4, TRUE),
         (2, 1107, 3, FALSE);
@@ -2517,14 +2527,15 @@ INSERT INTO `vn`.`thermograph`(`id`, `model`)
         ('138350-0',        'DISPOSABLE');
 
 
-INSERT INTO `vn`.`travelThermograph`(`thermographFk`, `created`, `warehouseFk`, `travelFk`, `temperatureFk`, `result`, `dmsFk`)
+INSERT INTO `vn`.`travelThermograph`
+		(`thermographFk`, 	`created`,										`warehouseFk`, `travelFk`, `temperatureFk`,	`minTemperature`,	`maxTemperature`,	`result`, 						`dmsFk`)
     VALUES
-        ('TMM190901395',    util.VN_CURDATE(),                              1, 1,       'WARM', 'Ok',                           NULL),
+        ('TMM190901395',    util.VN_CURDATE(),                              1, 				1,       	'WARM', 		NULL,				NULL,				'Ok',                           NULL),
-        ('TL.BBA85422',     DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 2,       'COOL', 'Ok',                           NULL),
+        ('TL.BBA85422',     DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 				2,       	'COOL', 		NULL,				NULL,				'Ok',                           NULL),
-        ('TL.BBA85422',     util.VN_CURDATE(),                              2, 1,       'COOL', 'can not read the temperature', NULL),
+        ('TL.BBA85422',     util.VN_CURDATE(),                              2, 				1,       	'COOL', 		NULL,				NULL,				'can not read the temperature', NULL),
-        ('TZ1905012010',    util.VN_CURDATE(),                              1, 1,       'WARM', 'Temperature in range',         5),
+        ('TZ1905012010',    util.VN_CURDATE(),                              1, 				1,       	'WARM', 		NULL,				NULL,				'Temperature in range',         5),
-        ('138350-0',        DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1,       'WARM', NULL,                           5),
+        ('138350-0',        DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 				1,       	'WARM', 		2,					12,					NULL,                           5),
-        ('138350-0',        util.VN_CURDATE(),                              1, NULL,    'COOL', NULL,                           NULL);
+        ('138350-0',        util.VN_CURDATE(),                              1, 				NULL,    	'COOL', 		NULL,				NULL,				NULL,                           NULL);
 
 REPLACE INTO `vn`.`incoterms`(`code`, `name`)
     VALUES
@@ -2573,18 +2584,18 @@ INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate
         (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25),
         (util.VN_CURDATE(), 1, 12, 17, 22, 27);
 
-INSERT INTO `vn`.`dua` (id, code, awbFk__, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk)
+INSERT INTO `vn`.`dua` (id, code, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk)
     VALUES
-        (1,  '19ES0028013A481523', 1,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95,   442),
+        (1,  '19ES0028013A481523', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95,   442),
-        (2,  '21ES00280136115760', 2,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20,    442),
+        (2,  '21ES00280136115760', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20,    442),
-        (3,  '19ES00280131956004', 3,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50,   442),
+        (3,  '19ES00280131956004', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50,   442),
-        (4,  '19ES00280131955995', 4,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 8242.50,    442),
+        (4,  '19ES00280131955995', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 8242.50,    442),
-        (5,  '19ES00280132022070', 5,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 10012.49,   442),
+        (5,  '19ES00280132022070', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 10012.49,   442),
-        (6,  '19ES00280132032308', 6,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 19914.25,   442),
+        (6,  '19ES00280132032308', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 19914.25,   442),
-        (7,  '19ES00280132025489', 7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1934.06,    442),
+        (7,  '19ES00280132025489', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1934.06,    442),
-        (8,  '19ES00280132025490', 8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 3618.52,    442),
+        (8,  '19ES00280132025490', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 3618.52,    442),
-        (9,  '19ES00280132025491', 9,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23,    442),
+        (9,  '19ES00280132025491', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23,    442),
-        (10, '19ES00280132025492', 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45,    442);
+        (10, '19ES00280132025492', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45,    442);
 
 INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroValue`)
     VALUES
@@ -3057,9 +3068,6 @@ INSERT INTO `vn`.`workerTimeControlMail` (`id`, `workerFk`, `year`, `week`, `sta
         (3, 9, 2000, 51, 'CONFIRMED',    util.VN_NOW(), 1, NULL),
         (4, 9, 2001, 1, 'SENDED',       util.VN_NOW(), 1, NULL);
 
-INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `maxWagonHeight`, `minHeightBetweenTrays`, `maxTrays`)
-    VALUES
-        (1, 1350, 1900, 200, 50, 6);
 
 INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`)
     VALUES
@@ -3068,15 +3076,19 @@ INSERT INTO `vn`.`wagonTypeColor` (`id`, `name`, `rgb`)
         (3, 'green', '#00ff00'),
         (4, 'blue', '#0000ff');
 
+INSERT INTO `vn`.`wagonConfig` (`id`, `width`, `height`, `maxWagonHeight`, `minHeightBetweenTrays`, `maxTrays`, `defaultTrayColorFk`)
+    VALUES
+        (1, 1350, 1900, 200, 50, 6, 1);
+
 INSERT INTO `vn`.`wagonType` (`id`, `name`, `divisible`)
     VALUES
         (1, 'Wagon Type #1', 1);
 
-INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
+INSERT INTO `vn`.`wagonTypeTray` (`id`, `wagonTypeFk`, `height`, `wagonTypeColorFk`)
     VALUES
-        (1, 1, 100, 1),
+        (1, 1, 0, 1),
         (2, 1, 50, 2),
-        (3, 1, 0, 3);
+        (3, 1, 100, 3);
 
 INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`)
     VALUES
@@ -3180,7 +3192,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,1);
 
 
 INSERT IGNORE INTO vn.intrastat
@@ -3931,6 +3943,11 @@ INSERT INTO vn.medicalReview
 (id, workerFk, centerFk, `date`, `time`, isFit, amount, invoice, remark)
 VALUES(3, 9, 2, '2000-01-01', '8:00', 1, 150.0, NULL, NULL);
 
+INSERT INTO vn.stockBought (workerFk, bought, reserve, dated)		
+    VALUES(35, 1.00, 1.00, '2001-01-01');		
+INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)	
+	VALUES (1,0.6,6);
+
 INSERT INTO vn.payrollComponent
 (id, name, isSalaryAgreed, isVariable, isException)
 	VALUES
@@ -3969,6 +3986,28 @@ VALUES
 		(5, 'Referencia Nominas', 'payRef'),
 		(6, 'ABA', 'aba');
 
-INSERT IGNORE INTO ormConfig 
+INSERT IGNORE INTO ormConfig
     SET id =1,
         selectLimit = 1000;
+
+INSERT INTO pbx.queueMultiConfig
+	SET id = 'ring',
+		strategy = 20,
+		timeout = 2,
+		retry = 0,
+		weight = 0,
+		maxLen = 0,
+		ringInUse = 0;
+
+INSERT INTO pbx.queue (description, name, config)
+    VALUES ('X-men', '1000', 1),
+        ('Avengers', '2000', 1);
+
+INSERT IGNORE INTO pbx.queueMember
+    SET queue = '1000',
+        extension = '1010';
+
+UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
+UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
+
+

db/routines/bs/procedures/waste_addSales.sql

@@ -1,8 +1,22 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`(
+	vDateFrom DATE, 
+	vDateTo DATE
+)
 BEGIN
- 	DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
+/**
-	DECLARE vDateTo DATE DEFAULT vDateFrom + INTERVAL 6 DAY;
+ * Recalcula las mermas de un periodo.
+ * 
+ * @param vDateFrom Fecha desde
+ * @param vDateTo Fecha hasta
+ */
+	IF vDateFrom IS NULL THEN
+		SET vDateFrom = util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
+	END IF;
+
+	IF vDateTo IS NULL THEN
+		SET vDateTo = vDateFrom + INTERVAL 6 DAY;
+	END IF;
 
 	CALL cache.last_buy_refresh(FALSE);
 
@@ -14,16 +28,32 @@ BEGIN
 				s.itemFk,
 				SUM((b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity),
 				SUM(IF(aw.`type`, s.quantity, 0)),
-				SUM(
+				SUM(IF(
-					IF(
+						aw.`type` = 'external',
-						aw.`type` = 'internal',
 						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
 						0
 					)
-				),		
+				),
-				SUM(
+				SUM(IF(
-					IF(
+						aw.`type` = 'fault',
-						aw.`type` = 'external',
+						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
+						0
+					)
+				),
+				SUM(IF(
+						aw.`type` = 'container',
+						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
+						0
+					)
+				),
+				SUM(IF(
+						aw.`type` = 'break',
+						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
+						0
+					)
+				),
+				SUM(IF(
+						aw.`type` = 'other',
 						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
 						0
 					)
@@ -40,6 +70,6 @@ BEGIN
 				JOIN vn.buy b ON b.id = lb.buy_id
 			WHERE t.shipped BETWEEN vDateFrom AND vDateTo
 				AND w.isManaged
-			GROUP BY i.id;
+			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id;
 END$$
 DELIMITER ;

db/routines/bs/procedures/waste_addSalesLauncher.sql

@@ -0,0 +1,6 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSalesLauncher`()
+BEGIN
+	CALL waste_addSales(NULL, NULL);
+END$$
+DELIMITER ;

db/routines/edi/events/floramondo.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `edi`.`floramondo`
-	ON SCHEDULE EVERY 6 MINUTE
-		STARTS '2022-01-28 09:52:45.000'
-	ON COMPLETION NOT PRESERVE
-	DISABLE
-DO CALL edi.floramondo_offerRefresh()$$
-DELIMITER ;

db/routines/edi/procedures/floramondo_offerRefresh.sql

@@ -1,522 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`floramondo_offerRefresh`()
-proc: BEGIN
-	DECLARE vLanded DATETIME;
-	DECLARE vDone INT DEFAULT FALSE;
-	DECLARE vFreeId INT;
-	DECLARE vSupplyResponseFk INT;
-	DECLARE vLastInserted DATETIME;
-	DECLARE vIsAuctionDay BOOLEAN;
-	DECLARE vMaxNewItems INT DEFAULT 10000;
-	DECLARE vStartingTime DATETIME;
-	DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
-	DECLARE vDayRange INT;
-
-	DECLARE cur1 CURSOR FOR
-		SELECT id
-			FROM edi.item_free;
-
-	DECLARE cur2 CURSOR FOR
-		SELECT srId
-			FROM itemToInsert;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('edi.floramondo_offerRefresh');
-		SET @isTriggerDisabled = FALSE;
-		RESIGNAL;
-	END;
-
-	IF 'test' = (SELECT environment FROM util.config) THEN
-		LEAVE proc;
-	END IF;
-
-	IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	SELECT dayRange INTO vDayRange 
-		FROM offerRefreshConfig;
-
-	IF vDayRange IS NULL THEN
-		CALL util.throw("Variable vDayRange not declared");
-	END IF;
-
-	SET vStartingTime = util.VN_NOW();
-
-	TRUNCATE edi.offerList;
-
-	INSERT INTO edi.offerList(supplier, total)
-		SELECT v.name, COUNT(DISTINCT sr.ID) total
-			FROM edi.supplyResponse sr
-					JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-				WHERE sr.NumberOfUnits > 0
-					AND sr.EmbalageCode != 999
-				GROUP BY sr.vmpID;
-
-	UPDATE edi.offerList o
-		JOIN (SELECT v.name, COUNT(*) total
-			FROM edi.supplyOffer sr
-				JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-				GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-		SET o.`filter` = sub.total;
-
-	-- Elimina de la lista de items libres aquellos que ya existen
-	DELETE itf.*
-		FROM edi.item_free itf
-			JOIN vn.item i ON i.id = itf.id;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp
-	(INDEX (`Item_ArticleCode`))
-	ENGINE = MEMORY
-		SELECT 	t.*
-			FROM (
-				SELECT *
-					FROM edi.supplyOffer
-					ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC,
-						NumberOfUnits DESC LIMIT 10000000000000000000) t
-		GROUP BY t.srId;
-
-	CREATE OR REPLACE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
-		INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`),
-		INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
-	ENGINE = MEMORY
-		SELECT so.*,
-				ev1.type_description s1Value,
-				ev2.type_description s2Value,
-				ev3.type_description s3Value,
-				ev4.type_description s4Value,
-				ev5.type_description s5Value,
-				ev6.type_description s6Value,
-				eif1.feature ef1,
-				eif2.feature ef2,
-				eif3.feature ef3,
-				eif4.feature ef4,
-				eif5.feature ef5,
-				eif6.feature ef6
-			FROM tmp so
-				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
-					AND eif1.presentation_order = 1
-					AND eif1.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
-					AND eif2.presentation_order = 2
-					AND eif2.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
-					AND eif3.presentation_order = 3
-					AND eif3.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
-					AND eif4.presentation_order = 4
-					AND eif4.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
-					AND eif5.presentation_order = 5
-					AND eif5.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
-					AND eif6.presentation_order = 6
-					AND eif6.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature
-					AND so.s1 = ev1.type_value
-				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature
-					AND so.s2 = ev2.type_value
-				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature
-					AND so.s3 = ev3.type_value
-				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature
-					AND so.s4 = ev4.type_value
-				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature
-					AND so.s5 = ev5.type_value
-				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature
-					AND so.s6 = ev6.type_value
-			ORDER BY Price;
-
-	DROP TEMPORARY TABLE tmp;
-
-	DELETE o
-		FROM edi.offer o
-			LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size'
-			LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size'
-			LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size'
-			LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size'
-			LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size'
-			LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size'
-			JOIN vn.floramondoConfig fc ON TRUE
-		WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
-
-	START TRANSACTION;
-
-	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
-	UPDATE IGNORE edi.offer o
-			JOIN vn.item i
-				ON i.name = o.product_name
-				AND i.subname <=> o.company_name
-				AND i.value5 <=> o.s1Value
-				AND i.value6 <=> o.s2Value
-				AND i.value7 <=> o.s3Value
-				AND i.value8 <=> o.s4Value
-				AND i.value9 <=> o.s5Value
-				AND i.value10 <=> o.s6Value
-				AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
-				AND i.EmbalageCode <=> o.EmbalageCode
-				AND i.quality <=> o.Quality
-			JOIN vn.itemType it ON it.id = i.typeFk
-			LEFT JOIN vn.sale s ON s.itemFk = i.id
-			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
-				AND t.shipped > (util.VN_CURDATE() - INTERVAL 1 WEEK)
-			LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-			LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
-			LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk
-				AND po.OrderTradeLineDateTime > (util.VN_CURDATE() - INTERVAL 1 WEEK)
-		SET i.supplyResponseFk = o.srID
-		WHERE (sr.ID IS NULL
-				OR sr.NumberOfUnits = 0
-				OR di.LatestOrderDateTime < util.VN_NOW()
-				OR di.ID IS NULL)
-			AND it.isInventory
-			AND t.id IS NULL
-			AND po.id IS NULL;
-
-	CREATE OR REPLACE TEMPORARY TABLE itemToInsert
-	ENGINE = MEMORY
-		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) itemFk
-			FROM edi.offer o
-				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
-		WHERE i.id IS NULL
-	LIMIT vMaxNewItems;
-
-	-- Reciclado de nº de item
-	OPEN cur1;
-	OPEN cur2;
-
-	read_loop: LOOP
-
-		FETCH cur2 INTO vSupplyResponseFk;
-		FETCH cur1 INTO vFreeId;
-
-		IF vDone THEN
-			LEAVE read_loop;
-		END IF;
-
-		UPDATE itemToInsert
-			SET itemFk = vFreeId
-			WHERE srId = vSupplyResponseFk;
-
-	END LOOP;
-
-	CLOSE cur1;
-	CLOSE cur2;
-
-	-- Insertamos todos los items en Articles de la oferta
-	INSERT INTO vn.item(id,
-					`name`,
-					longName,
-					subName,
-					expenseFk,
-					typeFk,
-					intrastatFk,
-					originFk,
-					supplyResponseFk,
-					numberOfItemsPerCask,
-					embalageCode,
-					quality,
-					isFloramondo)
-		SELECT iti.itemFk,
-				iti.product_name,
-				iti.product_name,
-				iti.company_name,
-				iti.expenseFk,
-				iti.itemTypeFk,
-				iti.intrastatFk,
-				iti.originFk,
-				iti.`srId`,
-				iti.NumberOfItemsPerCask,
-				iti.EmbalageCode,
-				iti.Quality,
-				TRUE
-		FROM itemToInsert iti;
-
-	-- Inserta la foto de los articulos nuevos (prioridad alta)
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
-		SELECT i.id, PictureReference
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.srId
-			WHERE PictureReference IS NOT NULL
-				AND i.image IS NULL;
-
-	INSERT INTO edi.`log`(tableName, fieldName,fieldValue)
-		SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
-			FROM vn.itemImageQueue
-			WHERE attempts = 0;
-
-	-- Inserta si se añadiesen tags nuevos
-	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
-		SELECT description, type_id FROM edi.type;
-
-	-- Desabilita el trigger para recalcular los tags al final
-	SET @isTriggerDisabled = TRUE;
-
-	-- Inserta los tags sólo en los articulos nuevos
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.product_name, 1
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Producto'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.product_name IS NULL;
-			
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.Quality, 3
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Calidad'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.Quality IS NULL;
-			
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.company_name, 4
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Productor'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.company_name IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s1Value, 5
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s1Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s2Value, 6
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s2Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s3Value, 7
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s3Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s4Value, 8
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s4Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s5Value, 9
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s5Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s6Value, 10
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s6Value IS NULL;
-
-	INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-				JOIN vn.tag t ON t.`name` = 'Color'
-				LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
-				LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id
-					AND tp.`description` = 'Hoofdkleur 1'
-				LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
-				LEFT JOIN vn.itemInk ik ON ik.longName = i.longName
-			WHERE ink.name IS NOT NULL
-				OR ik.color IS NOT NULL;
-
-	CREATE OR REPLACE TABLE tmp.item
-		(PRIMARY KEY (id))
-		SELECT i.id FROM vn.item i
-			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-
-	CALL vn.item_refreshTags();
-
-	DROP TABLE tmp.item;
-
-	SELECT MIN(LatestDeliveryDateTime) INTO vLanded
-		FROM edi.supplyResponse sr
-			JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
-			JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
-			JOIN vn.floramondoConfig fc
-		WHERE mp.isLatestOrderDateTimeRelevant
-			AND di.LatestOrderDateTime > IF(
-				fc.MaxLatestOrderHour > HOUR(util.VN_NOW()),
-				util.VN_CURDATE(),
-				util.VN_CURDATE() + INTERVAL 1 DAY);
-
-	UPDATE vn.floramondoConfig
-		SET nextLanded = vLanded
-		WHERE vLanded IS NOT NULL;
-
-	-- Elimina la oferta obsoleta
-	UPDATE vn.buy b
-			JOIN vn.entry e ON e.id = b.entryFk
-			JOIN vn.travel tr ON tr.id = e.travelFk
-			JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
-			JOIN vn.item i ON i.id = b.itemFk
-			LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
-			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
-		SET b.quantity = 0
-		WHERE (IFNULL(di.LatestOrderDateTime,util.VN_NOW()) <= util.VN_NOW()
-			OR i.supplyResponseFk IS NULL
-			OR sr.NumberOfUnits = 0)
-			AND am.name = 'LOGIFLORA'
-			AND e.isRaid;
-
-	-- Localiza las entradas de cada almacen
-	UPDATE edi.warehouseFloramondo
-		SET entryFk = vn.entry_getForLogiflora(vLanded + INTERVAL travellingDays DAY, warehouseFk);
-
-	IF vLanded IS NOT NULL THEN
-		-- Actualiza la oferta existente
-		UPDATE vn.buy b
-				JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				JOIN vn.item i ON i.id = b.itemFk
-				JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
-			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
-				b.buyingValue = o.price
-			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask
-				OR b.buyingValue <> o.price);
-
-		-- Inserta el resto
-		SET vLastInserted := util.VN_NOW();
-
-		-- Inserta la oferta
-		INSERT INTO vn.buy (
-				entryFk,
-				itemFk,
-				quantity,
-				buyingValue,
-				stickers,
-				packing,
-				`grouping`,
-				groupingMode,
-				packagingFk,
-				deliveryFk)
-			SELECT wf.entryFk,
-					i.id,
-					o.NumberOfUnits * o.NumberOfItemsPerCask quantity,
-					o.Price,
-					o.NumberOfUnits etiquetas,
-					o.NumberOfItemsPerCask packing,
-					GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
-					'packing',
-					o.embalageCode,
-					o.diId
-				FROM edi.offer o
-					JOIN vn.item i ON i.supplyResponseFk = o.srId
-					JOIN edi.warehouseFloramondo wf
-					JOIN vn.packaging p ON p.id
-						LIKE o.embalageCode
-					LEFT JOIN vn.buy b ON b.itemFk = i.id
-						AND b.entryFk = wf.entryFk
-				WHERE b.id IS NULL; -- Quitar esta linea y mirar de crear los packages a tiempo REAL
-
-			INSERT INTO vn.itemCost(
-					itemFk,
-					warehouseFk,
-					cm3,
-					cm3delivery)
-				SELECT b.itemFk,
-						wf.warehouseFk,
-						@cm3 := vn.buy_getUnitVolume(b.id),
-						IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3)
-					FROM warehouseFloramondo wf
-						JOIN vn.volumeConfig vc
-						JOIN vn.buy b ON b.entryFk = wf.entryFk
-						JOIN vn.item i ON i.id = b.itemFk
-						LEFT JOIN vn.itemCost ic ON ic.itemFk = b.itemFk
-							AND ic.warehouseFk = wf.warehouseFk
-					WHERE (ic.cm3 IS NULL OR ic.cm3 = 0)
-						ON DUPLICATE KEY UPDATE cm3 = @cm3, cm3delivery = IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3);
-
-			CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc
-			SELECT b.id
-				FROM vn.buy b
-					JOIN warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				WHERE b.created >= vLastInserted;
-		
-			CALL vn.buy_recalcPrices();
-
-			UPDATE edi.offerList o
-				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
-						FROM vn.buy b
-							JOIN vn.item i ON i.id = b.itemFk
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-							JOIN vn.warehouse w ON w.id = wf.warehouseFk
-							WHERE w.name = 'VNH'
-								AND b.quantity > 0
-						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-				SET o.vnh = sub.total;
-		
-			UPDATE edi.offerList o
-				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
-						FROM vn.buy b
-							JOIN vn.item i ON i.id = b.itemFk
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-							JOIN vn.warehouse w ON w.id = wf.warehouseFk
-							WHERE w.name = 'ALGEMESI'
-								AND b.quantity > 0
-						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-				SET o.algemesi = sub.total;
-	END IF;
-
-	DROP TEMPORARY TABLE
-		edi.offer,
-		itemToInsert;
-
-	SET @isTriggerDisabled = FALSE;
-
-	COMMIT;
-
-	-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
-	UPDATE vn.item i
-		SET typeFk = 121
-		WHERE i.longName LIKE 'Rosa Garden %'
-			AND typeFk = 17;
-
-	UPDATE vn.item i
-		SET typeFk = 156
-		WHERE i.longName LIKE 'Rosa ec %'
-			AND typeFk = 17;
-		
-	-- Refresca las fotos de los items existentes que mostramos (prioridad baja)
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url, priority)
-		SELECT i.id, sr.PictureReference, 100
-			FROM edi.supplyResponse sr
-				JOIN vn.item i ON i.supplyResponseFk = sr.ID
-				JOIN edi.supplyOffer so ON so.srId = sr.ID
-				JOIN hedera.image i2 ON i2.name = i.image 
-					AND i2.collectionFk = 'catalog'
-			WHERE i2.updated <= (UNIX_TIMESTAMP(util.VN_NOW()) - vDayRange)
-				AND sr.NumberOfUnits;
-
-	INSERT INTO edi.`log`
-		SET tableName = 'floramondo_offerRefresh',
-			fieldName = 'Tiempo de proceso',
-			fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime);
-
-	DO RELEASE_LOCK('edi.floramondo_offerRefresh');
-END$$
-DELIMITER ;

db/routines/hedera/procedures/orderRow_updateOverstocking.sql

@@ -0,0 +1,52 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
+PROCEDURE `hedera`.`orderRow_updateOverstocking`(vOrderFk INT)
+BEGIN
+/**
+* Set amount = 0 to avoid overbooking sales
+*
+* @param vOrderFk hedera.order.id
+*/
+	DECLARE vCalcFk INT;
+	DECLARE vDone BOOL;
+	DECLARE vWarehouseFk INT;
+
+	DECLARE cWarehouses CURSOR FOR
+		SELECT DISTINCT warehouseFk
+		FROM orderRow
+		WHERE orderFk = vOrderFk
+			AND shipment = util.VN_CURDATE();
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	OPEN cWarehouses;
+	checking: LOOP
+		SET vDone = FALSE;
+
+		FETCH cWarehouses INTO vWarehouseFk;
+
+		IF vDone THEN
+			LEAVE checking;
+		END IF;
+
+		CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+
+		UPDATE orderRow r
+				JOIN `order` o ON o.id = r.orderFk
+				JOIN orderConfig oc
+				JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk
+			SET r.amount = 0
+			WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < util.VN_NOW()
+				AND a.available <= 0
+				AND r.warehouseFk = vWarehouseFk
+				AND r.orderFk = vOrderFk;
+	END LOOP;
+	CLOSE cWarehouses;
+END$$
+DELIMITER ;

db/routines/hedera/procedures/order_confirmWithUser.sql

@@ -12,6 +12,7 @@ BEGIN
  * @param vUser The user identifier
  */
 	DECLARE vHasRows BOOL;
+	DECLARE vHas0Amount BOOL;
 	DECLARE vDone BOOL;
 	DECLARE vWarehouseFk INT;
 	DECLARE vShipment DATE;
@@ -21,7 +22,6 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vConcept VARCHAR(30);
 	DECLARE vAmount INT;
-	DECLARE vAvailable INT;
 	DECLARE vPrice DECIMAL(10,2);
 	DECLARE vSaleFk INT;
 	DECLARE vRowFk INT;
@@ -31,7 +31,6 @@ BEGIN
 	DECLARE vClientFk INT;
 	DECLARE vCompanyFk INT;
 	DECLARE vAgencyModeFk INT;
-	DECLARE vCalcFk INT;
 	DECLARE vIsTaxDataChecked BOOL;
 
 	DECLARE vDates CURSOR FOR
@@ -97,6 +96,20 @@ BEGIN
 		SELECT employeeFk INTO vUserFk FROM orderConfig;
 	END IF;
 
+	CALL orderRow_updateOverstocking(vSelf);
+
+	-- Check if any product has a quantity of 0
+	SELECT EXISTS (
+		SELECT id
+			FROM orderRow
+			WHERE orderFk = vSelf
+				AND amount = 0
+	) INTO vHas0Amount;
+
+	IF vHas0Amount THEN
+		CALL util.throw('Hay líneas vacías. Por favor, elimínelas');
+	END IF;
+
 	START TRANSACTION;
 
 	CALL order_checkEditable(vSelf);

db/routines/hedera/triggers/orderRow_afterInsert.sql

@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterInsert`
+	AFTER INSERT ON `orderRow`
+	FOR EACH ROW
+BEGIN
+	UPDATE `order`
+		SET rowUpdated = util.VN_NOW()
+	WHERE id = NEW.orderFk;
+END$$
+DELIMITER ;

db/routines/util/events/log_clean.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `util`.`log_clean`
+	ON SCHEDULE EVERY 1 DAY
+		STARTS '2024-07-09 00:30:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL util.log_clean$$
+DELIMITER ;

db/routines/util/procedures/log_clean.sql

@@ -0,0 +1,54 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`log_clean`()
+BEGIN
+/**
+ * Hace limpieza de los datos de las tablas log,
+ * dejando únicamente los días de retención configurados.
+ */
+	DECLARE vSchemaName VARCHAR(65);
+	DECLARE vSchemaNameQuoted VARCHAR(65);
+	DECLARE vTableName VARCHAR(65);
+	DECLARE vTableNameQuoted VARCHAR(65);
+	DECLARE vRetentionDays INT;
+	DECLARE vStarted DATETIME;
+	DECLARE vDated DATE;
+	DECLARE vDone BOOL;
+
+	DECLARE vQueue CURSOR FOR
+		SELECT schemaName, tableName, retentionDays
+			FROM logCleanMultiConfig
+			ORDER BY `order`;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	OPEN vQueue;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vQueue INTO vSchemaName, vTableName, vRetentionDays;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		IF vRetentionDays THEN
+			SET vStarted = VN_NOW();
+			SET vSchemaNameQuoted = quoteIdentifier(vSchemaName);
+			SET vTableNameQuoted = quoteIdentifier(vTableName);
+			SET vDated = VN_CURDATE() - INTERVAL vRetentionDays DAY;
+
+			EXECUTE IMMEDIATE CONCAT(
+				'DELETE FROM ', vSchemaNameQuoted,
+						'.', vTableNameQuoted,
+					" WHERE creationDate < '", vDated, "'"
+			);
+
+			UPDATE logCleanMultiConfig
+				SET `started` = vStarted,
+					`finished` = VN_NOW()
+				WHERE schemaName = vSchemaName
+					AND tableName = vTableName;
+		END IF;
+	END LOOP;
+	CLOSE vQueue;
+END$$
+DELIMITER ;

db/routines/vn/events/travel_setDelivered.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`travel_setDelivered`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`travel_setDelivered`
 	ON SCHEDULE EVERY 1 DAY
 		STARTS '2024-07-12 00:10:00.000'
 	ON COMPLETION PRESERVE

db/routines/vn/functions/MIDNIGHT.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`MIDNIGHT`(vDate DATE)
-	RETURNS datetime
-	DETERMINISTIC
-BEGIN
-	RETURN TIMESTAMP(vDate,'23:59:59');
-END$$
-DELIMITER ;

db/routines/vn/functions/entry_getForLogiflora.sql

@@ -1,64 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getForLogiflora`(vLanded DATE, vWarehouseFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	
-	/**
-	 * Devuelve una entrada para Logiflora. Si no existe la crea.
-	 * 
-	 * @param vLanded Fecha de llegada al almacén
-	 * @param vWarehouseFk Identificador de vn.warehouse
-	 */
-
-	DECLARE vTravelFk INT;
-	DECLARE vEntryFk INT;
-    	DECLARE previousEntryFk INT;
- 
-    SET vTravelFk = vn.travel_getForLogiflora(vLanded, vWarehouseFk);
-    
-    IF vLanded THEN
-    
-		SELECT IFNULL(MAX(id),0) INTO vEntryFk 
-			FROM vn.entry
-			WHERE travelFk = vTravelFk 
-				AND isRaid;
-
-		IF NOT vEntryFk THEN
-		
-			INSERT INTO vn.entry(travelFk, supplierFk, commission, companyFk, currencyFk, isRaid)
-				SELECT vTravelFk, s.id, 4, c.id, cu.id, TRUE
-					FROM vn.supplier s
-						JOIN vn.company c ON c.code = 'VNL'
-						JOIN vn.currency cu ON cu.code = 'EUR'
-					WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
-					
-			SELECT MAX(id) INTO vEntryFk 
-				FROM vn.entry
-				WHERE travelFk = vTravelFk;
-				
-		END IF;
-        
-	END IF;	
-
-	SELECT entryFk INTO previousEntryFk 
-		FROM edi.warehouseFloramondo wf
-        	WHERE wf.warehouseFk = vWarehouseFk;
-    
-	IF IFNULL(previousEntryFk,0) != vEntryFk THEN
-		
-		UPDATE buy b 
-			SET b.printedStickers = 0 
-			WHERE entryFk = previousEntryFk;
-
-		DELETE FROM buy WHERE entryFk = previousEntryFk;
-        
-		DELETE FROM entry WHERE id = previousEntryFk;
-  
-	END IF;
-	
-	RETURN vEntryFk;
-    
-END$$
-DELIMITER ;

db/routines/vn/functions/routeProposal_.sql

@@ -1,30 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`routeProposal_`(vTicketFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-
-	DECLARE vRouteFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vShipped DATETIME;
-    
-    SELECT addressFk, date(shipped) INTO vAddressFk, vShipped
-		FROM vn.ticket 
-        WHERE id = vTicketFk;
-
-	SELECT routeFk INTO vRouteFk
-		FROM
-			(SELECT t.routeFk, sum(af.friendship) friendshipSum
-				FROM vn.ticket t
-					JOIN cache.addressFriendship af ON af.addressFk2 = t.addressFk AND af.addressFk1 = vAddressFk
-				WHERE t.shipped BETWEEN vShipped and MIDNIGHT(vShipped)
-					AND t.routeFk
-				GROUP BY routeFk
-				ORDER BY friendshipSum DESC
-        ) sub
-        LIMIT 1;
-	
-	RETURN vRouteFk;
-END$$
-DELIMITER ;

db/routines/vn/functions/travel_getForLogiflora.sql

@@ -1,52 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`travel_getForLogiflora`(vLanded DATE, vWarehouseFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	
-	/**
-	 * Devuelve un número de travel para compras de Logiflora a partir de la fecha de llegada y del almacén.
-	 * Si no existe lo genera.
-	 * 
-	 * @param vLanded Fecha de llegada al almacén
-	 * @param vWarehouseFk Identificador de vn.warehouse
-	 */
-
-	DECLARE vTravelFk INT;
-
-	IF vLanded THEN
-	
-		SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk 
-			FROM vn.travel tr
-				JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
-				JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
-            		JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
-			WHERE wIn.id = vWarehouseFk
-				AND wOut.name = 'Holanda'
-                	AND am.name = 'LOGIFLORA'
-				AND landed = vLanded;
-
-		IF NOT vTravelFk THEN
-		
-			INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
-				SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id 
-					FROM vn.warehouse wOut 
-						JOIN vn.agencyMode am ON am.name = 'LOGIFLORA'
-					WHERE wOut.name = 'Holanda';
-					
-			SELECT MAX(tr.id) INTO vTravelFk 
-				FROM vn.travel tr
-					JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
-					JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
-						WHERE wIn.id = vWarehouseFk
-							AND wOut.name = 'Holanda'
-							AND landed = vLanded;
-		END IF;
-        
-	END IF;
-    
-	RETURN vTravelFk;
-    
-END$$
-DELIMITER ;

db/routines/vn/procedures/buy_getUltimate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
 	vItemFk INT,
 	vWarehouseFk SMALLINT, 
 	vDated DATE

db/routines/vn/procedures/buy_getUltimateFromInterval.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
 	vItemFk INT,
 	vWarehouseFk SMALLINT, 
 	vStarted DATE, 

db/routines/vn/procedures/buy_getVolumeByAgency.sql

@@ -1,20 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getVolumeByAgency`(vDated DATE, vAgencyFk INT)
-BEGIN
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.buy;
-	CREATE TEMPORARY TABLE tmp.buy (buyFk INT NOT NULL, PRIMARY KEY (buyFk)) ENGINE = MEMORY;
-
-	INSERT INTO tmp.buy 
-		SELECT b.id
-			FROM buy b 
-				JOIN entry e ON e.id = b.entryFk 
-				JOIN travel t ON t.id = e.travelFk 
-			WHERE t.landed = vDated
-				AND t.agencyModeFk IN (0, vAgencyFk);
-
-	CALL buy_getVolume();
-	DROP TEMPORARY TABLE tmp.buy;
-	
-END$$
-DELIMITER ;

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,18 +25,41 @@ BEGIN
 		FROM address
 		WHERE id = vAddressFk;
 
-    CREATE OR REPLACE TEMPORARY TABLE tSpecialPrice
+	CREATE OR REPLACE TEMPORARY TABLE tPriceDelta
 	(INDEX (itemFk))
-    ENGINE = MEMORY
+	ENGINE = MEMORY
-    SELECT * FROM (
+	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)
+				LEFT JOIN zoneGeo zg ON zg.id = pd.zoneGeoFk
+				LEFT JOIN zoneGeo zg2 ON zg2.id = address_getGeo(vAddressFk)
+			WHERE (pd.fromDated IS NULL OR pd.fromDated <= vShipped)
+				AND (pd.toDated IS NULL OR pd.toDated >= vShipped)
+				AND (pd.zoneGeoFk IS NULL OR zg2.lft BETWEEN zg.lft AND zg.rgt)
+			GROUP BY itemFk;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSpecialPrice
+	(INDEX (itemFk))
+	ENGINE = MEMORY
+	SELECT * FROM (
 		SELECT *
-            FROM specialPrice
+			FROM specialPrice
-            WHERE (clientFk = vClientFk OR clientFk IS NULL)
+			WHERE (clientFk = vClientFk OR clientFk IS NULL)
-                AND started <= vShipped
+			AND started <= vShipped
-                AND (ended >= vShipped OR ended IS NULL)
+			AND (ended >= vShipped OR ended IS NULL)
-            ORDER BY (clientFk = vClientFk) DESC, id DESC
+		ORDER BY (clientFk = vClientFk) DESC, id DESC
-            LIMIT 10000000000000000000) t
+		LIMIT 10000000000000000000) t
-        GROUP BY itemFk;
+		GROUP BY itemFk;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentCalculate
 	(PRIMARY KEY (itemFk, warehouseFk))
@@ -108,6 +131,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 +339,7 @@ BEGIN
 		tmp.ticketComponentBase,
 		tmp.ticketComponentRate,
 		tmp.ticketComponentCopy,
-        tSpecialPrice;
+		tPriceDelta,
+		tSpecialPrice;
 END$$
 DELIMITER ;

db/routines/vn/procedures/clean.sql

@@ -23,6 +23,13 @@ BEGIN
 	DELETE FROM messageInbox WHERE sendDate < v2Months;
 	DELETE FROM messageInbox WHERE sendDate < v2Months;
 	DELETE FROM workerTimeControl WHERE timed < v4Years;
+	DELETE FROM itemShelvingSale
+		WHERE itemShelvingFk IN (
+			SELECT id
+				FROM itemShelving
+				WHERE created < util.VN_CURDATE()
+				AND visible = 0
+		);
 	DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
 	DELETE FROM ticketDown WHERE created < util.yesterday();
 	DELETE IGNORE FROM expedition WHERE created < v26Months;
@@ -50,16 +57,10 @@ BEGIN
 	DELETE FROM claim WHERE ticketCreated < v4Years;
 	-- Robert ubicacion anterior de travelLog comentario para debug
 	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months;
-	DELETE bm
-		FROM buyMark bm
-			JOIN buy b ON b.id = bm.id
-			JOIN entry e ON e.id = b.entryFk
-			JOIN travel t ON t.id = e.travelFk
-		WHERE t.landed <= v2Months;
 	DELETE b FROM buy b
 			JOIN entryConfig e ON e.defaultEntry = b.entryFk
 		WHERE b.created < v2Months;
-	DELETE FROM stockBuyed WHERE creationDate < v2Months;
+	DELETE FROM stockBought WHERE dated < v2Months;
 	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < v2Months;
 	-- Equipos duplicados
 	DELETE w.*

db/routines/vn/procedures/clearShelvingList.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`clearShelvingList`(vShelvingFk VARCHAR(8))
-BEGIN
-	UPDATE vn.itemShelving
-		SET visible = 0
-		WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk COLLATE utf8_unicode_ci;
-END$$
-DELIMITER ;

db/routines/vn/procedures/collectionPlacement_get.sql

@@ -55,24 +55,20 @@ BEGIN
 		SELECT ts.saleFk,
 				ts.itemFk,
 				CAST(0 AS DECIMAL(10,0)) saleOrder,
-				IF(ish.visible > 0 OR iss.id, 1, 100000) *
+				(IF(ish.visible > 0 OR iss.id, 1, 100000) *
-					IFNULL(p2.pickingOrder, p.pickingOrder) `order`,
+				COALESCE(p2.pickingOrder, p.pickingOrder)) `order`,
-				TO_SECONDS(IF(iss.id,
+				TO_SECONDS(COALESCE(iss.created, ish.created)) - TO_SECONDS(MAKEDATE(IFNULL(YEAR(iss.created), YEAR(ish.created)), 1)) priority,
-					iss.created - INTERVAL vCurrentYear YEAR,
-					ish.created - INTERVAL YEAR(ish.created) YEAR)) priority,
 				CONCAT(
-					IF(iss.id,
+				IF(iss.id, CONCAT('< ', COALESCE(wk.`code`, '---'),' > '), ''),
-						CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
+				p.`code`
-						''),
+				) COLLATE utf8_general_ci placement,
-					p.`code`) COLLATE utf8_general_ci placement,
 				sh.priority shelvingPriority,
 				sh.code COLLATE utf8_general_ci shelving,
 				ish.created,
 				ish.visible,
-				IFNULL(
+				COALESCE(
-					IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),
+				IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),1) `grouping`,
-					1) `grouping`,
+				(st.code = 'previousPrepared') isPreviousPrepared,
-				st.code = 'previousPrepared' isPreviousPrepared,
 				iss.id itemShelvingSaleFk,
 				ts.ticketFk,
 				iss.id,
@@ -80,11 +76,12 @@ BEGIN
 				iss.userFk,
 				ts.quantity
 			FROM tSale ts
-				LEFT JOIN (SELECT DISTINCT saleFk
+				LEFT JOIN (SELECT st.saleFk
-								FROM saleTracking st
+							FROM saleTracking st
-									JOIN state s ON s.id = st.stateFk
+								JOIN state s ON s.id = st.stateFk
-								WHERE st.isChecked
+							WHERE st.isChecked
-									AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
+								AND s.semaphore = 1
+							GROUP BY st.saleFk) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
@@ -93,14 +90,14 @@ BEGIN
 				JOIN warehouse w ON w.id = sc.warehouseFk
 				LEFT JOIN tGrouping g ON g.itemFk = ts.itemFk
 				LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk
-					AND iss.itemShelvingFk = ish.id
+				   AND iss.itemShelvingFk = ish.id
 				LEFT JOIN worker wk ON wk.id = iss.userFk
 				LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = ts.saleFk
 				LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
 				LEFT JOIN parking p2 ON p2.id = sg.parkingFk
 			WHERE w.id = vWarehouseFk
-				AND NOT sc.isHideForPickers
+					AND NOT sc.isHideForPickers
-			HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL;
+					AND ((iss.id AND st.saleFk) OR st.saleFk IS NULL);
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))

db/routines/vn/procedures/collection_assign.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
 )
-BEGIN   
+BEGIN
 /**
  * Comprueba si existen colecciones libres que se ajustan
  * al perfil del usuario y le asigna la más antigua.
@@ -45,6 +45,12 @@ BEGIN
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	-- Si hay colecciones sin terminar, sale del proceso
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
 	CALL collection_get(vUserFk);
 
 	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, pc.maxNotAssignedCollectionLifeTime 
@@ -118,9 +124,19 @@ BEGIN
 	IF vCollectionFk IS NULL THEN
 		CALL collection_new(vUserFk, vCollectionFk);
 
-		UPDATE `collection`
+		START TRANSACTION;
-			SET workerFk = vUserFk
+
-			WHERE id = vCollectionFk;
+		SELECT workerFk INTO vCollectionWorker
+			FROM `collection` 
+			WHERE id = vCollectionFk FOR UPDATE;
+
+		IF vCollectionWorker IS NULL THEN
+			UPDATE `collection`
+				SET workerFk = vUserFk
+				WHERE id = vCollectionFk;
+		END IF;
+
+		COMMIT;
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_getAssigned.sql

@@ -5,100 +5,139 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_getAssigne
 )
 BEGIN
 /**
- * Comprueba si existen colecciones libres que se ajustan al perfil del usuario
+ * Comprueba si existen colecciones libres que se ajustan
- * y le asigna la más antigua.
+ * al perfil del usuario y le asigna la más antigua.
- * Añade un registro al semillero de colecciones y hace la reserva para la colección
+ * Añade un registro al semillero de colecciones.
- * 
+ *
  * @param vUserFk Id de usuario
  * @param vCollectionFk Id de colección
  */
 	DECLARE vHasTooMuchCollections BOOL;
-	DECLARE vItemPackingTypeFk VARCHAR(1);
+	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWarehouseFk INT;
+	DECLARE vCollectionWorker INT;
-	DECLARE vLockName VARCHAR(215);
+	DECLARE vMaxNotAssignedCollectionLifeTime TIME;
-	DECLARE vLockTime INT DEFAULT 30;
+
+	DECLARE vCollections CURSOR FOR
+		WITH collections AS (			
+			SELECT tc.collectionFk, 
+					SUM(sv.volume) volume,
+					c.saleTotalCount,
+					c.itemPackingTypeFk,
+					c.trainFk,
+					c.warehouseFk,
+					c.wagons
+				FROM vn.ticketCollection tc
+					JOIN vn.collection c ON c.id = tc.collectionFk 
+					JOIN vn.saleVolume sv ON sv.ticketFk = tc.ticketFk
+				WHERE c.workerFk IS NULL 
+					AND sv.shipped >= util.VN_CURDATE()
+				GROUP BY tc.collectionFk
+		) SELECT c.collectionFk
+			FROM collections c
+				JOIN vn.operator o
+			WHERE o.workerFk = vUserFk
+				AND (c.saleTotalCount <= o.linesLimit OR o.linesLimit IS NULL)
+				AND (c.itemPackingTypeFk = o.itemPackingTypeFk OR o.itemPackingTypeFk IS NULL)
+				AND o.numberOfWagons = c.wagons
+				AND o.trainFk = c.trainFk
+				AND o.warehouseFk = c.warehouseFk;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	-- Si hay colecciones sin terminar, sale del proceso
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		IF vLockName IS NOT NULL THEN
+		ROLLBACK;
-			DO RELEASE_LOCK(vLockName);
-		END IF;
-		
 		RESIGNAL;
 	END;
 
-	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0,
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, pc.maxNotAssignedCollectionLifeTime 
-			pc.collection_assign_lockname
+			INTO vHasTooMuchCollections, vMaxNotAssignedCollectionLifeTime
-		INTO vHasTooMuchCollections,
+		FROM productionConfig pc
-			vLockName
+			LEFT JOIN tmp.collection ON TRUE;
-		FROM tmp.collection c
-			JOIN productionConfig pc;
 
 	DROP TEMPORARY TABLE tmp.collection;
 
 	IF vHasTooMuchCollections THEN
-		CALL util.throw('There are pending collections');
+		CALL util.throw('Hay colecciones pendientes');
-	END IF;
-
-	SELECT warehouseFk, itemPackingTypeFk
-		INTO vWarehouseFk, vItemPackingTypeFk
-		FROM operator
-		WHERE workerFk = vUserFk;
-
-	SET vLockName = CONCAT_WS('/',
-		vLockName,
-		vWarehouseFk,
-		vItemPackingTypeFk
-	);
-
-	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se eliminan las colecciones sin asignar que estan obsoletas
-	INSERT INTO ticketTracking(stateFk, ticketFk)
-			SELECT s.id, tc.ticketFk
-				FROM collection c
-					JOIN ticketCollection tc ON tc.collectionFk = c.id
-					JOIN state s ON s.code = 'PRINTED_AUTO'
-					JOIN productionConfig pc 
-			WHERE c.workerFk IS NULL 
-				AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
 
-	DELETE c
+	INSERT INTO ticketTracking(stateFk, ticketFk)
-		FROM collection c
+		SELECT s.id, tc.ticketFk
-			JOIN productionConfig pc 
+			FROM `collection` c
-		WHERE c.workerFk IS NULL 
+				JOIN ticketCollection tc ON tc.collectionFk = c.id
-			AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
+				JOIN `state` s ON s.code = 'PRINTED_AUTO'
+			WHERE c.workerFk IS NULL 
+				AND TIMEDIFF(util.VN_NOW(), c.created) > vMaxNotAssignedCollectionLifeTime;
+
+	DELETE FROM `collection` 
+		WHERE workerFk IS NULL 
+			AND TIMEDIFF(util.VN_NOW(), created) > vMaxNotAssignedCollectionLifeTime;
 
 	-- Se añade registro al semillero
-	INSERT INTO collectionHotbed
+
-		SET userFk = vUserFk;
+	INSERT INTO collectionHotbed(userFk) VALUES(vUserFk);
 
 	-- Comprueba si hay colecciones disponibles que se ajustan a su configuracion
-	SELECT MIN(c.id) INTO vCollectionFk
+
-		FROM collection c 
+	OPEN vCollections;
-			JOIN operator o ON (o.itemPackingTypeFk = c.itemPackingTypeFk 
+	l: LOOP
-					OR c.itemPackingTypeFk IS NULL)
+		SET vDone = FALSE;
-				AND o.numberOfWagons = c.wagons
+		FETCH vCollections INTO vCollectionFk;
-				AND o.trainFk = c.trainFk
+
-				AND o.warehouseFk = c.warehouseFk
+		IF vDone THEN
-				AND c.workerFk IS NULL
+			LEAVE l;
-		WHERE o.workerFk = vUserFk;
+		END IF;
+
+		BEGIN
+			DECLARE EXIT HANDLER FOR SQLEXCEPTION
+			BEGIN
+				ROLLBACK;
+				SET vCollectionFk = NULL;
+				RESIGNAL;
+			END;
+
+			START TRANSACTION;
+
+			SELECT workerFk INTO vCollectionWorker
+				FROM `collection` 
+				WHERE id = vCollectionFk FOR UPDATE;
+
+			IF vCollectionWorker IS NULL THEN
+				UPDATE `collection`
+					SET workerFk = vUserFk
+					WHERE id = vCollectionFk;
+
+				COMMIT;
+				LEAVE l;
+			END IF;
+
+			ROLLBACK;
+		END;
+	END LOOP;
+	CLOSE vCollections;
 
 	IF vCollectionFk IS NULL THEN
 		CALL collection_new(vUserFk, vCollectionFk);
+		
+		START TRANSACTION;
+
+		SELECT workerFk INTO vCollectionWorker
+			FROM `collection` 
+			WHERE id = vCollectionFk FOR UPDATE;
+
+		IF vCollectionWorker IS NULL THEN
+			UPDATE `collection`
+				SET workerFk = vUserFk
+				WHERE id = vCollectionFk;
+		END IF;
+
+		COMMIT;
 	END IF;
-
-	UPDATE collection
-		SET workerFk = vUserFk
-		WHERE id = vCollectionFk;
-
 	CALL itemShelvingSale_addByCollection(vCollectionFk);
-	
-	DO RELEASE_LOCK(vLockName);
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_getTickets.sql

@@ -21,9 +21,8 @@ BEGIN
 		SELECT tob.ticketFk, tob.description 
 			FROM vn.ticketObservation tob 
 				JOIN vn.ticketCollection tc ON tc.ticketFk = tob.ticketFk
-				LEFT JOIN vn.observationType ot ON ot.id = tob.observationTypeFk
+				JOIN vn.observationType ot ON ot.id = tob.observationTypeFk AND ot.`code` = 'itemPicker' 
-			WHERE ot.`code` = 'itemPicker' 
+			WHERE tc.collectionFk = vParamFk OR tc.ticketFk = vParamFk
-				AND tc.collectionFk = vParamFk
 	)
 	SELECT t.id ticketFk, 
 			IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
@@ -46,7 +45,7 @@ BEGIN
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 		WHERE t.id = vParamFk 
 			AND t.shipped >= vYesterday
-	UNION ALL
+	UNION
 	SELECT t.id ticketFk, 
 			IF(NOT(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
 			am.name agencyName,
@@ -67,7 +66,7 @@ BEGIN
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 		WHERE tc.collectionFk = vParamFk
-	UNION ALL
+	UNION
 	SELECT sg.ticketFk,
 			NULL `level`,
 			am.name agencyName,
@@ -84,6 +83,7 @@ BEGIN
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 			LEFT JOIN vn.client c ON c.id = t.clientFk	
 		WHERE sc.id = vParamFk
-			AND t.shipped >= vYesterday;
+			AND t.shipped >= vYesterday
+			GROUP BY ticketFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_mergeSales.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
 BEGIN
 	DECLARE vDone BOOL;
 	DECLARE vTicketFk INT;

db/routines/vn/procedures/collection_new.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_new`(
-	vUserFk INT,
+	vUserFk INT, 
 	OUT vCollectionFk INT
 )
 BEGIN
@@ -128,8 +128,9 @@ BEGIN
 		SELECT TRUE 
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
-			WHERE s.code = 'PICKER_DESIGNED'
+			WHERE (s.code = 'PICKER_DESIGNED'
-				AND pb.workerCode = vWorkerCode
+				AND pb.workerCode = vWorkerCode)
+				OR s.code = 'LAST_CALL'
 		) INTO vHasAssignedTickets;
 
 	-- Se dejan en la tabla tmp.productionBuffer sólo aquellos tickets adecuados
@@ -138,8 +139,9 @@ BEGIN
 		DELETE pb
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
-			WHERE s.code <> 'PICKER_DESIGNED'
+			WHERE (s.code <> 'PICKER_DESIGNED'
-				OR pb.workerCode <> vWorkerCode;
+				OR pb.workerCode <> vWorkerCode)
+				AND s.code <> 'LAST_CALL';
 	ELSE
 		DELETE pb
 			FROM tmp.productionBuffer pb
@@ -167,31 +169,31 @@ BEGIN
 				OR LENGTH(pb.problem)
 				OR pb.lines > vLinesLimit
 				OR pb.m3 > vVolumeLimit
-				OR sub.maxSize > vSizeLimit;
+				OR sub.maxSize > vSizeLimit
+				OR pb.hasPlantTray;
 	END IF;
 
 	-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede
+
 	IF vHasUniqueCollectionTime THEN
-		
-		SELECT ticketFk INTO vFirstTicketFk
-			FROM tmp.productionBuffer
-			ORDER BY HH, 
-				mm,
-				productionOrder DESC,
-				m3 DESC,
-				agency,
-				zona,
-				routeFk,
-				ticketFk
-			LIMIT 1;
-		
 		DELETE pb 
 			FROM tmp.productionBuffer pb
 				JOIN tmp.productionBuffer pb2 ON pb2.ticketFk = vFirstTicketFk
-					AND (pb.HH <> pb2.HH OR pb.mm <> pb2.mm);
+					AND (pb.HH <> pb2.HH OR pb.mm <> pb2.mm);			
-			
 	END IF;
 
+	SELECT ticketFk INTO vFirstTicketFk
+		FROM tmp.productionBuffer
+		ORDER BY HH, 
+			mm,
+			productionOrder DESC,
+			m3 DESC,
+			agency,
+			zona,
+			routeFk,
+			ticketFk
+		LIMIT 1;
+
 	OPEN vTickets;
 	l: LOOP
 		SET vDone = FALSE;
@@ -245,7 +247,7 @@ BEGIN
 				SELECT wagon INTO vFreeWagonFk
 					FROM tTrain
 					GROUP BY wagon
-					HAVING SUM(IFNULL(ticketFk, 0)) = 0
+					HAVING COUNT(ticketFk) = 0 
 					ORDER BY wagon
 					LIMIT 1;
 
@@ -262,7 +264,7 @@ BEGIN
 							JOIN (SELECT wagon
 								FROM tTrain
 								GROUP BY wagon
-								HAVING SUM(IFNULL(ticketFk, 0)) = 0
+								HAVING COUNT(ticketFk) = 0 
 							) sub ON sub.wagon = tt.wagon;
 				END IF;
 			END IF;	
@@ -322,4 +324,4 @@ BEGIN
 		tTrain,
 		tmp.productionBuffer;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -10,7 +10,7 @@ BEGIN
 			SELECT * FROM (
 					SELECT cc.client clientFk, ci.grade
 						FROM creditClassification cc
-							JOIN creditInsurance ci ON cc.id = ci.creditClassification
+							JOIN creditInsurance ci ON cc.id = ci.creditClassificationFk
 						WHERE dateEnd IS NULL
 					ORDER BY ci.creationDate DESC
 					LIMIT 10000000000000000000) t1

db/routines/vn/procedures/expeditionPallet_build.sql

@@ -5,22 +5,26 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expeditionPallet_buil
 	vWorkerFk INT,
 	OUT vPalletFk INT
 )
-BEGIN
+proc: BEGIN
-/** Construye un pallet de expediciones.
+/** 
+ * Builds an expedition pallet.
  *
- * Primero comprueba si esas expediciones ya pertenecen a otro pallet,
+ * First, it checks if these expeditions already belong to another pallet,
- * en cuyo caso actualiza ese pallet.
+ * in which case it returns an error.
  *
- * @param vExpeditions JSON_ARRAY con esta estructura [exp1, exp2, exp3, ...]
+ * @param vExpeditions JSON_ARRAY with this structure [exp1, exp2, exp3, ...]
- * @param vArcId INT Identificador de arcRead
+ * @param vArcId INT Identifier of arcRead
- * @param vWorkerFk INT Identificador de worker
+ * @param vWorkerFk INT Identifier of worker
- * @param out vPalletFk Identificador de expeditionPallet
+ * @param out vPalletFk Identifier of expeditionPallet
  */
+
 	DECLARE vCounter INT;
 	DECLARE vExpeditionFk INT;
 	DECLARE vTruckFk INT;
 	DECLARE vPrinterFk INT;
 	DECLARE vExpeditionStateTypeFk INT;
+	DECLARE vFreeExpeditionCount INT;
+	DECLARE vExpeditionWithPallet INT;
 
 	CREATE OR REPLACE TEMPORARY TABLE tExpedition (
 		expeditionFk INT,
@@ -44,48 +48,63 @@ BEGIN
 				WHERE e.id = vExpeditionFk;
 	END WHILE;
 
-	SELECT palletFk INTO vPalletFk
+	SELECT COUNT(expeditionFk) INTO vFreeExpeditionCount 
-		FROM (
+		FROM tExpedition 
-			SELECT palletFk, count(*) n
+		WHERE palletFk IS NULL;
-				FROM tExpedition
-					WHERE palletFk > 0
-				GROUP BY palletFk
-				ORDER BY n DESC
-				LIMIT 100 
-		) sub
-		LIMIT 1;
 
-	IF vPalletFk IS NULL THEN
+	SELECT COUNT(expeditionFk) INTO vExpeditionWithPallet
-		SELECT roadmapStopFk INTO vTruckFk
+		FROM tExpedition 
-			FROM (
+		WHERE palletFk;
-				SELECT rm.roadmapStopFk, count(*) n
-					FROM routesMonitor rm
-						JOIN tExpedition e ON e.routeFk = rm.routeFk
-					GROUP BY roadmapStopFk
-					ORDER BY n DESC
-					LIMIT 1
-			) sub;
 
-		IF vTruckFk IS NULL THEN
+	IF vExpeditionWithPallet THEN
-				CALL util.throw ('TRUCK_NOT_AVAILABLE');
+		UPDATE arcRead 
-		END IF;
+			SET error = (
-
+				SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ')
-		INSERT INTO expeditionPallet SET truckFk = vTruckFk;
+					FROM tExpedition 
-
+					WHERE palletFk
-		SET vPalletFk = LAST_INSERT_ID();
+			)
+		WHERE id = vArcId;
+		LEAVE proc;
 	END IF;
 
+	IF NOT vFreeExpeditionCount THEN
+		CALL util.throw ('NO_FREE_EXPEDITIONS');
+	END IF;
+
+	SELECT roadmapStopFk INTO vTruckFk
+		FROM (
+			SELECT rm.roadmapStopFk, count(*) n
+				FROM routesMonitor rm
+					JOIN tExpedition e ON e.routeFk = rm.routeFk
+				WHERE e.palletFk IS NULL
+				GROUP BY roadmapStopFk
+				ORDER BY n DESC
+				LIMIT 1
+		) sub;
+
+	IF vTruckFk IS NULL THEN
+		CALL util.throw ('TRUCK_NOT_AVAILABLE');
+	END IF;
+
+	INSERT INTO expeditionPallet SET truckFk = vTruckFk;
+
+	SET vPalletFk = LAST_INSERT_ID();
+
 	INSERT INTO expeditionScan(expeditionFk, palletFk, workerFk)
 		SELECT expeditionFk, vPalletFk, vWorkerFk
 			FROM tExpedition
-			ON DUPLICATE KEY UPDATE palletFk = vPalletFk, workerFk = vWorkerFk;
+			WHERE palletFk IS NULL;
 
 	SELECT id INTO vExpeditionStateTypeFk
 		FROM expeditionStateType
 		WHERE code = 'PALLETIZED';
-
+	
 	INSERT INTO expeditionState(expeditionFk, typeFk)
-		SELECT expeditionFk, vExpeditionStateTypeFk FROM tExpedition;
+		SELECT expeditionFk, vExpeditionStateTypeFk 
+			FROM tExpedition
+			WHERE palletFk IS NULL;
+
+	UPDATE arcRead SET error = NULL WHERE id = vArcId;
 
 	SELECT printerFk INTO vPrinterFk FROM arcRead WHERE id = vArcId;
 

db/routines/vn/procedures/invoiceOut_newFromAddress.sql

@@ -0,0 +1,56 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`invoiceOut_newFromAddress`(
+	IN vAddressFk INT,
+	IN vSerial CHAR(2),
+	IN vMaxShipped DATE,
+	IN vCompanyFk INT,
+	IN vTaxArea VARCHAR(25),
+	IN vRef VARCHAR(25),
+	OUT vInvoiceId INT)
+BEGIN
+/**
+ * Factura los tickets de un consignatario hasta una fecha dada
+ * @param vAddressFk Id del consignatario a facturar
+ * @param vSerial Serie de factura
+ * @param vMaxShipped Fecha hasta la cual cogerá tickets para facturar
+ * @param vCompanyFk Id de la empresa desde la que se factura
+ * @param vTaxArea Tipo de iva en relacion a la empresa y al cliente, NULL por defecto
+ * @param vRef Referencia de la factura en caso que se quiera forzar, NULL por defecto
+ * @return vInvoiceId factura
+ */
+	DECLARE vIsRefEditable BOOLEAN;
+
+	IF vRef IS NOT NULL AND vSerial IS NOT NULL THEN
+		SELECT isRefEditable INTO vIsRefEditable
+			FROM invoiceOutSerial
+			WHERE code = vSerial;
+
+		IF NOT vIsRefEditable THEN
+			CALL util.throw('serial non editable');
+		END IF;
+	END IF;
+
+	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;
+	CREATE TEMPORARY TABLE `tmp`.`ticketToInvoice`
+		(PRIMARY KEY  (`id`))
+		ENGINE = MEMORY
+		SELECT id FROM ticket t
+			WHERE t.addressFk = vAddressFk
+				AND t.refFk IS NULL
+				AND t.companyFk = vCompanyFk
+				AND t.shipped BETWEEN
+					util.firstDayOfYear(vMaxShipped - INTERVAL 1 YEAR)
+					AND	util.dayend(vMaxShipped);
+
+	CALL invoiceOut_new(vSerial, util.VN_CURDATE(), vTaxArea, vInvoiceId);
+
+	UPDATE invoiceOut
+		SET `ref` = vRef
+		WHERE id = vInvoiceId
+			AND vRef IS NOT NULL;
+
+	IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
+		CALL invoiceOutBooking(vInvoiceId);
+	END IF;
+END$$
+DELIMITER ;

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/itemMinimumQuantity_check.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemMinimumQuantity_check`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemMinimumQuantity_check`(
 	vSelf INT,
 	vItemFk INT,
 	vStarted DATE,

db/routines/vn/procedures/itemShelvingMakeFromDate.sql

@@ -1,58 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingMakeFromDate`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, `vCreated` VARCHAR(22))
-BEGIN
-	
-    DECLARE vItemFk INT;
-
-    SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
-    SELECT itemFk INTO vItemFk
-        FROM vn.buy b
-        WHERE b.id = vItemFk;
-
-    IF (SELECT COUNT(*) FROM vn.shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
-
-        INSERT IGNORE INTO vn.parking(`code`) VALUES(vShelvingFk);
-        INSERT INTO vn.shelving(`code`, parkingFk)
-            SELECT vShelvingFk, id
-                FROM vn.parking
-                WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
-
-    END IF;
-
-    IF (SELECT COUNT(*) FROM vn.itemShelving 
-            WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
-                AND itemFk  = vItemFk 
-                AND packing  = vPacking) = 1 THEN
-
-        UPDATE vn.itemShelving
-            SET visible = visible+vQuantity,
-                created = vCreated
-            WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
-                AND itemFk = vItemFk
-                AND packing = vPacking;
-
-    ELSE
-        CALL cache.last_buy_refresh(FALSE);
-        INSERT INTO itemShelving(     itemFk,
-                                    shelvingFk,
-                                    visible,
-                                    created,
-                                    `grouping`,
-                                    packing,
-                                    packagingFk)
-            SELECT     vItemFk,
-                    vShelvingFk,
-                    vQuantity,
-                    vCreated,
-                    IF(vGrouping = 0, IFNULL(b.packing, vPacking), vGrouping) `grouping`,
-                    IF(vPacking = 0, b.packing, vPacking) packing,
-                    IF(vPackagingFk = '', b.packagingFk, vPackagingFk) packaging
-            FROM vn.item i
-                LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
-                LEFT JOIN vn.buy b ON b.id = lb.buy_id
-            WHERE i.id = vItemFk;
-    END IF;      
-			
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemShelvingPlacementSupplyAdd.sql

@@ -1,20 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingPlacementSupplyAdd`(vItemShelvingFk INT, vItemPlacementSupplyFk INT, vQuantity INT)
-BEGIN
-
-    INSERT INTO vn.itemShelvingPlacementSupply(   itemShelvingFk,
-                                                itemPlacementSupplyFk,
-                                                quantity,
-                                                userFk)
-        VALUES (vItemShelvingFk,
-                vItemPlacementSupplyFk,
-                vQuantity,
-                getUser());
-
-        UPDATE vn.itemShelving
-            SET visible = visible - vQuantity
-            WHERE id = vItemShelvingFk;
-                    
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemShelvingProblem.sql

@@ -38,7 +38,7 @@ BEGIN
 			AND IFNULL(sub3.transit,0) < s.quantity
 			AND s.isPicked = FALSE 
 			AND s.reserved = FALSE
-			AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE()) 
+			AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
 			AND tst.isPreviousPreparable = TRUE
 			AND t.warehouseFk = vWarehouseFk
             AND iss.sectorFk = vSectorFk

db/routines/vn/procedures/itemShelvingSale_Add.sql

@@ -18,7 +18,8 @@ BEGIN
 			getUser());
 
 	UPDATE itemShelving
-		SET visible = visible - vQuantity
+		SET visible = visible - vQuantity,
+			available = available - vQuantity
 		WHERE id = vItemShelvingFk;
 
 	UPDATE vn.saleTracking

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -48,6 +48,13 @@ proc: BEGIN
 			RESIGNAL;
 		END;
 	
+	START TRANSACTION;
+	
+	SELECT id INTO vSaleFk
+		FROM sale
+		WHERE id = vSaleFk 
+		FOR UPDATE;
+
 	SELECT MAX(p.pickingOrder), s.quantity - SUM(IFNULL(iss.quantity, 0)), s.quantity
 		INTO vLastPickingOrder, vOutStanding, vSaleQuantity
 		FROM sale s
@@ -57,7 +64,8 @@ proc: BEGIN
 			LEFT JOIN parking p ON p.id = sh.parkingFk
 		WHERE s.id = vSaleFk;
 		
-	IF vOutStanding <= 0 THEN 
+	IF vOutStanding <= 0 THEN
+		COMMIT;
 		LEAVE proc;
 	END IF;
 
@@ -75,16 +83,17 @@ proc: BEGIN
 				WHERE saleFk = vSaleFk;
 
 			IF vTotalReservedQuantity <> vSaleQuantity THEN
+			CALL util.debugAdd('itemShelvingSale_addBySale',
+				CONCAT(vSaleFk, ' - ', vSaleQuantity,' - ', vTotalReservedQuantity,'-', vOutStanding,'-', account.myUser_getId()));
+	
 				UPDATE sale 
 					SET quantity = vTotalReservedQuantity
 					WHERE id = vSaleFk;
 			END IF;
 			LEAVE l;
 		END IF;
-
+	
-		START TRANSACTION;
+	SELECT id INTO vItemShelvingFk 
-
-		SELECT id INTO vItemShelvingFk 
 			FROM itemShelving 
 			WHERE id = vItemShelvingFk 
 			FOR UPDATE;
@@ -93,7 +102,8 @@ proc: BEGIN
 		SET vOutStanding = vOutStanding - vReservedQuantity;
 		
 		IF vReservedQuantity > 0 THEN 
-
+	CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
+				CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
 			INSERT INTO itemShelvingSale(
 					itemShelvingFk,
 					saleFk,
@@ -111,9 +121,8 @@ proc: BEGIN
 				WHERE id = vItemShelvingFk;
 
 		END IF;
-
-		COMMIT;	
 	END LOOP;
 	CLOSE vItemShelvingAvailable;
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_addBySaleGroup`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_addBySaleGroup`(
 	vSaleGroupFk INT(11)
 )
 BEGIN

db/routines/vn/procedures/itemShelvingSale_addBySectorCollection.sql

@@ -30,6 +30,8 @@ BEGIN
 		FROM operator
 		WHERE workerFk = account.myUser_getId();
 
+	CALL util.debugAdd('itemShelvingSale_addBySectorCollection',CONCAT(vSectorCollectionFk,' - ', account.myUser_getId()));
+	
 	OPEN vSales;
 	l: LOOP
 		SET vDone = FALSE;

db/routines/vn/procedures/itemShelvingSale_deleteAdded.sql

@@ -0,0 +1,49 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_deleteAdded`(
+	vSelf INT(11)
+)
+proc: BEGIN
+/**
+ * Borra una reservea devolviendo la cantidad al itemShelving
+ *
+ * @param vSelf Identificador del itemShelvingSale
+ */
+	DECLARE vSaleFk INT;
+	DECLARE vHasSalesPicked BOOL;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	START TRANSACTION;
+
+	SELECT iss.saleFk INTO vSaleFk
+		FROM itemShelvingSale iss
+			JOIN sale s ON s.id = iss.saleFk
+		WHERE iss.id = vSelf AND s.isAdded
+		FOR UPDATE;
+
+	IF vSaleFk IS NULL THEN
+		CALL util.throw('The sale can not be deleted');
+	END IF;
+
+	SELECT COUNT(*) INTO vHasSalesPicked
+		FROM itemShelvingSale 
+		WHERE saleFk = vSaleFk AND isPicked;
+
+	IF vHasSalesPicked THEN
+		CALL util.throw('A sale with picked sales cannot be deleted');
+	END IF;
+
+	UPDATE itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			SET ish.available = ish.available + iss.quantity
+			WHERE iss.saleFk = vSaleFk;
+
+	DELETE FROM sale WHERE id = vSaleFk;
+
+	COMMIT;
+END$$
+DELIMITER ;

db/routines/vn/procedures/itemShelving_add.sql

@@ -46,7 +46,8 @@ BEGIN
 				AND buyFk = vBuyFk) THEN
 
 		UPDATE itemShelving
-			SET visible = visible + vQuantity
+			SET visible = visible + vQuantity,
+				available = available + vQuantity
 			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
 
 	ELSE
@@ -68,6 +69,6 @@ BEGIN
 					id
 				FROM buy b
 				WHERE id = vBuyFk;
-	END IF;
+	END IF; 
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelving_addList.sql

@@ -1,16 +1,22 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addList`(vShelvingFk VARCHAR(3), vList TEXT, vIsChecking BOOL, vWarehouseFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addList`(
+	vShelvingFk VARCHAR(3),
+	vList TEXT,
+	vIsChecking BOOL,
+	vWarehouseFk INT
+)
 BEGIN
-/* Recorre cada elemento en la colección vList.
+/**
+ * Recorre cada elemento en la colección vList.
  * Si el parámetro isChecking = FALSE, llama a itemShelving_add.
  *
  * Cuando es TRUE sólo inserta los elementos de la colección que no están ya en
- * ese shelving, actualizando los valores del campo vn.itemShelving.isChecked
+ * ese shelving, actualizando los valores del campo itemShelving.isChecked
  *
- *  param vShelvingFk Identificador de vn.shelving
+ * @param vShelvingFk Identificador de shelving
- *  param vList JSON array con esta estructura: '[value1, value2, ...]'
+ * @param vList JSON array con esta estructura: '[value1, value2, ...]'
- *  param vIsChecking Define si hay que añadir o comprobar los items
+ * @param vIsChecking Define si hay que añadir o comprobar los items
- *  param vWarehouseFk Identificador de vn.warehouse
+ * @param vWarehouseFk Identificador de warehouse
  */
 	DECLARE vListLength INT DEFAULT JSON_LENGTH(vList);
 	DECLARE vCounter INT DEFAULT 0;
@@ -20,26 +26,27 @@ BEGIN
 	DECLARE vIsChecked BOOL;
 
 	WHILE vCounter < vListLength DO
-		SET vPath = CONCAT('$[',vCounter,']');
+		SET vPath = CONCAT('$[', vCounter, ']');
-		SET vBarcode = JSON_EXTRACT(vList,vPath);
+		SET vBarcode = JSON_EXTRACT(vList, vPath);
 		SET vIsChecked = NULL;
 		IF vIsChecking THEN
 			SELECT barcodeToItem(vBarcode) INTO vItemFk;
 
-			SELECT COUNT(*) INTO vIsChecked
+			SELECT IF(COUNT(*), TRUE, FALSE) INTO vIsChecked
-				FROM vn.itemShelving
+				FROM itemShelving
 				WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
 					AND itemFk = vItemFk;
 		END IF;
 
-		IF NOT (vIsChecking AND vIsChecked) THEN
+		IF NOT vIsChecking OR NOT vIsChecked THEN
-			CALL vn.itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
+			CALL itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
 		END IF;
 
-		UPDATE vn.itemShelving
+		UPDATE itemShelving
 			SET isChecked = vIsChecked
 			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
-				AND itemFk = vItemFk AND isChecked IS NULL;
+				AND itemFk = vItemFk
+				AND isChecked IS NULL;
 
 		SET vCounter = vCounter + 1;
 	END WHILE;

db/routines/vn/procedures/itemShelving_selfConsumption.sql

@@ -6,12 +6,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_selfCons
 )
 BEGIN 
 /**
- * Leave the indicated amount on the shelf 
+ * Leave the indicated amount on the shelve
  * and create a ticket with the difference.
  * 
- * @param vShelvingFk id of the shelf where the item is located.
+ * @param vShelvingFk id of the shelve where the item is located.
  * @param vItemFk article of which the self-consumption ticket is to be created.
- * @param vQuantity amount that will stay on the shelf
+ * @param vQuantity amount that will stay on the shelve
  */
 	DECLARE vVisible INT;
 	DECLARE vClientFk INT;
@@ -80,7 +80,8 @@ BEGIN
 			WHERE id = vItemFk;
 
 	UPDATE itemShelving
-		SET visible = IF(id = vItemShelvingFk, vQuantity, 0)
+		SET visible = IF(id = vItemShelvingFk, vQuantity, 0),
+			available = IF(id = vItemShelvingFk, vQuantity, 0)
 		WHERE shelvingFk = vShelvingFk
 			AND itemFk = vItemFk;
 

db/routines/vn/procedures/itemShelving_transfer.sql

@@ -31,7 +31,8 @@ BEGIN
 	IF vNewItemShelvingFk THEN
 		UPDATE itemShelving ish
 				JOIN itemShelving ish2 ON ish2.id = vItemShelvingFk
-			SET ish.visible = ish.visible + ish2.visible
+			SET ish.visible = ish.visible + ish2.visible,
+			 	ish.available = ish.available + ish2.available
 			WHERE ish.id = vNewItemShelvingFk;
 
 		DELETE FROM itemShelving

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/item_devalueA2.sql

@@ -303,7 +303,8 @@ BEGIN
 			WHERE id = vTargetItemShelvingFk;
 	ELSE
 		UPDATE itemShelving
-			SET visible = vCurrentVisible - vQuantity
+			SET visible = vCurrentVisible - vQuantity,
+				available = GREATEST(0, available - vQuantity)
 			WHERE id = vTargetItemShelvingFk;
 	END IF;
 

db/routines/vn/procedures/item_getSimilar.sql

@@ -3,18 +3,20 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
 	vSelf INT,
 	vWarehouseFk INT,
 	vDated DATE,
-	vShowType BOOL
+	vShowType BOOL,
+	vDaysInForward INT
 )
 BEGIN
 /**
-* Propone articulos disponibles ordenados, con la cantidad
+ * Propone articulos ordenados, con la cantidad
-* de veces usado y segun sus caracteristicas.
+ * de veces usado y segun sus caracteristicas.
-*
+ *
-* @param vSelf Id de artículo
+ * @param vSelf Id de artículo
-* @param vWarehouseFk Id de almacen
+ * @param vWarehouseFk Id de almacen
-* @param vDated Fecha
+ * @param vDated Fecha
-* @param vShowType Mostrar tipos
+ * @param vShowType Mostrar tipos
-*/
+ * @param vDaysInForward Días de alcance para las ventas (https://redmine.verdnatura.es/issues/7956#note-4)
+ */
 	DECLARE vAvailableCalcFk INT;
 	DECLARE vVisibleCalcFk INT;
 	DECLARE vTypeFk INT;
@@ -43,6 +45,7 @@ BEGIN
 			WHERE i.id = vSelf
 	)
 	SELECT i.id itemFk,
+			NULL advanceable, -- https://redmine.verdnatura.es/issues/7956#note-4
 			i.longName,
 			i.subName,
 			i.tag5,

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
+			FROM vn.saleGroupDetail sgd
-			JOIN vn.sale s ON s.id = sgd.saleFk
+				JOIN vn.sale s ON s.id = sgd.saleFk
-		WHERE sgd.saleGroupFk = vSaleGroupFk
+			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

@@ -15,13 +15,11 @@ proc: BEGIN
 	DECLARE vEndingDate DATETIME;
 	DECLARE vIsTodayRelative BOOLEAN;
 
-	SELECT util.dayEnd(util.VN_CURDATE()) + INTERVAL LEAST(vScopeDays, maxProductionScopeDays) DAY
+	SELECT w.isTodayRelative, util.dayEnd(util.VN_CURDATE()) + INTERVAL LEAST(vScopeDays, pc.maxProductionScopeDays) DAY
-		INTO vEndingDate
+		INTO vIsTodayRelative,vEndingDate
-		FROM productionConfig;
+		FROM worker w
-
+			JOIN productionConfig pc
-	SELECT isTodayRelative INTO vIsTodayRelative
+		WHERE w.id = account.myUser_getId();
-		FROM worker
-			WHERE id = getUser();  -- Cambiar por account.myUser_getId(), falta dar permisos
 
 	CALL prepareTicketList(util.yesterday(), vEndingDate);
 
@@ -211,8 +209,6 @@ proc: BEGIN
 		salesInParkingCount INT DEFAULT 0)
 		ENGINE = MEMORY;
 
-	-- Insertamos todos los tickets que tienen productos parkineados
-	-- en sectores de previa, segun el sector
 	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock
 		(PRIMARY KEY(itemFk, sectorFk))
 		ENGINE = MEMORY
@@ -245,7 +241,6 @@ proc: BEGIN
 				AND s.quantity > 0
 			GROUP BY pb.ticketFk;
 
-	-- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
 	UPDATE tmp.ticketWithPrevia twp
 		JOIN (
 			SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
@@ -259,12 +254,27 @@ proc: BEGIN
 		) sub ON twp.ticketFk = sub.ticketFk
 		SET twp.salesInParkingCount = sub.salesInParkingCount;
 
-	-- Marcamos como pendientes aquellos que no coinciden las cantidades
 	UPDATE tmp.productionBuffer pb
 			JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
 		SET pb.previousWithoutParking = TRUE
 		WHERE twp.salesCount > twp.salesInParkingCount;
 
+	-- hasPlantTray
+	ALTER TABLE tmp.productionBuffer
+		ADD hasPlantTray BOOL DEFAULT FALSE;
+
+	UPDATE tmp.productionBuffer pb
+			JOIN sale s ON s.ticketFk = pb.ticketFk
+			JOIN item i ON i.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
+		SET pb.hasPlantTray = TRUE
+		WHERE p.isPlantTray
+			AND s.quantity >= b.packing
+			AND pb.isOwn;		
+
 	DROP TEMPORARY TABLE
 		tmp.productionTicket,
 		tmp.ticket,

db/routines/vn/procedures/productionSectorList.sql

@@ -55,7 +55,6 @@ BEGIN
 						i.itemPackingTypeFk,
 						isa.`size`,
 						isa.Estado,
-						isa.sectorProdPriority,
 						isa.available,
 						isa.sectorFk,
 						isa.matricula,

db/routines/vn/procedures/queueMember_updateQueue.sql

@@ -0,0 +1,29 @@
+DELIMITER $$
+
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`queueMember_updateQueue`(
+	vBusinessFk INT
+)
+BEGIN
+	/**
+	* Elimina la entrada de la cola anterior y luego inserta la nueva para un trabajador.
+	*
+	* @param vBusinessFk ID del negocio
+	*/
+	DECLARE vNewQueue VARCHAR(10);
+	DECLARE vExtension VARCHAR(10);
+	DECLARE exit handler FOR SQLEXCEPTION
+
+	SELECT d.pbxQueue, s.extension
+		INTO vNewQueue, vExtension
+		FROM business b
+			JOIN department d ON d.id = b.departmentFk
+			JOIN pbx.sip s ON s.user_id = b.workerFk
+	WHERE b.id = vBusinessFk;
+
+	DELETE FROM pbx.queueMember 
+		WHERE extension = vExtension COLLATE utf8_general_ci;
+
+	INSERT IGNORE INTO pbx.queueMember (queue, extension)
+		VALUES (vNewQueue, vExtension);
+END$$
+DELIMITER ;

db/routines/vn/procedures/sale_boxPickingPrint.sql

@@ -160,7 +160,10 @@ w1:	WHILE vQuantity >= vPacking DO
 
 		UPDATE sale SET quantity = quantity - vPacking WHERE id = vSaleFk;
 
-		UPDATE itemShelving SET visible = visible - vPacking WHERE id = vItemShelvingFk;
+		UPDATE itemShelving 
+		SET visible = visible - vPacking,
+			available = available - vPacking
+		WHERE id = vItemShelvingFk;
 
 		SET vNewSaleFk = NULL;
 

db/routines/vn/procedures/sale_getProblems.sql

@@ -40,7 +40,7 @@ BEGIN
 		isTooLittle BOOL DEFAULT FALSE,
 		isVip BOOL DEFAULT FALSE,
 		PRIMARY KEY (ticketFk, saleFk)
-	) ENGINE = MEMORY;
+	); -- No memory
 
 	INSERT INTO tmp.sale_problems(ticketFk,
 									saleFk,
@@ -51,7 +51,6 @@ BEGIN
 									hasTicketRequest,
 									isTaxDataChecked,
 									hasComponentLack,
-									hasRounding,
 									isTooLittle)
 			SELECT sgp.ticketFk,
 					s.id,
@@ -62,10 +61,6 @@ BEGIN
 					IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest,
 					IF(FIND_IN_SET('isTaxDataChecked', t.problem), FALSE, TRUE) isTaxDataChecked,
 					IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
-					IF(FIND_IN_SET('hasRounding', s.problem),
-						LEFT(GROUP_CONCAT('RE: ', i.id, ' ',  IFNULL(i.longName,'') SEPARATOR ', '), 250),
-						NULL
-					) hasRounding,
 					IF(FIND_IN_SET('isTooLittle', t.problem)
 						AND util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE,
 						TRUE, FALSE) isTooLittle
@@ -208,24 +203,31 @@ BEGIN
 						GROUP BY sgp.ticketFk
 				) sub
 			ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
+
+		-- Redondeo: cantidad incorrecta con respecto al grouping 
+		CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
+		INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
+			SELECT ticketFk, problem, saleFk
+				FROM (
+					SELECT sgp.ticketFk, 
+							s.id saleFk,
+							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,'') SEPARATOR ', '), 250) problem
+						FROM tmp.sale_getProblems sgp
+							JOIN ticket t ON t.id = sgp.ticketFk 
+								AND t.warehouseFk = vWarehouseFk
+							JOIN sale s ON s.ticketFk = sgp.ticketFk
+							JOIN item i ON i.id = s.itemFk
+							JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+							JOIN buy b ON b.id = bu.buyFk
+						WHERE MOD(s.quantity, b.`grouping`)	
+						GROUP BY sgp.ticketFk
+				)sub 
+			ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
+
+		DROP TEMPORARY TABLE tmp.buyUltimate;
 	END LOOP;
 	CLOSE vCursor;
 
-	INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
-		SELECT ticketFk, problem, saleFk
-			FROM (
-				SELECT sgp.ticketFk,
-						s.id saleFk,
-						LEFT(GROUP_CONCAT('RE: ', i.id, ' ',  IFNULL(i.longName,'') SEPARATOR ', '), 250) problem
-					FROM tmp.sale_getProblems sgp
-						JOIN ticket t ON t.id = sgp.ticketFk
-						JOIN sale s ON s.ticketFk = sgp.ticketFk
-						JOIN item i ON i.id = s.itemFk
-					WHERE FIND_IN_SET('hasRounding', s.problem)
-					GROUP BY sgp.ticketFk
-			) sub 
-		ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
-
 	DROP TEMPORARY TABLE tItemShelvingStock_byWarehouse;
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_setProblemRounding.sql

@@ -1,37 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_setProblemRounding`(
-	vSelf INT
-)
-BEGIN
-/**
- * Update the rounding problem for a sales line
- * @param vSelf Id sale
- */
-	DECLARE vItemFk INT;
-	DECLARE vWarehouseFk INT;
-	DECLARE vShipped DATE;
-	DECLARE vQuantity INT;
-	DECLARE vIsProblemCalcNeeded BOOL;
-
-	SELECT s.itemFk, t.warehouseFk, t.shipped, s.quantity, ticket_isProblemCalcNeeded(t.id) 
-			INTO vItemFk, vWarehouseFk, vShipped, vQuantity, vIsProblemCalcNeeded
-		FROM sale s 
-			JOIN ticket t ON t.id = s.ticketFk 
-		WHERE s.id = vSelf;
-
-	CALL buy_getUltimate(vItemFk, vWarehouseFk, vShipped);	
-	
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale 
-		SELECT vSelf saleFk, 
-				MOD(vQuantity, b.`grouping`) hasProblem,
-				vIsProblemCalcNeeded isProblemCalcNeeded
-			FROM tmp.buyUltimate bu
-				JOIN buy b ON b.id = bu.buyFk
-			WHERE bu.itemFk = vItemFk;
-
-	CALL sale_setProblem('hasRounding');
-
-	DROP TEMPORARY TABLE tmp.sale;
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_setProblemRoundingByBuy.sql

@@ -1,75 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblemRoundingByBuy`(
-	vBuyFk INT
-)
-BEGIN
-/**
- * Update rounding problem for all sales related to a buy.
- *
- * @param vBuyFk Buy id
- */
-	DECLARE vItemFk INT;
-	DECLARE vWarehouseFk INT;
-	DECLARE vMaxDated DATE;
-	DECLARE vMinDated DATE;
-	DECLARE vLanding DATE;
-	DECLARE vLastBuy INT;
-	DECLARE vCurrentBuy INT;
-	DECLARE vGrouping INT;
-
-	SELECT b.itemFk, t.warehouseInFk
-			INTO vItemFk, vWarehouseFk
-		FROM buy b 
-			JOIN entry e ON e.id = b.entryFk
-			JOIN travel t ON t.id = e.travelFk
-		WHERE b.id = vBuyFk;
-
-	IF vItemFk AND vWarehouseFk THEN
-		SELECT DATE(MAX(t.shipped)) + INTERVAL 1 DAY, DATE(MIN(t.shipped))
-				INTO vMaxDated, vMinDated 
-			FROM sale s 
-				JOIN ticket t ON t.id = s.ticketFk 
-			WHERE t.shipped >= util.VN_CURDATE()
-				AND s.itemFk = vItemFk
-				AND s.quantity > 0;
-		
-		CALL buy_getUltimate(vItemFk, vWarehouseFk, vMinDated);
-
-		SELECT bu.buyFk, b.grouping INTO vLastBuy, vGrouping
-			FROM tmp.buyUltimate bu
-				JOIN buy b ON b.id = bu.buyFk;
-			
-		DROP TEMPORARY TABLE tmp.buyUltimate;
-		
-		SET vLanding = vMaxDated;
-
-		WHILE vCurrentBuy <> vLastBuy OR vLanding > vMinDated DO
-			SET vMaxDated = vLanding - INTERVAL 1 DAY; 
-			
-			CALL buy_getUltimate(vItemFk, vWarehouseFk, vMaxDated);
-			
-			SELECT buyFk, landing
-					INTO vCurrentBuy, vLanding
-				FROM tmp.buyUltimate;
-			
-			DROP TEMPORARY TABLE tmp.buyUltimate;
-		END WHILE;
-
-		CREATE OR REPLACE TEMPORARY TABLE tmp.sale
-			(INDEX(saleFk, isProblemCalcNeeded))
-			ENGINE = MEMORY
-			SELECT s.id saleFk, 
-					MOD(s.quantity, vGrouping) hasProblem, 
-					ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
-				FROM sale s 
-					JOIN ticket t ON t.id = s.ticketFk 
-				WHERE s.itemFk = vItemFk
-					AND s.quantity > 0
-					AND t.shipped BETWEEN vMinDated AND util.dayEnd(vMaxDated);
-
-		CALL sale_setProblem('hasRounding');
-
-		DROP TEMPORARY TABLE tmp.sale;
-	END IF;
-END$$
-DELIMITER ;

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

@@ -0,0 +1,62 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBought_calculate`(
+	vDated DATE
+)
+proc: BEGIN
+/**
+ * Calculate the stock of the auction warehouse from the inventory date to vDated
+ * without taking into account the outputs of the same day vDated
+ *
+ * @param vDated Date to calculate the stock.
+ */
+	IF vDated < util.VN_CURDATE() THEN
+		LEAVE proc;
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tStockBought
+		SELECT workerFk, reserve
+			FROM stockBought
+			WHERE dated = vDated
+				AND reserve;
+
+	DELETE FROM stockBought WHERE dated = vDated;
+
+	CALL item_calculateStock(vDated);
+
+	INSERT INTO stockBought(workerFk, bought, dated)
+		SELECT it.workerFk,
+				ROUND(SUM(
+						(ti.quantity / b.packing) *
+						buy_getVolume(b.id)
+					) / vc.palletM3 / 1000000, 1) bought,
+				vDated
+			FROM itemType it
+				JOIN item i ON i.typeFk = it.id
+				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
+				JOIN itemCategory ic ON ic.id = it.categoryFk
+				JOIN warehouse wh ON wh.code = 'VNH'
+				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+					AND bu.warehouseFk = wh.id
+				JOIN buy b ON b.id = bu.buyFk
+				JOIN volumeConfig vc
+			WHERE ic.display
+			GROUP BY it.workerFk
+			HAVING bought;
+
+	UPDATE stockBought s
+			JOIN tStockBought ts ON ts.workerFk = s.workerFk
+				SET s.reserve = ts.reserve
+		WHERE s.dated = vDated;
+
+	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
+			);
+
+	DROP TEMPORARY TABLE tStockBought, tmp.item, tmp.buyUltimate;
+END$$
+DELIMITER ;

db/routines/vn/procedures/stockBuyedByWorker.sql

@@ -1,74 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyedByWorker`(
-	vDated DATE,
-	vWorker INT
-)
-BEGIN
-/**
- * Inserta el volumen de compra de un comprador
- * en stockBuyed de acuerdo con la fecha.
- *
- * @param vDated Fecha de compra
- * @param vWorker Id de trabajador
- */
-	CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
-		(INDEX (userFk))
-		ENGINE = MEMORY
-		SELECT requested, reserved, userFk
-			FROM stockBuyed
-			WHERE dated = vDated
-				AND userFk = vWorker;
-
-	DELETE FROM stockBuyed
-		WHERE dated = vDated
-			AND userFk = vWorker;
-
-	CALL stockTraslation(vDated);
-
-	INSERT INTO stockBuyed(userFk, buyed, `dated`, reserved, requested, description)
-		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
-				vDated,
-				sb.reserved,
-				sb.requested,
-				u.name
-			FROM itemType it
-				JOIN item i ON i.typeFk = it.id
-				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-					AND bu.warehouseFk = wh.id
-				JOIN buy b ON b.id = bu.buyFk
-				JOIN volumeConfig vc
-				JOIN account.`user` u ON u.id = it.workerFk
-				LEFT JOIN tStockBuyed sb ON sb.userFk = it.workerFk
-			WHERE ic.display
-				AND it.workerFk = vWorker;
-
-	SELECT b.entryFk Id_Entrada,
-			i.id Id_Article,
-			i.name Article,
-			ti.quantity Cantidad,
-			(ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
-				/ (vc.trolleyM3 * 1000000) buyed,
-			b.packagingFk id_cubo,
-			b.packing
-		FROM tmp.item ti
-			JOIN item i ON i.id = ti.itemFk
-			JOIN itemType it ON i.typeFk = it.id
-			JOIN itemCategory ic ON ic.id = it.categoryFk
-			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 ic.display
-			AND w.id = vWorker;
-
-	DROP TEMPORARY TABLE tmp.buyUltimate,
-		tmp.item,
-		tStockBuyed;
-END$$
-DELIMITER ;

db/routines/vn/procedures/stockBuyed_add.sql

@@ -1,70 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyed_add`(
-	vDated DATE
-)
-BEGIN
-/**
- * Inserta el volumen de compra por comprador
- * en stockBuyed de acuerdo con la fecha.
- *
- * @param vDated Fecha de compra
- */
-	CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
-		(INDEX (userFk))
-		ENGINE = MEMORY
-		SELECT requested, reserved, userFk
-			FROM stockBuyed
-			WHERE dated = vDated;
-
-	DELETE FROM stockBuyed WHERE dated = vDated;
-
-	CALL stockTraslation(vDated);
-
-	INSERT INTO stockBuyed(userFk, buyed, `dated`, description)
-		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
-				vDated,
-				u.name
-			FROM itemType it
-				JOIN item i ON i.typeFk = it.id
-				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = wh.id
-				JOIN buy b ON b.id = bu.buyFk
-				JOIN volumeConfig vc
-				JOIN account.`user` u ON u.id = it.workerFk
-				JOIN workerDepartment wd ON wd.workerFk = u.id
-				JOIN department d ON d.id = wd.departmentFk
-			WHERE ic.display
-				AND d.code IN ('shopping', 'logistic', 'franceTeam')
-			GROUP BY it.workerFk;
-
-	INSERT INTO stockBuyed(buyed, dated, description)
-		SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
-				vDated,
-				IF(c.code = 'ES', p.name, c.name) destiny
-			FROM itemTicketOut ito
-				JOIN ticket t ON t.id = ito.ticketFk
-				JOIN `address` a ON a.id = t.addressFk
-				JOIN province p ON p.id = a.provinceFk
-				JOIN country c ON c.id = p.countryFk
-				JOIN warehouse wh ON wh.id = t.warehouseFk
-				JOIN itemCost ic ON ic.itemFk = ito.itemFk
-					AND ic.warehouseFk = t.warehouseFk
-				JOIN volumeConfig vc
-			WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated)
-				AND wh.code = 'VNH'
-			GROUP BY destiny;
-
-	UPDATE stockBuyed s
-			JOIN tStockBuyed ts ON ts.userFk = s.userFk
-		SET s.requested = ts.requested,
-			s.reserved = ts.reserved
-		WHERE s.dated = vDated;
-
-	DROP TEMPORARY TABLE tmp.buyUltimate,
-		tmp.item,
-		tStockBuyed;
-END$$
-DELIMITER ;

db/routines/vn/procedures/supplier_statementWithEntries.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
 	vSupplierFk INT,
 	vCurrencyFk INT,
 	vCompanyFk INT,
@@ -17,14 +17,14 @@ BEGIN
 * @param vOrderBy Order by criteria
 * @param vIsConciliated Indicates whether it is reconciled or not
 * @param vHasEntries Indicates if future entries must be shown
-* @return tmp.supplierStatement 
+* @return tmp.supplierStatement
 */
 	DECLARE vBalanceStartingDate DATETIME;
 
 	SET @euroBalance:= 0;
 	SET @currencyBalance:= 0;
 
-	SELECT balanceStartingDate 
+	SELECT balanceStartingDate
 		INTO vBalanceStartingDate
 		FROM invoiceInConfig;
 
@@ -64,14 +64,14 @@ BEGIN
 						c.code,
 						'invoiceIn' statementType
 					FROM invoiceIn ii
-						JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
+						LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
 						JOIN currency c ON c.id = ii.currencyFk
 					WHERE ii.issued >= vBalanceStartingDate
-						AND ii.supplierFk = vSupplierFk 
+						AND ii.supplierFk = vSupplierFk
 						AND vCurrencyFk IN (ii.currencyFk, 0)
 						AND vCompanyFk IN (ii.companyFk, 0)
 						AND (vIsConciliated = ii.isBooked OR NOT vIsConciliated)
-					GROUP BY iid.id
+					GROUP BY iid.id, ii.id
 				UNION ALL
 				SELECT p.bankFk,
 						p.companyFk,
@@ -107,7 +107,7 @@ BEGIN
 					AND vCurrencyFk IN (p.currencyFk, 0)
 					AND vCompanyFk IN (p.companyFk, 0)
 					AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
-				UNION ALL 
+				UNION ALL
 				SELECT NULL,
 						companyFk,
 						NULL,
@@ -134,7 +134,7 @@ BEGIN
 						AND vCurrencyFk IN (se.currencyFk,0)
 						AND vCompanyFk IN (se.companyFk,0)
 						AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
-				UNION ALL 
+				UNION ALL
 				SELECT NULL bankFk,
 					e.companyFk,
 					'E' serial,
@@ -150,7 +150,7 @@ BEGIN
 					FALSE isBooked,
 					c.code,
 					'order'
-					FROM entry e 
+					FROM entry e
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN currency c ON c.id = e.currencyFk
 					WHERE e.supplierFk = vSupplierFk

db/routines/vn/procedures/ticketRefund_upsert.sql

@@ -0,0 +1,25 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticketRefund_upsert`(
+	vRefundTicketFk INT,
+	vOriginalTicketFk INT
+)
+	READS SQL DATA
+BEGIN
+/**
+ * Common code for ticketRefund triggers
+ *
+ * @param vRefundTicketFk
+ * @param vOriginalTicketFk
+ */
+	DECLARE vIsDeleted BOOL;
+	
+	SELECT COUNT(*) INTO vIsDeleted
+		FROM ticket 
+		WHERE id IN (vRefundTicketFk, vOriginalTicketFk)
+			AND isDeleted;
+
+	IF vIsDeleted THEN 
+		CALL util.throw('The refund ticket cannot be deleted tickets');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_canAdvance.sql

@@ -19,8 +19,7 @@ BEGIN
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.filter
 		(INDEX (id))
-		SELECT
+		SELECT origin.ticketFk futureId,
-				origin.ticketFk futureId,
 				dest.ticketFk id,
 				dest.state,
 				origin.futureState,
@@ -51,48 +50,48 @@ BEGIN
 				origin.warehouseFk futureWarehouseFk,
 				origin.companyFk futureCompanyFk,
 				IFNULL(dest.nickname, origin.nickname) nickname,
-				dest.landed
+				dest.landed,
+				dest.preparation
 			FROM (
-					SELECT
+				SELECT s.ticketFk,
-							s.ticketFk,
+						c.salesPersonFk workerFk,
-							c.salesPersonFk workerFk,
+						t.shipped,
-							t.shipped,
+						t.totalWithVat,
-							t.totalWithVat,
+						st.name futureState,
-							st.name futureState,
+						am.name futureAgency,
-							am.name futureAgency,
+						count(s.id) futureLines,
-							count(s.id) futureLines,
+						GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
-							GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+						CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
-							CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+						SUM(s.quantity <= (IFNULL(il.stock,0) + IFNULL(im.amount, 0))) hasStock,
-							SUM(s.quantity <= (IFNULL(il.stock,0) + IFNULL(im.amount, 0))) hasStock,
+						z.id futureZoneFk,
-							z.id futureZoneFk,
+						z.name futureZoneName,
-							z.name futureZoneName,
+						st.classColor,
-							st.classColor,
+						t.clientFk,
-							t.clientFk,
+						t.nickname,
-							t.nickname,
+						t.addressFk,
-							t.addressFk,
+						t.warehouseFk,
-							t.warehouseFk,
+						t.companyFk,
-							t.companyFk,
+						t.agencyModeFk
-							t.agencyModeFk
+					FROM ticket t
-						FROM ticket t
+						JOIN client c ON c.id = t.clientFk
-                            JOIN client c ON c.id = t.clientFk
+						JOIN sale s ON s.ticketFk = t.id
-							JOIN sale s ON s.ticketFk = t.id
+						JOIN saleVolume sv ON sv.saleFk = s.id
-							JOIN saleVolume sv ON sv.saleFk = s.id
+						JOIN item i ON i.id = s.itemFk
-							JOIN item i ON i.id = s.itemFk
+						JOIN ticketState ts ON ts.ticketFk = t.id
-							JOIN ticketState ts ON ts.ticketFk = t.id
+						JOIN `state` st ON st.id = ts.stateFk
-							JOIN state st ON st.id = ts.stateFk
+						JOIN agencyMode am ON t.agencyModeFk = am.id
-							JOIN agencyMode am ON t.agencyModeFk = am.id
+						JOIN `zone` z ON t.zoneFk = z.id
-                            JOIN zone z ON t.zoneFk = z.id
+						LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
-							LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+						LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
-							LEFT JOIN tmp.itemMinacum im ON im.itemFk = i.id
+						LEFT JOIN tmp.itemMinacum im ON im.itemFk = i.id
-								AND im.warehouseFk = vWarehouseFk
+							AND im.warehouseFk = vWarehouseFk
-				            LEFT JOIN tmp.itemList il ON il.itemFk = i.id
+						LEFT JOIN tmp.itemList il ON il.itemFk = i.id
-						WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+					WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
-							AND t.warehouseFk = vWarehouseFk
+						AND t.warehouseFk = vWarehouseFk
-						GROUP BY t.id
+					GROUP BY t.id
 				) origin
 				LEFT JOIN (
-					SELECT
+					SELECT t.id ticketFk,
-							t.id ticketFk,
 							st.name state,
 							GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
 							t.shipped,
@@ -108,18 +107,25 @@ BEGIN
 							t.warehouseFk,
 							t.companyFk,
 							t.landed,
-							t.agencyModeFk
+							t.agencyModeFk,
+							SEC_TO_TIME(
+							    COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)) * 3600 + 
+							    COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour)) * 60
+							) preparation
 						FROM ticket t
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN saleVolume sv ON sv.saleFk = s.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN ticketState ts ON ts.ticketFk = t.id
-							JOIN state st ON st.id = ts.stateFk
+							JOIN `state` st ON st.id = ts.stateFk
 							JOIN agencyMode am ON t.agencyModeFk = am.id
 							LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+							LEFT JOIN `zone` z ON z.id = t.zoneFk
+							LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+							JOIN ticketCanAdvanceConfig tc
 						WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
 							AND t.warehouseFk = vWarehouseFk
-							AND st.order <= 5
+							AND st.order <= tc.destinationOrder
 						GROUP BY t.id
 				) dest ON dest.addressFk = origin.addressFk
 			WHERE origin.hasStock;

db/routines/vn/procedures/ticket_getProblems.sql

@@ -36,7 +36,7 @@ BEGIN
 	UPDATE tmp.ticket_problems
 		SET totalProblems = (
 			(isFreezed) +
-			(hasRisk) +
+			(hasHighRisk) +
 			(hasTicketRequest) +
 			(!isTaxDataChecked) +
 			(hasComponentLack) +

db/routines/vn/procedures/ticket_mergeSales.sql

@@ -1,8 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
 	vSelf INT
 )
 BEGIN
+/**
+ * Para un ticket se agrupa las diferentes líneas de venta de un mismo artículo en una sola
+ * siempre y cuando tengan el mismo precio y dto.
+ *
+ * @param vSelf Id de ticket
+ */
 	DECLARE vHasSalesToMerge BOOL;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -19,7 +25,7 @@ BEGIN
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
 		(PRIMARY KEY (id))
 		ENGINE = MEMORY
-		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity 
+		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
 			FROM sale s
 				JOIN item i ON i.id = s.itemFk
 				JOIN itemType it ON it.id = i.typeFk
@@ -28,8 +34,7 @@ BEGIN
 			GROUP BY s.itemFk, s.price, s.discount
 			HAVING COUNT(*) > 1;
 
-	SELECT COUNT(*) INTO vHasSalesToMerge
+	SELECT COUNT(*) INTO vHasSalesToMerge FROM tSalesToPreserve;
-	 	FROM tSalesToPreserve;
 
 	IF vHasSalesToMerge THEN 
 		UPDATE sale s 

db/routines/vn/procedures/ticket_setProblemRiskByClient.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
 	vClientFk INT
 )
 BEGIN

db/routines/vn/procedures/ticket_setProblemRounding.sql

@@ -1,37 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setProblemRounding`(
-	vSelf INT
-)
-BEGIN
-/**
- * Update the rounding problem for the sales lines of a ticket
- *
- * @param vSelf Id de ticket
- */
-	DECLARE vWarehouseFk INT;
-	DECLARE vDated DATE;
-
-	SELECT warehouseFk, shipped 
-			INTO vWarehouseFk, vDated
-		FROM ticket
-		WHERE id = vSelf;
-
-	CALL buy_getUltimate(NULL, vWarehouseFk, vDated);	
-	
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
-		(INDEX(saleFk, isProblemCalcNeeded)) 
-		SELECT s.id saleFk , 
-				MOD(s.quantity, b.`grouping`) hasProblem, 
-				ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
-			FROM ticket t
-				JOIN sale s ON s.ticketFk = t.id
-				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-				JOIN buy b ON b.id = bu.buyFk
-			WHERE t.id = vSelf;
-
-	CALL sale_setProblem('hasRounding');
-
-	DROP TEMPORARY TABLE tmp.sale;
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_setVolume.sql

@@ -1,10 +1,10 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
 	vSelf INT
 )
 BEGIN
 /**
- * Update the volume ticket
+ * Update the volume ticket.
  * 
  * @param vSelf Ticket id
  */

db/routines/vn/procedures/ticket_setVolumeItemCost.sql

@@ -1,29 +1,39 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolumeItemCost`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setVolumeItemCost`(
 	vItemFk INT
 )
 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

@@ -3,13 +3,14 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 	vSelf INT,
 	vOriginalItemPackingTypeFk VARCHAR(1)
 )
-BEGIN
+proc:BEGIN
 /**
  * Clona y reparte las líneas de ventas de un ticket en funcion del tipo de empaquetado.
- * Respeta el id de ticket inicial para el tipo de empaquetado propuesto.
+ * Respeta el id de ticket original para el tipo de empaquetado propuesto.
  *
  * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo empaquetado al que se mantiene el ticket original
+ * @param vOriginalItemPackingTypeFk Tipo empaquetado que se mantiene el ticket original
+ * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vHasItemPackingType BOOL;
@@ -29,8 +30,14 @@ BEGIN
 			WHERE t.id = vSelf
 				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
 
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+		ticketFk INT,
+		itemPackingTypeFk VARCHAR(1)
+	) ENGINE=MEMORY
+		SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk;
+
 	IF NOT vHasItemPackingType THEN
-		CALL util.throw('The ticket has not sales with the itemPackingType');	
+		LEAVE proc;
 	END IF;
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
@@ -68,10 +75,15 @@ BEGIN
 	CLOSE vItemPackingTypes;
 
 	UPDATE sale s
-			JOIN  tSalesToMove stm ON stm.saleFk = s.id
+			JOIN tSalesToMove stm ON stm.saleFk = s.id
 		SET s.ticketFk = stm.ticketFk
 		WHERE stm.ticketFk;
 
+	INSERT INTO tmp.ticketIPT (ticketFk, itemPackingTypeFk)
+		SELECT ticketFk, itemPackingTypeFk
+			FROM tSalesToMove
+			GROUP BY ticketFk;
+
 	DROP TEMPORARY TABLE tSalesToMove;
 END$$
-DELIMITER ;
+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,15 +14,16 @@ BEGIN
 		(PRIMARY KEY (workerFk))
 		ENGINE = MEMORY
 		WITH RECURSIVE workerHierarchy AS (
-			SELECT id workerFk, bossFk, 0 depth
+			SELECT id workerFk, bossFk, 0 `depth`, CAST(id AS CHAR(255)) `path`
 				FROM vn.worker
 				WHERE id = vUserFk
 			UNION ALL
-			SELECT w.id, w.bossFk, wh.depth + 1
+			SELECT w.id, w.bossFk, wh.`depth` + 1, CONCAT(wh.`path`, ',', w.id)
 				FROM vn.worker w
 					JOIN workerHierarchy wh ON w.bossFk = wh.workerFk
+				WHERE NOT FIND_IN_SET(w.id, wh.`path`)
 		)
-		SELECT * 
+		SELECT *
 			FROM workerHierarchy
 			ORDER BY depth, workerFk;
 END$$

db/routines/vn/procedures/worker_updateBusiness.sql

@@ -21,6 +21,8 @@ BEGIN
 		SET businessFk = vNewBusinessFk
 		WHERE id = vSelf;
 
+	CALL queueMember_updateQueue(vNewBusinessFk);
+
 	IF vOldBusinessFk IS NULL THEN
 		CALL account.account_enable(vSelf);
 				

db/routines/vn/triggers/business_afterUpdate.sql

@@ -3,10 +3,20 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`business_afterUpdate`
 	AFTER UPDATE ON `business`
 	FOR EACH ROW
 BEGIN
+	DECLARE vIsActive BOOL;
+	DECLARE vExtension VARCHAR(10);
+
 	CALL worker_updateBusiness(NEW.workerFk);
 
 	IF NOT (OLD.workerFk <=> NEW.workerFk) THEN
 		CALL worker_updateBusiness(OLD.workerFk);
 	END IF;
+
+	IF NOT (OLD.departmentFk <=> NEW.departmentFk) THEN
+		SELECT COUNT(*) INTO vIsActive FROM worker WHERE businessFk = NEW.id;
+		IF vIsActive THEN
+			CALL queueMember_updateQueue(NEW.id);
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/creditInsurance_afterInsert.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`creditInsurance_afterIn
 BEGIN
 	UPDATE `client` c
 		JOIN vn.creditClassification  cc ON cc.client = c.id
-        SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassification;
+        SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassificationFk;
         
 END$$
 DELIMITER ;

db/routines/vn/triggers/creditInsurance_beforeInsert.sql

@@ -1,10 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
-	BEFORE INSERT ON `creditInsurance`
-	FOR EACH ROW
-BEGIN
-	IF NEW.creditClassificationFk THEN
-		SET NEW.creditClassification = NEW.creditClassificationFk;
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -71,7 +71,10 @@ BEGIN
 		SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
 	END IF;
 
-	IF NOT (NEW.travelFk <=> OLD.travelFk) OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN 
+	IF NOT (NEW.travelFk <=> OLD.travelFk) 
+		OR NOT (NEW.currencyFk <=> OLD.currencyFk)
+		OR NOT (NEW.supplierFk <=> OLD.supplierFk) THEN
+
 		SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk, NEW.supplierFk);
 	END IF;
 END$$

db/routines/vn/triggers/host_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`host_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`host_beforeInsert`
 	BEFORE INSERT ON `host`
 	FOR EACH ROW
 BEGIN

db/routines/vn/triggers/itemShelving_afterInsert.sql

@@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_afterInsert`
+	AFTER INSERT ON `itemShelving`
+	FOR EACH ROW
+BEGIN 
+	INSERT INTO itemShelvingLog
+		SET itemShelvingFk = NEW.id,
+			workerFk = account.myUser_getId(),
+			accion = 'CREA REGISTRO',
+			itemFk = NEW.itemFk,
+			shelvingFk = NEW.shelvingFk,
+			visible = NEW.visible,
+			`grouping` = NEW.`grouping`,
+			packing = NEW.packing,
+			available = NEW.available;
+			
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemShelving_beforeUpdate.sql

@@ -9,5 +9,8 @@ BEGIN
 		SET NEW.userFk = account.myUser_getId();
 	END IF;
 
+	IF NEW.shelvingFk <> OLD.shelvingFk THEN
+		SET NEW.movingState = NULL;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN