Merge branch 'dev' into 7362-VIP

back/methods/postcode/filter.js

@@ -45,7 +45,7 @@ module.exports = Self => {
                         {'pc.code': {like: `%${value}%`}},
                         {'t.name': {like: `%${value}%`}},
                         {'p.name': {like: `%${value}%`}},
-                        {'c.country': {like: `%${value}%`}}
+                        {'c.name': {like: `%${value}%`}}
                     ]
                 };
             }
@@ -62,7 +62,7 @@ module.exports = Self => {
             pc.code,
             t.name as town,
             p.name as province,
-            c.country
+            c.name country
         FROM
             postCode pc
             JOIN town t on t.id = pc.townFk

back/models/country.json

@@ -13,7 +13,7 @@
             "id": true,
             "description": "Identifier"
         },
-        "country": {
+        "name": {
             "type": "string",
             "required": true
         },

db/dump/.dump/data.sql

@@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','11018','878ee9e3039dd06ad456fa475f0d646d8bae3d4b','2024-05-07 07:34:42','11032');
+INSERT INTO `version` VALUES ('vn-database','11031','12f36dc825b6660062e2c86fde9c6b451cb58f0d','2024-05-14 08:25:58','11048');
 
 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);
@@ -651,6 +651,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10855','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10856','00-cloneAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10857','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10858','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10859','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:25',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10861','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterAgencyTermConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterGastosResumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
@@ -776,16 +777,33 @@ INSERT INTO `versionLog` VALUES ('vn-database','10977','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10984','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10988','00-pbx_prefix.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-04-11 17:00:16',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10990','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10991','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10992','00-acl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10992','00-referenceRate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10994','00-modifyAcls.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10995','01-agencyLogCreate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10995','02-agencyWorkCenterCreate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10995','03-tableAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10996','00-dropOrderRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10996','01-dropTicketRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10996','02-dropTravelRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10997','00-groupingMode.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11001','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11002','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11003','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11007','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11008','00-alter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11012','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11014','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11016','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-27 13:16:09',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11018','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11021','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-30 09:07:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11026','00-entryAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11026','01-entryUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11026','02-entryInternal.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11031','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11033','00-rollbackAcls.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-07 12:45:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11045','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-10 14:53:29',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1683,9 +1701,9 @@ INSERT INTO `ACL` VALUES (610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','
 INSERT INTO `ACL` VALUES (611,'State','find','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (612,'State','findById','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (613,'State','findOne','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (614,'Worker','find','READ','ALLOW','ROLE','hr');
+INSERT INTO `ACL` VALUES (614,'Worker','find','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (615,'Worker','findById','READ','ALLOW','ROLE','hr');
+INSERT INTO `ACL` VALUES (615,'Worker','findById','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (616,'Worker','findOne','READ','ALLOW','ROLE','hr');
+INSERT INTO `ACL` VALUES (616,'Worker','findOne','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (617,'Worker','filter','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (619,'Worker','active','READ','ALLOW','ROLE','employee');
@@ -1861,7 +1879,14 @@ INSERT INTO `ACL` VALUES (825,'Application','getEnumValues','*','ALLOW','ROLE','
 INSERT INTO `ACL` VALUES (826,'Ticket','editZone','WRITE','ALLOW','ROLE','salesAssistant');
 INSERT INTO `ACL` VALUES (827,'TicketWeekly','deleteById','WRITE','ALLOW','ROLE','buyerBoss');
 INSERT INTO `ACL` VALUES (828,'TicketWeekly','upsert','WRITE','ALLOW','ROLE','buyer');
-INSERT INTO `ACL` VALUES (829,'Worker','__get__summary','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (830,'InvoiceIn','*','READ','ALLOW','ROLE','deliveryBoss');
+INSERT INTO `ACL` VALUES (831,'InvoiceIn','exchangeRateUpdate','*','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (832,'AgencyLog','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (833,'AgencyWorkCenter','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (834,'AgencyMode','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (835,'Agency','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (836,'Agency','*','WRITE','ALLOW','ROLE','deliveryAssistant');
+INSERT INTO `ACL` VALUES (837,'AgencyWorkCenter','*','WRITE','ALLOW','ROLE','deliveryAssistant');
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2007,6 +2032,7 @@ INSERT INTO `businessType` VALUES ('others','Otros');
 INSERT INTO `businessType` VALUES ('otherSector','Profesional de otro sector');
 INSERT INTO `businessType` VALUES ('restoration','Restauración');
 INSERT INTO `businessType` VALUES ('trainingCentre','Centro de formación');
+INSERT INTO `businessType` VALUES ('VIP','Very important person');
 INSERT INTO `businessType` VALUES ('wholesaler','Mayorista');
 INSERT INTO `businessType` VALUES ('worker','Trabajador');
 
@@ -2180,7 +2206,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,118,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,110,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,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
@@ -2191,54 +2217,50 @@ INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,35,NULL,72,1,1,1,11,1
 INSERT INTO `department` VALUES (38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',36,37,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',38,77,NULL,0,0,0,1,19,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',38,69,NULL,0,0,0,1,15,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',78,79,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',70,71,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',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',84,85,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',76,77,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',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 (49,NULL,'PROPIEDAD',78,79,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',88,89,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',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 (53,'marketing','MARKETING Y COMUNICACIÓN',39,40,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',90,91,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',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 (55,NULL,'TALLER NATURAL',19,20,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',21,22,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',92,95,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',84,87,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',96,97,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',88,89,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',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (61,NULL,'VNH',98,101,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',90,93,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',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 (66,NULL,'VERDNAMADRID',94,95,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',23,24,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',104,105,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',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (80,'vallesTeam','EQUIPO J VALLES',43,44,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (80,'vallesTeam','EQUIPO ESPAÑA 5',43,44,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',106,107,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',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 (89,NULL,'COORDINACION',108,109,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',100,101,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',99,100,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',91,92,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',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',45,46,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,'brocalTeam','EQUIPO J BROCAL',47,48,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',0,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',47,48,3797,0,0,0,2,0,43,'/1/43/','es2_equipo',0,'es2@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
-INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',49,50,24065,0,0,0,2,0,43,'/1/43/','es1_equipo',0,'españa1@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',49,50,24065,0,0,0,2,0,43,'/1/43/','es1_equipo',0,'es1@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
 INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',51,52,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',53,54,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',55,56,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',110,111,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',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (125,'miriamMarTeam','EQUIPO MIRIAM MAR',57,58,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
+INSERT INTO `department` VALUES (125,'miriamMarTeam','EQUIPO ESPAÑA 3',57,58,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',27,28,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',29,30,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',93,94,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',85,86,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',59,60,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',61,62,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',63,64,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',112,113,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',104,105,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',114,115,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',106,107,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',116,117,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',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 (139,'soriaTeam','EQUIPO J SORIA ',65,66,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'equipojsoria@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (139,'soriaTeam','EQUIPO ESPAÑA 4',65,66,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'equipojsoria@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
 INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',67,68,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (142,NULL,'EQUIPO ESPAÑA 2',69,70,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',0,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (143,NULL,'EQUIPO ESPAÑA 3',71,72,4379,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (144,NULL,'EQUIPO ESPAÑA 4',73,74,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',0,'equipojsoria@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (145,NULL,'EQUIPO ESPAÑA 5',75,76,4250,0,0,0,2,0,43,'/1/43/','jvp_equipo',0,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,NULL,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);
@@ -2541,7 +2563,7 @@ INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,1
 INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL);
 INSERT INTO `workCenter` VALUES (2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (3,'Marjales',26,20008,NULL,NULL,NULL,NULL);
-INSERT INTO `workCenter` VALUES (4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `workCenter` VALUES (4,'VNH',NULL,NULL,7,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (5,'Madrid',28,2869,5,'Av constitución 3',554145,2.00);
 INSERT INTO `workCenter` VALUES (6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL);
 INSERT INTO `workCenter` VALUES (7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL);

db/dump/.dump/privileges.sql

@@ -327,20 +327,16 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','price_fixed','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','printQueue','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','preservedBoss','travel','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerAssistant','itemType','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','state','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','travel','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Bancos_poliza','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','duaDismissed','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','edi_article','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','edi_bucket','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','edi_bucket_type','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','time','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','operator','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','payment','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
@@ -553,7 +549,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','client','alexm@%',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleVolume','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','awb_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos','alexm@%','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','Cubos','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','routesMonitor','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','sale','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','sale','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Delete','Update');
@@ -1379,9 +1375,9 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','zoneIncluded','guil
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','zoneGeo','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','quality','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','category','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','edi_bucket_type','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','edi_bucket','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ektEntryAssign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','edi_bucket','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','edi_bucket_type','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','calendarType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','timeSlots','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','supplierFreight','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1395,6 +1391,15 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','deliveryNote','guil
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','invoiceOutExpense','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','delivery','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','entry','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos_Retorno','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimDestination','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','entryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','sage','grafana','TiposIva','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','buyer','waste','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceInConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerActivity','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1719,18 +1724,13 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROC
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','dayend','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','production','buffer_settypebyname','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financialBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','barcodeToItem','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticket_splititempackingtype','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_getCommission','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','deliveryAssistant','expeditionstate_addbypallet','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','entryEditor','buy_tarifas','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','claimManager','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','mail_insert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_fixMisfit','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','employee','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_CURDATE','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1766,7 +1766,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionBoss','saleSplit','P
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','client_getDebt','FUNCTION','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','client_getDebt','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_commit','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buyultimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1913,7 +1912,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myuser_hasroutine
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionAssi','timebusiness_calculateall','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','timecontrol_geterror','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','travel_weeklyclone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','handmadeBoss','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','productionAssi','rutasanalyze','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionPlus','workerCreateExternal','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
@@ -2044,7 +2043,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_rollback','PROCED
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_start','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPrices','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByAwb','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','hr','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','financial','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','supplier_statement','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2059,6 +2058,14 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','artificialBoss','confection_co
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','remittance_calc','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','developer','connection_kill','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','client_getRisk','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','item_ValuateInventory','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','balance_create','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hrBoss','balance_create','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','entryEditor','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

db/dump/.dump/triggers.sql

@@ -1855,6 +1855,26 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`agency_beforeInsert`
+	BEFORE INSERT ON `agency`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`agency_afterInsert`
 	AFTER INSERT ON `agency`
 	FOR EACH ROW
@@ -3211,12 +3231,6 @@ BEGIN
 		UPDATE `address` SET isDefaultAddress = TRUE
 			WHERE id = NEW.defaultAddressFk;
 	END IF;
-
-	IF NOT NEW.isActive THEN
-		UPDATE account.`user`
-			SET active = FALSE
-			WHERE id = NEW.id;
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -4577,9 +4591,19 @@ BEGIN
 	DECLARE vIsVirtual BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
+	DECLARE vTotalBuy INT;
 	
 	IF NEW.isBooked = OLD.isBooked THEN
 		CALL entry_checkBooked(OLD.id);
+	ELSE
+		IF NEW.isBooked THEN
+			SELECT COUNT(*) INTO vTotalBuy
+				FROM buy
+				WHERE entryFk = NEW.id;
+			IF NOT vTotalBuy THEN
+				CALL util.throw('Entry must have lines to be marked booked');
+			END IF;
+		END IF;
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
@@ -5295,10 +5319,6 @@ DELIMITER ;;
 BEGIN
 	DECLARE vWithholdingSageFk INT;
 
-	IF NEW.isBooked = OLD.isBooked THEN
-		CALL invoiceIn_checkBooked(OLD.id);
-	END IF;
-
 	IF NOT (NEW.supplierRef <=> OLD.supplierRef) AND NOT util.checkPrintableChars(NEW.supplierRef) THEN
 		CALL util.throw('The invoiceIn reference contains invalid characters');
 	END IF;
@@ -5419,74 +5439,12 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInCorrection_beforeInsert`
-	BEFORE INSERT ON `invoiceInCorrection`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(NEW.correctingFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInCorrection_beforeUpdate`
-	BEFORE UPDATE ON `invoiceInCorrection`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(OLD.correctingFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInCorrection_beforeDelete`
-	BEFORE DELETE ON `invoiceInCorrection`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(OLD.correctingFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeInsert`
 	BEFORE INSERT ON `invoiceInDueDay`
 	FOR EACH ROW
 BEGIN
 	DECLARE vIsNotified BOOLEAN;
 
-	CALL invoiceIn_checkBooked(NEW.invoiceInFk);
-
 	SET NEW.editorFk = account.myUser_getId();
     
     SELECT isNotified INTO vIsNotified 
@@ -5529,7 +5487,6 @@ DELIMITER ;;
 BEGIN
 	DECLARE vIsNotified BOOLEAN;
 
-	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 	SET NEW.editorFk = account.myUser_getId();
     
     SELECT isNotified INTO vIsNotified 
@@ -5566,26 +5523,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_beforeDelete`
-	BEFORE DELETE ON `invoiceInDueDay`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInDueDay_afterDelete`
 	AFTER DELETE ON `invoiceInDueDay`
 	FOR EACH ROW
@@ -5610,66 +5547,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInIntrastat_beforeInsert`
-	BEFORE INSERT ON `invoiceInIntrastat`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(NEW.invoiceInFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInIntrastat_beforeUpdate`
-	BEFORE UPDATE ON `invoiceInIntrastat`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInIntrastat_beforeDelete`
-	BEFORE DELETE ON `invoiceInIntrastat`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInTax_beforeInsert`
 	BEFORE INSERT ON `invoiceInTax`
 	FOR EACH ROW
@@ -5695,8 +5572,6 @@ DELIMITER ;;
 	BEFORE UPDATE ON `invoiceInTax`
 	FOR EACH ROW
 BEGIN
-	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
-	
 	IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) THEN 
 		CALL invoiceInTax_afterUpsert(NEW.invoiceInFk);
 	END IF;
@@ -5717,26 +5592,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInTax_beforeDelete`
-	BEFORE DELETE ON `invoiceInTax`
-	FOR EACH ROW
-BEGIN
-	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`invoiceInTax_afterDelete`
 	AFTER DELETE ON `invoiceInTax`
 	FOR EACH ROW
@@ -8459,8 +8314,8 @@ DELIMITER ;;
 	AFTER INSERT ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
-	UPDATE vn2008.Clientes c
+	UPDATE client c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+		JOIN creditClassification cc ON cc.client = c.id
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
 END */;;
@@ -8483,13 +8338,13 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	IF NEW.dateLeaving IS NOT NULL THEN
-		UPDATE vn2008.Clientes c
+		UPDATE client c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+			JOIN creditClassification cc ON cc.client = c.id
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
 	ELSE
-		UPDATE vn2008.Clientes c
+		UPDATE client c
-			JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+			JOIN creditClassification cc ON cc.client = c.id
 			JOIN creditInsurance ci ON ci.creditClassification = cc.id
 		SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
 	END IF;
@@ -8512,8 +8367,8 @@ DELIMITER ;;
 	BEFORE DELETE ON `solunionCAP`
 	FOR EACH ROW
 BEGIN
-	UPDATE vn2008.Clientes c
+	UPDATE client c
-		JOIN creditClassification cc ON c.Id_Cliente = cc.client 
+		JOIN creditClassification cc ON cc.client = c.id
 		JOIN creditInsurance ci ON ci.creditClassification = cc.id
 	SET creditInsurance = ci.credit  WHERE ci.id = OLD.creditInsurance;
 END */;;
@@ -9539,7 +9394,7 @@ BEGIN
 	END IF;
 
 	IF NEW.attenderFk IS NULL THEN
-		SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
+		SET NEW.attenderFk = (SELECT defaultAttenderFk FROM ticketConfig LIMIT 1);
 	END IF;
 END */;;
 DELIMITER ;
@@ -9569,10 +9424,6 @@ BEGIN
 	IF NEW.salesPersonCode <> OLD.salesPersonCode THEN
 		SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode);
 	END IF;
-
-	IF NEW.buyerCode <> OLD.buyerCode THEN
-		SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode);
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10954,4 +10805,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-05-07  5:48:41
+-- Dump completed on 2024-05-14  6:26:46

db/dump/fixtures.before.sql

@@ -162,7 +162,7 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
         (4, 'JPY', 'Yen Japones',   1),
         (5, 'CNY',  'Yuan Chino',   1.2);
 
-INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
+INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
     VALUES
         (1, 'España',   1, 'ES', 1, 24, 4, 0, 1),
         (2, 'Italia',   1, 'IT', 1, 27, 4, 0, 1),
@@ -2562,7 +2562,7 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
         (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1),
         (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1);
 
-INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`, `daysAgo`)
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`)
     VALUES
         (1, -2, '2% retention', 2, 45);
 
@@ -3790,3 +3790,5 @@ INSERT INTO vn.workerTeam(id, team, workerFk)
 
 INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment) 
     VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
+
+UPDATE vn.locker SET workerFk = 1110 WHERE id = 147; 

db/routines/vn/events/clientsDisable.sql

@@ -7,15 +7,19 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
+			LEFT JOIN account.account a ON a.id = u.id
 		SET u.active = FALSE
 		WHERE c.typeFk = 'normal'
+			AND a.id IS NULL
+			AND u.active
+			AND c.created < util.VN_CURDATE() - INTERVAL 12 MONTH 
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c
 						LEFT JOIN ticket t ON t.clientFk = c.id
 					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL 2 MONTH 
+						OR t.created > util.VN_CURDATE() - INTERVAL 12 MONTH 
-						OR shipped > util.VN_CURDATE() - INTERVAL 2 MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL 12 MONTH 
 				);
 END$$
 DELIMITER ;

db/routines/vn/functions/sale_hasComponentLack.sql

@@ -0,0 +1,28 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`sale_hasComponentLack`(
+	vSelf INT
+)RETURNS tinyint(1)
+	READS SQL DATA
+BEGIN
+/**
+ * Check if a sales line has all the required components.
+ * 
+ * @param vSelf Id de sale
+ * @return BOOL
+ */
+	DECLARE vHasComponentLack TINYINT(1);
+
+	WITH componentRequired AS(
+	SELECT COUNT(*) total 
+		FROM vn.component
+		WHERE isRequired
+	)SELECT SUM(IF(c.isRequired, TRUE, FALSE)) <> cr.total INTO vHasComponentLack
+		FROM vn.sale s
+			JOIN componentRequired cr 
+			LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id 
+			LEFT JOIN vn.component c ON c.id = sc.componentFk
+		WHERE s.id = vSelf;
+		
+	RETURN vHasComponentLack;	
+END$$
+DELIMITER ;

db/routines/vn/functions/ticket_isTooLittle.sql

@@ -0,0 +1,25 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`ticket_isTooLittle`(
+	vSelf INT
+)
+	RETURNS tinyint(1)
+	READS SQL DATA
+BEGIN
+/**
+ * Check if the ticket is small based on the volume and amount parameters.
+ * 
+ * @param vSelf Id ticket
+ * @return BOOL
+ */
+	DECLARE vIsTooLittle TINYINT(1);
+
+	SELECT (SUM(IFNULL(sv.litros, 0)) < vc.minTicketVolume 
+			OR IFNULL(t.totalWithoutVat, 0) < vc.minTicketValue) INTO vIsTooLittle
+		FROM ticket t
+			LEFT JOIN saleVolume sv ON sv.ticketFk = t.id
+			JOIN volumeConfig vc
+		WHERE t.id = vSelf;
+
+	RETURN vIsTooLittle;	
+END$$
+DELIMITER ;

db/routines/vn/procedures/agencyVolume.sql

@@ -9,7 +9,7 @@ BEGIN
 	DECLARE vEnded DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
 
 	SELECT ag.id agency_id,
-			CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia,
+			CONCAT(RPAD(c.name, 16,' _') ,' ',ag.name) Agencia,
 			COUNT(*) expediciones,
 			SUM(t.packages) Bultos,
 			SUM(tpe.boxes) Faltan

db/routines/vn/procedures/client_getRisk.sql

@@ -22,7 +22,7 @@ BEGIN
 			c.credit,
 			CAST(r.risk AS DECIMAL (10,2)) risk,
 			CAST(c.credit - r.risk AS DECIMAL (10,2)) difference,
-			co.country
+			co.name country
 		FROM client c
 			JOIN tmp.risk r ON r.clientFk = c.id
 			JOIN country co ON co.id = c.countryFk

db/routines/vn/procedures/collection_assign.sql

@@ -30,7 +30,10 @@ BEGIN
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 INTO vHasTooMuchCollections
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, 
+			collection_assign_lockname
+		INTO vHasTooMuchCollections,
+			vLockName
 		FROM productionConfig pc
 			LEFT JOIN tCollection ON TRUE;
 

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -27,7 +27,7 @@ BEGIN
 			cac.invoiced billedAnnually,
 			c.dueDay,
 			cgd.grade,
-			c2.country
+			c2.name country
 		FROM tmp.clientGetDebt cgd
 			LEFT JOIN tmp.risk r ON r.clientFk = cgd.clientFk
 			JOIN client c ON c.id = cgd.clientFk

db/routines/vn/procedures/itemShelving_add.sql

@@ -20,8 +20,11 @@ BEGIN
 
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 
-	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
+	IF vPacking IS NULL
+	THEN
+		SET vPacking = itemPacking(vBarcode, vWarehouseFk);
 		SET vQuantity = vQuantity * vPacking;
+	END IF;
 
 	IF (SELECT COUNT(*) FROM itemShelving
 			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk

db/routines/vn/procedures/item_getBalance.sql

@@ -9,7 +9,7 @@ BEGIN
  * @vItemFk item a buscar
  * @vWarehouseFk almacen donde buscar
  * @vDate Si la fecha es null, muestra el histórico desde el inventario. 
- * Si la fecha no es null, muestra histórico desde la fecha pasada.
+ * Si la fecha no es null, muestra histórico desde la fecha de vDate.
  */
 	DECLARE vDateInventory DATETIME;
 
@@ -41,6 +41,7 @@ BEGIN
 	);
 
 	INSERT INTO tItemDiary
+		WITH entriesIn AS (
 			SELECT tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
@@ -57,89 +58,125 @@ BEGIN
 					NULL clientType,
 					NULL claimFk,
 					ec.inventorySupplierFk
-			FROM buy b
+				FROM vn.buy b
-				JOIN entry e ON e.id = b.entryFk
+					JOIN vn.entry e ON e.id = b.entryFk
-				JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-				JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.supplier s ON s.id = e.supplierFk
-				JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				JOIN entryConfig ec
+					JOIN vn.entryConfig ec
 				WHERE tr.landed >= vDateInventory
 					AND vWarehouseFk = tr.warehouseInFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 					AND b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
+					AND NOT e.isExcludedFromAvailable
-				AND e.isRaid = FALSE
+					AND NOT e.isRaid
-		UNION ALL
+		), entriesOut AS (
 			SELECT tr.shipped,
 					NULL,
 					b.quantity,
 					st.alertLevel,
-				st.name,
+					st.name stateName,
-				s.name,
+					s.name ,
 					e.invoiceNumber,
-				e.id,
+					e.id entryFk,
-				s.id,
+					s.id supplierFk,
 					IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
-				FALSE,
+					FALSE isTicket,
 					b.id,
-				NULL,
+					NULL `order`,
-				NULL,
+					NULL clientType,
-				NULL,
+					NULL claimFk,
 					ec.inventorySupplierFk
-			FROM buy b
+				FROM vn.buy b
-				JOIN entry e ON e.id = b.entryFk
+					JOIN vn.entry e ON e.id = b.entryFk
-				JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-				JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN vn.warehouse w ON w.id = tr.warehouseOutFk
-				JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.supplier s ON s.id = e.supplierFk
-				JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				JOIN entryConfig ec
+					JOIN vn.entryConfig ec
 				WHERE tr.shipped >= vDateInventory
 					AND vWarehouseFk = tr.warehouseOutFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
 						AND b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
+						AND NOT e.isExcludedFromAvailable
-				AND w.isFeedStock = FALSE
+						AND NOT w.isFeedStock
-				AND e.isRaid = FALSE
+						AND NOT e.isRaid
-		UNION ALL
+		), sales AS (
-		SELECT DATE(t.shipped),
+			SELECT DATE(t.shipped) shipped,
-			NULL,
 					s.quantity,
 					st2.alertLevel,
 					st2.name,
 					t.nickname,
 					t.refFk,
-			t.id,
+					t.id ticketFk,
 					t.clientFk,
-			stk.id,
+					s.id saleFk,
-			TRUE,
-			s.id,
 					st.`order`,
 					c.typeFk,
-			cb.claimFk,
+					cb.claimFk
-			NULL
+				FROM vn.sale s
-		FROM sale s
+					JOIN vn.ticket t ON t.id = s.ticketFk
-			JOIN ticket t ON t.id = s.ticketFk
+					LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+					LEFT JOIN vn.state st ON st.`code` = ts.`code`
-			LEFT JOIN state st ON st.`code` = ts.`code`
+					JOIN vn.client c ON c.id = t.clientFk
-			JOIN client c ON c.id = t.clientFk
+					JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
-			JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
 						'DELIVERED',
 						IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
 							'FREE',
 							IFNULL(ts.code, 'FREE')))
-			LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+					LEFT JOIN vn.claimBeginning cb ON s.id = cb.saleFk
-			LEFT JOIN saleTracking stk ON stk.saleFk = s.id 
-				AND stk.stateFk = stPrep.id
-			LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
 				WHERE t.shipped >= vDateInventory
 					AND s.itemFk = vItemFk
-			AND vWarehouseFk =t.warehouseFk
+					AND vWarehouseFk = t.warehouseFk
+		),sale AS (
+			SELECT s.shipped,
+					NULL `in`,
+					s.quantity,
+					s.alertLevel,
+					s.name,
+					s.nickname,
+					s.refFk,
+					s.ticketFk,
+					s.clientFk,
+					IF(stk.saleFk, TRUE, NULL),
+					TRUE,
+					s.saleFk,
+					s.`order`,
+					s.typeFk,
+					s.claimFk,
+					NULL
+				FROM sales s
+					LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
+					LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk 
+						AND stk.stateFk = stPrep.id
+				GROUP BY s.saleFk
+		)	SELECT shipped,
+				`in`,
+				`out`,
+				alertLevel,
+				stateName,
+				`name`,
+				reference,
+				origin,
+				clientFk,
+				isPicked,
+				isTicket,
+				lineFk,
+				`order`,
+				clientType,
+				claimFk,
+				inventorySupplierFk
+				FROM entriesIn
+			UNION ALL
+			SELECT * FROM entriesOut
+			UNION ALL
+			SELECT * FROM sale
 			ORDER BY shipped,
 				(inventorySupplierFk = clientFk) DESC,
 				alertLevel DESC,

db/routines/vn/procedures/packageInvoicing.sql

@@ -1,121 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`packageInvoicing`(	
-														IN vClient INT,
-														IN vDate DATE,
-                                                        IN vCompany INT,
-                                                        IN vIsAllInvoiceable BOOLEAN,
-                                                        OUT vNewTicket INT(11)
-													  )
-BEGIN
-
-	DECLARE vGraceDays INT;
-    DECLARE vDateStart DATE DEFAULT '2017-11-21';
-    DECLARE vIsInvoiceable BOOLEAN;
-    DECLARE vWarehouse INT DEFAULT 13;
-    DECLARE vComponentCost INT DEFAULT 28;
-    DECLARE vGraceDate DATE;
-	DECLARE vDateEnd DATE;
-
-	SET vGraceDays = IF(vIsAllInvoiceable ,0, 30);
-	SET vGraceDate = TIMESTAMPADD(DAY, - vGraceDays, vDate);
-    
-    /* Clientes especiales: 
-								3240 MADEFLOR
-                                 992 JAVIER FELIU
-                                   4 TONI VENDRELL
-	*/
-                                 
-    IF vClient IN (992, 3240, 4) THEN
-    
-		SET vGraceDays = 365;
-    
-    END IF;
-   	/* Fin clientes especiales */
-   
-	SET vDateEnd = DATE_ADD(vDate, INTERVAL 1 DAY);
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.packageToInvoice;
-
-    CREATE TEMPORARY TABLE tmp.packageToInvoice
-        SELECT 	p.itemFk,
-				tp.packagingFk,
-                IF(tp.quantity < 0 OR t.shipped < vGraceDate, tp.quantity, 0) quantity,
-                tp.ticketFk,
-                p.price
-            FROM ticketPackaging tp
-                JOIN packaging p ON p.id = tp.packagingFk
-                JOIN ticket t ON t.id = tp.ticketFk
-            WHERE t.shipped BETWEEN vDateStart AND vDateEnd
-                AND t.clientFk = vClient;
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.packageToInvoicePositives;
-
-    CREATE TEMPORARY TABLE tmp.packageToInvoicePositives
-        SELECT itemFk, sum(quantity) as totalQuantity
-            FROM tmp.packageToInvoice
-            GROUP BY itemFk
-            HAVING totalQuantity > 0;
-    
-    SELECT COUNT(*)
-        INTO vIsInvoiceable
-        FROM tmp.packageToInvoicePositives;
-
-    IF vIsInvoiceable THEN
-
-    	CALL ticket_add(vClient, 
-       		vDateEnd,
-       		vWarehouse, 
-	       	vCompany, 
-	       	NULL, 
-	      	NULL, 
-	     	NULL, 
-		    vDateEnd, 
-	   		account.myUser_getId(), 
-            TRUE,
-			vNewTicket);
-
-    	INSERT INTO ticketPackaging(
-									ticketFk,
-                                    packagingFk,
-                                    quantity,
-                                    pvp)
-            SELECT 	vNewTicket, 
-					pti.packagingFk, 
-                    - SUM(pti.quantity) AS totalQuantity, 
-                    pti.price
-                FROM tmp.packageToInvoice pti
-					LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk 
-				WHERE ptip.itemFK IS NOT NULL 
-						OR vIsAllInvoiceable
-                GROUP BY packagingFk
-                HAVING totalQuantity;
-
-        INSERT INTO sale(
-						ticketFk,
-						itemFk, 
-                        concept, 
-                        quantity, 
-                        price
-                        )
-            SELECT 		vNewTicket, 
-						pti.itemFk, 
-                        i.name as concept, 
-                        sum(pti.quantity) as totalQuantity, 
-                        pti.price
-                FROM tmp.packageToInvoice pti
-                    JOIN item i ON i.id = pti.itemFk
-						LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk
-                    WHERE ptip.itemFK IS NOT NULL 
-						OR vIsAllInvoiceable
-                    GROUP BY pti.itemFk
-                    HAVING totalQuantity;
-                    
-		INSERT INTO saleComponent(saleFk, componentFk, value)
-			SELECT id, vComponentCost, price
-				FROM sale
-				WHERE ticketFk = vNewTicket;
-             
-    END IF;
-    
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_setProblem.sql

@@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblem`(
+	vProblemCode VARCHAR(25)
+)
+BEGIN
+/**
+ * Update column sale.problem with a problem code
+ * @param vProblemCode Code to set or unset
+ * @table tmp.sale(saleFk, hasProblem)
+ */
+	UPDATE sale s
+			JOIN tmp.sale ts ON ts.saleFk = s.id 
+		SET s.problem = CONCAT(
+			IF(ts.hasProblem,
+				CONCAT(s.problem, ',', vProblemCode),
+				REPLACE(s.problem, vProblemCode , '')));
+END$$
+DELIMITER ;

db/routines/vn/procedures/sale_setProblemComponentLack.sql

@@ -0,0 +1,21 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblemComponentLack`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Update the problems for sales lines that have or no longer have problems with components, 
+ * verify whether all mandatory components are present or not
+ *
+ * @param vSelf Id del sale
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+		(INDEX(saleFk))
+		ENGINE = MEMORY
+		SELECT vSelf saleFk, sale_hasComponentLack(vSelf) hasProblem;
+
+	CALL sale_setProblem('hasComponentLack');	
+
+	DROP TEMPORARY TABLE tmp.sale;
+END$$
+DELIMITER ;

db/routines/vn/procedures/sale_setProblemComponentLackByComponent.sql

@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblemComponentLackByComponent`(
+	vComponentFk INT
+)
+BEGIN
+/**
+ * Update the issues for sales lines that have or no longer have problems with components, verify 
+ * whether all mandatory components are present or not resulting from changes in the table vn.component
+ *
+ * @param vComponentFk Id component
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+		(INDEX(saleFk))
+		ENGINE = MEMORY
+		SELECT s.id saleFk, sale_hasComponentLack(s.id) hasProblem
+			FROM ticket t
+				JOIN sale s ON s.ticketFk = t.id
+				LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
+			WHERE t.shipped >= util.midnight()
+				AND (vComponentFk IS NULL OR sc.componentFk = vComponentFk);
+
+	CALL sale_setProblem('hasComponentLack');
+
+	DROP TEMPORARY TABLE tmp.sale;
+END$$
+DELIMITER ;

db/routines/vn/procedures/sale_setProblemRounding.sql

@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`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;
+
+	SELECT s.itemFk, t.warehouseFk, t.shipped, s.quantity 
+			INTO vItemFk, vWarehouseFk, vShipped, vQuantity
+		FROM sale s 
+			JOIN ticket t ON t.id = s.ticketFk 
+		WHERE s.id = vSelf;
+
+	CALL buyUltimate(vWarehouseFk, vShipped);	
+	
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		SELECT vSelf saleFk, MOD(vQuantity, bu.`grouping`) hasProblem
+			FROM tmp.buyUltimate bu
+				JOIN buy b ON b.id = bu.buyFk
+			WHERE bu.itemFk = vItemFk;
+
+	CALL sale_setProblem('hasRounding');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+END$$
+DELIMITER ;

db/routines/vn/procedures/stockBuyed_add.sql

@@ -43,7 +43,7 @@ BEGIN
 	INSERT INTO stockBuyed(buyed, dated, description)
 		SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
 				vDated,
-				IF(c.code = 'ES', p.name, c.country) destiny
+				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

db/routines/vn/procedures/ticket_setProblem.sql

@@ -0,0 +1,19 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblem`(
+	vProblemCode VARCHAR(25)
+)
+BEGIN
+/**
+ * Update column ticket.problem with a problem code
+ * 
+ * @param vProblemCode Code to set or unset
+ * @table tmp.ticket(ticketFk, hasProblem)
+ */
+	UPDATE ticket t
+			JOIN tmp.ticket tt ON tt.ticketFk = t.id 
+		SET t.problem = CONCAT(
+			IF(tt.hasProblem,
+				CONCAT(problem, ',', vProblemCode),
+				REPLACE(problem, vProblemCode , '')));
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemFreeze.sql

@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemFreeze`(
+	vClientFk INT 
+)
+BEGIN
+/**
+ * Update the problem of tickets whose client is frozen or unfrozen
+ * 
+ * @param vClientFk Id Cliente, if NULL all clients
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		(INDEX(ticketFk))
+		ENGINE = MEMORY
+		SELECT t.id ticketFk, FALSE hasProblem
+			FROM ticket t 
+			WHERE t.shipped >= util.midnight()
+				AND (vClientFk IS NULL OR t.clientFk = vClientFk);
+
+	UPDATE tmp.ticket t
+			JOIN ticket ti ON ti.id = t.ticketFk
+			JOIN client c ON c.id = ti.clientFk
+		SET t.hasProblem = TRUE
+		WHERE c.isFreezed;
+	
+	CALL ticket_setProblem('hasTicketRequest');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemRequest.sql

@@ -0,0 +1,28 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRequest`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Update the problems of tickets that have a pending ticketRequest or no longer have it
+ * 
+ * @param vSelf Id ticket, if NULL ALL tickets
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		(INDEX(ticketFk))
+		ENGINE = MEMORY
+		SELECT t.id ticketFk, FALSE hasProblem 
+			FROM ticket t 
+				WHERE t.shipped >= util.midnight()
+					AND (vSelf IS NULL OR t.id = vSelf);
+	
+	UPDATE tmp.ticket t
+			JOIN ticketRequest tr ON tr.ticketFk = t.ticketFk
+		SET t.hasProblem = TRUE
+		WHERE tr.isOK IS NULL;
+
+	CALL ticket_setProblem('hasTicketRequest');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemRisk.sql

@@ -0,0 +1,33 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRisk`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Update the risk problem for a specific ticket
+ *
+ * @param vSelf Id ticket
+ */
+	DECLARE vHasRisk BOOL;
+	DECLARE vHasHighRisk BOOL;
+
+	SELECT t.risk > (c.credit + 10), ((t.risk - cc.riskTolerance) > (c.credit + 10)) 
+			INTO vHasRisk, vHasHighRisk
+		FROM client c
+			JOIN ticket t ON t.clientFk = c.id 
+			JOIN clientConfig cc
+		WHERE t.id = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		SELECT vSelf ticketFk, vRisk hasProblem;
+	
+	CALL ticket_setProblem('hasRisk');
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		SELECT vSelf ticketFk, vHasHighRisk hasProblem;
+	
+	CALL ticket_setProblem('hasHighRisk');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemRounding.sql

@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`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 buyUltimate(vWarehouseFk, vDated);	
+	
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		SELECT s.id saleFk , MOD(s.quantity, b.`grouping`) hasProblem
+			FROM ticket t
+				JOIN sale s ON s.ticketFk = tl.ticketFk
+				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.ticket;
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemTaxDataChecked.sql

@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` 
+	PROCEDURE `vn`.`ticket_setProblemTaxDataChecked`(vClientFk INT)
+BEGIN
+/**
+ * Update the problem of tickets, depending on whether 
+ * the client taxDataCheched is verified or not
+ * 
+ * @param vClientFk Id cliente, if NULL all clients
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		(INDEX(ticketFk))
+		ENGINE = MEMORY
+		SELECT t.id ticketFk, IF(c.isTaxDataChecked, FALSE, TRUE) hasProblem
+			FROM ticket t 
+				JOIN client c ON c.id = t.clientFk 
+			WHERE t.shipped >= util.midnight() 
+				AND (c.id = vClientFk OR vClientFk IS NULL);
+
+	CALL ticket_setProblem('isTaxDataChecked');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemTooLittle.sql

@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemTooLittle`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Update the problems when the ticket is too small or is no longer so
+ *
+ * @param vSelf Id del ticket
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		(INDEX(ticketFk))
+		ENGINE = MEMORY
+		SELECT vSelf ticketFk, ticket_isTooLittle(vSelf) hasProblem;
+	
+	CALL ticket_setProblem('isTooLittle');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setProblemTooLittleItemCost.sql

@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemTooLittleItemCost`(
+	vItemFk INT
+)
+BEGIN
+/**
+ * Update the problems when the ticket is too small or is no longer so, 
+ * derived from changes in the itemCost table
+ * 
+ * @param vItemFk Id del item, NULL ALL items
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
+		(INDEX(ticketFk))
+		ENGINE = MEMORY
+		WITH tickets AS(
+			SELECT t.id ticketFk
+				FROM vn.ticket t
+					JOIN vn.sale s ON s.ticketFk = t.id
+				WHERE t.shipped >= util.midnight()
+					AND (s.itemFk = vItemFk OR vItemFk IS NULL)
+				GROUP BY t.id
+		)SELECT ticketFk, ticket_isTooLittle(ticketFk) hasProblem
+			FROM tickets;
+
+	CALL ticket_setProblem('isTooLittle');
+
+	DROP TEMPORARY TABLE tmp.ticket;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_setRisk.sql

@@ -0,0 +1,87 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setRisk`(
+	vClientFk INT)
+BEGIN
+/**
+ * Update the risk for a client with pending tickets
+ *
+ * @param vClientFk Id cliente
+ */
+	DECLARE vHasDebt BOOL;
+
+	SELECT COUNT(*) INTO vHasDebt
+		FROM `client`
+		WHERE id = vClientFk 
+			AND typeFk = 'normal';
+
+	IF vHasDebt THEN
+
+		CREATE OR REPLACE TEMPORARY TABLE tTicketRisk
+			(KEY (ticketFk))
+			ENGINE = MEMORY
+		WITH ticket AS(
+		SELECT id ticketFk, companyFk, DATE(shipped) dated
+			FROM vn.ticket t
+			WHERE clientFk = vClientFk
+				AND refFk IS NULL
+				AND NOT isDeleted 
+				AND totalWithoutVat <> 0
+		), dated AS(
+		SELECT t.companyFk, MIN(DATE(t.dated) - INTERVAL cc.riskScope MONTH) started,
+				MAX(DATE(t.dated)) ended
+			FROM ticket t
+				JOIN vn.clientConfig cc	
+			GROUP BY t.companyFk	
+		), balance AS(
+		SELECT SUM(amount)amount, companyFk
+			FROM (
+				SELECT amount, companyFk
+					FROM vn.clientRisk 
+					WHERE clientFk = vClientFk	
+				UNION ALL
+				SELECT -(SUM(amount) / 100) amount, tm.companyFk
+					FROM hedera.tpvTransaction t
+						JOIN hedera.tpvMerchant tm ON t.id = t.merchantFk
+					WHERE clientFk = vClientFk	
+						AND receiptFk IS NULL
+						AND status = 'ok'
+			) sub
+			WHERE companyFk
+			GROUP BY companyFk
+		), uninvoiced AS(
+		SELECT t.companyFk, DATE(t.shipped) dated, SUM(IFNULL(t.totalWithVat, 0)) amount
+			FROM vn.ticket t
+				JOIN dated d
+			WHERE t.clientFk = vClientFk
+				AND t.refFk IS NULL
+				AND t.shipped BETWEEN d.started AND d.ended
+			GROUP BY t.companyFk, DATE(t.shipped)
+		), receipt AS(
+		SELECT companyFk,DATE(payed) dated, SUM(amountPaid) amount
+		 	FROM vn.receipt 
+			WHERE clientFk = vClientFk
+				AND payed > util.VN_CURDATE() 
+			GROUP BY companyFk, DATE(payed)
+		), risk AS(
+		SELECT b.companyFk,
+				ui.dated, 
+				SUM(ui.amount) OVER (PARTITION BY b.companyFk ORDER BY ui.dated ) + 
+					b.amount + 
+					SUM(IFNULL(r.amount, 0)) amount
+			FROM balance b
+				JOIN uninvoiced ui ON ui.companyFk = b.companyFk
+				LEFT JOIN receipt r ON r.dated > ui.dated AND r.companyFk = ui.companyFk
+			GROUP BY b.companyFk, ui.dated
+		)
+		SELECT ti.ticketFk, r.amount
+			FROM ticket ti 
+				JOIN risk r ON r.dated = ti.dated AND r.companyFk = ti.companyFk;
+
+		UPDATE ticket t 
+				JOIN tTicketRisk tr ON tr.ticketFk = t.id
+			SET t.risk = tr.amount;
+
+		DROP TEMPORARY TABLE tTicketRisk;
+	END IF;	
+END$$
+DELIMITER ;

db/routines/vn/procedures/workerDisable.sql

@@ -28,5 +28,9 @@ mainLabel:BEGIN
 	UPDATE `client` c
 		SET c.salesPersonFk = null
 		WHERE c.salesPersonFk = vUserId;
+
+	UPDATE locker l
+		SET l.workerFk = NULL
+		WHERE l.workerFk = vUserId; 
 END$$
 DELIMITER ;

db/routines/vn/procedures/worker_updateBalance.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBalance`(vSelfFk INT(11), vCredit DECIMAL(10,2), vDebit DECIMAL(10,2))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBalance`(vSelf INT(11), vCredit DECIMAL(10,2), vDebit DECIMAL(10,2))
 BEGIN
 /**
  * Actualiza la columna balance de worker.
@@ -8,6 +8,6 @@ BEGIN
  */
 	UPDATE worker
 		SET balance = IFNULL(balance, 0) + IFNULL(vCredit, 0) - IFNULL(vDebit, 0)
-		WHERE id = vSelfFk;
+		WHERE id = vSelf;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_afterUpdate.sql

@@ -10,11 +10,5 @@ BEGIN
 		UPDATE `address` SET isDefaultAddress = TRUE
 			WHERE id = NEW.defaultAddressFk;
 	END IF;
-
-	IF NOT NEW.isActive THEN
-		UPDATE account.`user`
-			SET active = FALSE
-			WHERE id = NEW.id;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/country_afterInsert.sql

@@ -5,14 +5,17 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterInsert`
 BEGIN
 	UPDATE sage.Naciones
 		SET countryFk = NEW.id
-		WHERE Nacion = NEW.country;
+		WHERE Nacion = NEW.name;
 
 	IF ROW_COUNT() = 0 THEN
 		CALL mail_insert(
 			'cau@verdnatura.es',
 			NULL,
 			'Actualizar tabla sage.Naciones',
-			CONCAT('Se ha insertado un nuevo país en la tabla vn.conuntry. Para el correcto funcionamiento del sistema \n\t\t\t\tde contabilidad es necesario actualizar la columna sage.Naciones.countryFk con el valor del nuevo país. \n\t\t\t Hay que buscar el nuevo país: ', NEW.country, ' en la tabla sage.Naciones y actualizar el campo sage.Naciones.countryFk con el valor ', NEW.id)
+			CONCAT('Se ha insertado un nuevo país en la tabla vn.conuntry. 
+				Para el correcto funcionamiento del sistema \n\t\t\t\tde contabilidad es necesario actualizar la columna
+				sage.Naciones.countryFk con el valor del nuevo país. \n\t\t\t Hay que buscar el nuevo país: ', NEW.name, 
+				' en la tabla sage.Naciones y actualizar el campo sage.Naciones.countryFk con el valor ', NEW.id)
 		);
 	END IF;
 END$$

db/routines/vn/triggers/country_afterUpdate.sql

@@ -3,8 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterUpdate`
 	AFTER UPDATE ON `country`
 	FOR EACH ROW
 BEGIN
-	IF !(OLD.country <=> NEW.country) THEN
+	IF !(OLD.name <=> NEW.name) THEN
-		UPDATE zoneGeo SET `name` = NEW.country
+		UPDATE zoneGeo SET `name` = NEW.name
 			WHERE id = NEW.geoFk;
 	END IF;
 END$$

db/routines/vn/triggers/country_beforeInsert.sql

@@ -3,6 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_beforeInsert`
 	BEFORE INSERT ON `country`
 	FOR EACH ROW
 BEGIN
-    SET NEW.geoFk = zoneGeo_new('country', NEW.country, NULL);
+    SET NEW.geoFk = zoneGeo_new('country', NEW.name, NULL);
 END$$
 DELIMITER ;

db/routines/vn/views/saleVolume_Today_VNH.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `vn`.`saleVolume_Today_VNH`
 AS SELECT `t`.`nickname` AS `Cliente`,
 	`p`.`name` AS `Provincia`,
-	`c`.`country` AS `Pais`,
+	`c`.`name` AS `Pais`,
 	cast(sum(`sv`.`volume`) AS decimal(5, 1)) AS `volume`
 FROM (
 		(

db/routines/vn2008/views/Ordenes.sql

@@ -16,7 +16,6 @@ AS SELECT `tr`.`id` AS `Id_ORDEN`,
 	`tr`.`ordered` AS `datORDEN`,
 	`tr`.`shipped` AS `datTICKET`,
 	`tr`.`salesPersonCode` AS `CodVENDEDOR`,
-	`tr`.`buyerCode` AS `CodCOMPRADOR`,
 	`tr`.`clientFk` AS `Id_CLIENTE`,
 	`tr`.`total` AS `TOTAL`,
 	`tr`.`buyed` AS `datCOMPRA`

db/routines/vn2008/views/Paises.sql

@@ -2,7 +2,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn2008`.`Paises`
 AS SELECT `c`.`id` AS `Id`,
-	`c`.`country` AS `Pais`,
+	`c`.`name` AS `Pais`,
 	`c`.`CEE` AS `CEE`,
 	`c`.`isUeeMember` AS `isUeeMember`,
 	`c`.`code` AS `Codigo`,

db/routines/vn2008/views/Proveedores.sql

@@ -6,7 +6,6 @@ AS SELECT `s`.`id` AS `Id_Proveedor`,
 	`s`.`account` AS `cuenta`,
 	`s`.`countryFk` AS `pais_id`,
 	`s`.`nif` AS `NIF`,
-	`s`.`isFarmer` AS `Agricola`,
 	`s`.`phone` AS `Telefono`,
 	`s`.`retAccount` AS `cuentaret`,
 	`s`.`commission` AS `ComisionProveedor`,

db/versions/10995-navyErica/02-agencyWorkCenterCreate.sql

@@ -10,9 +10,10 @@ CREATE TABLE IF NOT EXISTS `vn`.`agencyWorkCenter` (
   CONSTRAINT `agencyWorkCenter_agency_FK` FOREIGN KEY (`agencyFk`) REFERENCES `agency` (`id`) ON DELETE CASCADE,
   CONSTRAINT `agencyWorkCenter_user_FK` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `agencyWorkCenter_workCenter_FK` FOREIGN KEY (`workCenterFk`) REFERENCES `workCenter` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='refs #4988';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 
 INSERT INTO vn.agencyWorkCenter (agencyFk, workCenterFk) 
-    SELECT id, workCenterFk 
+    SELECT a.id, wc.id
-        FROM vn.agency 
+	    FROM vn.agency a 
-        WHERE workCenterFk IS NOT NULL;
+		    JOIN vn.warehouse w ON w.id = a.warehouseFk 
+		    JOIN vn.workCenter wc ON wc.warehouseFk = w.id;

db/versions/11000-grayAsparagus/00-firstScript.sql

@@ -0,0 +1,8 @@
+ALTER TABLE vn.ticket DROP COLUMN IF EXISTS problem;
+ALTER TABLE vn.sale DROP COLUMN IF EXISTS problem;
+ALTER TABLE vn.ticket DROP COLUMN IF EXISTS risk;
+
+ALTER TABLE vn.ticket ADD IF NOT EXISTS problem SET('hasTicketRequest', 'isFreezed', 'hasRisk', 'hasHighRisk', 'isTaxDataChecked', 'isTooLittle')NOT NULL DEFAULT '';
+ALTER TABLE vn.sale ADD IF NOT EXISTS problem SET('hasItemShortage', 'hasComponentLack', 'hasItemDelay', 'hasRounding', 'hasItemLost')NOT NULL DEFAULT '';
+ALTER TABLE vn.ticket ADD IF NOT EXISTS risk DECIMAL(10,2) DEFAULT NULL NULL COMMENT 'cache calculada con el riesgo del cliente';
+

db/versions/11013-orangeGerbera/00-firstScript.sql

@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE vn.country CHANGE country name varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+
+ALTER TABLE vn.country ADD COLUMN country VARCHAR(25) AS (name) VIRTUAL;

db/versions/11019-grayDendro/00-locker.sql

@@ -0,0 +1,60 @@
+-- Eliminar locker
+ALTER TABLE `vn`.`worker` DROP COLUMN `locker`;
+
+CREATE TABLE `vn`.`locker` (
+  `id` int(100) auto_increment,
+  `code` varchar(10) DEFAULT NULL,
+  `gender` ENUM('M','F') DEFAULT NULL,
+  `workerFk` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`),
+  UNIQUE KEY `workerFk` (`workerFk`),
+  CONSTRAINT `locker_ibfk_1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE `vn`.`workerLog` 
+	MODIFY COLUMN changedModel enum('Worker','Calendar','WorkerTimeControlMail','Business','WorkerDms','WorkerTimeControl', 'Locker') NOT NULL DEFAULT 'Worker';
+
+-- Insertar taquillas disponibles para hombres (1A - 73A / 1B - 73B)
+INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
+	('1A', 'M', NULL), ('2A', 'M', NULL), ('3A', 'M', NULL), ('4A', 'M', NULL), ('5A', 'M', NULL),
+	('6A', 'M', NULL), ('7A', 'M', NULL), ('8A', 'M', NULL), ('9A', 'M', NULL), ('10A', 'M', NULL),
+	('11A', 'M', NULL), ('12A', 'M', NULL), ('13A', 'M', NULL), ('14A', 'M', NULL), ('15A', 'M', NULL),
+	('16A', 'M', NULL), ('17A', 'M', NULL), ('18A', 'M', NULL), ('19A', 'M', NULL), ('20A', 'M', NULL),
+	('21A', 'M', NULL), ('22A', 'M', NULL), ('23A', 'M', NULL), ('24A', 'M', NULL), ('25A', 'M', NULL),
+	('26A', 'M', NULL), ('27A', 'M', NULL), ('28A', 'M', NULL), ('29A', 'M', NULL), ('30A', 'M', NULL),
+	('31A', 'M', NULL), ('32A', 'M', NULL), ('33A', 'M', NULL), ('34A', 'M', NULL), ('35A', 'M', NULL),
+	('36A', 'M', NULL), ('37A', 'M', NULL), ('38A', 'M', NULL), ('39A', 'M', NULL), ('40A', 'M', NULL),
+	('41A', 'M', NULL), ('42A', 'M', NULL), ('43A', 'M', NULL), ('44A', 'M', NULL), ('45A', 'M', NULL),
+	('46A', 'M', NULL), ('47A', 'M', NULL), ('48A', 'M', NULL), ('49A', 'M', NULL), ('50A', 'M', NULL),
+	('51A', 'M', NULL), ('52A', 'M', NULL), ('53A', 'M', NULL), ('54A', 'M', NULL), ('55A', 'M', NULL),
+	('56A', 'M', NULL), ('57A', 'M', NULL), ('58A', 'M', NULL), ('59A', 'M', NULL), ('60A', 'M', NULL),
+	('61A', 'M', NULL), ('62A', 'M', NULL), ('63A', 'M', NULL), ('64A', 'M', NULL), ('65A', 'M', NULL),
+	('66A', 'M', NULL), ('67A', 'M', NULL), ('68A', 'M', NULL), ('69A', 'M', NULL), ('70A', 'M', NULL),
+	('71A', 'M', NULL), ('72A', 'M', NULL), ('73A', 'M', NULL),
+	('1B', 'M', NULL), ('2B', 'M', NULL), ('3B', 'M', NULL), ('4B', 'M', NULL), ('5B', 'M', NULL),
+	('6B', 'M', NULL), ('7B', 'M', NULL), ('8B', 'M', NULL), ('9B', 'M', NULL), ('10B', 'M', NULL),
+	('11B', 'M', NULL), ('12B', 'M', NULL), ('13B', 'M', NULL), ('14B', 'M', NULL), ('15B', 'M', NULL),
+	('16B', 'M', NULL), ('17B', 'M', NULL), ('18B', 'M', NULL), ('19B', 'M', NULL), ('20B', 'M', NULL),
+	('21B', 'M', NULL), ('22B', 'M', NULL), ('23B', 'M', NULL), ('24B', 'M', NULL), ('25B', 'M', NULL),
+	('26B', 'M', NULL), ('27B', 'M', NULL), ('28B', 'M', NULL), ('29B', 'M', NULL), ('30B', 'M', NULL),
+	('31B', 'M', NULL), ('32B', 'M', NULL), ('33B', 'M', NULL), ('34B', 'M', NULL), ('35B', 'M', NULL),
+	('36B', 'M', NULL), ('37B', 'M', NULL), ('38B', 'M', NULL), ('39B', 'M', NULL), ('40B', 'M', NULL),
+	('41B', 'M', NULL), ('42B', 'M', NULL), ('43B', 'M', NULL), ('44B', 'M', NULL), ('45B', 'M', NULL),
+	('46B', 'M', NULL), ('47B', 'M', NULL), ('48B', 'M', NULL), ('49B', 'M', NULL), ('50B', 'M', NULL),
+	('51B', 'M', NULL), ('52B', 'M', NULL), ('53B', 'M', NULL), ('54B', 'M', NULL), ('55B', 'M', NULL),
+	('56B', 'M', NULL), ('57B', 'M', NULL), ('58B', 'M', NULL), ('59B', 'M', NULL), ('60B', 'M', NULL),
+	('61B', 'M', NULL), ('62B', 'M', NULL), ('63B', 'M', NULL), ('64B', 'M', NULL), ('65B', 'M', NULL),
+	('66B', 'M', NULL), ('67B', 'M', NULL), ('68B', 'M', NULL), ('69B', 'M', NULL), ('70B', 'M', NULL),
+	('71B', 'M', NULL), ('72B', 'M', NULL), ('73B', 'M', NULL);
+
+-- Insertar taquillas disponibles para mujeres (200A - 217A / 200B - 217B)
+INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
+('200A', 'F', NULL), ('201A', 'F', NULL), ('202A', 'F', NULL), ('203A', 'F', NULL), ('204A', 'F', NULL),
+('205A', 'F', NULL), ('206A', 'F', NULL), ('207A', 'F', NULL), ('208A', 'F', NULL), ('209A', 'F', NULL),
+('210A', 'F', NULL), ('211A', 'F', NULL), ('212A', 'F', NULL), ('213A', 'F', NULL), ('214A', 'F', NULL),
+('215A', 'F', NULL), ('216A', 'F', NULL), ('217A', 'F', NULL),
+('200B', 'F', NULL), ('201B', 'F', NULL), ('202B', 'F', NULL), ('203B', 'F', NULL), ('204B', 'F', NULL),
+('205B', 'F', NULL), ('206B', 'F', NULL), ('207B', 'F', NULL), ('208B', 'F', NULL), ('209B', 'F', NULL),
+('210B', 'F', NULL), ('211B', 'F', NULL), ('212B', 'F', NULL), ('213B', 'F', NULL), ('214B', 'F', NULL),
+('215B', 'F', NULL), ('216B', 'F', NULL), ('217B', 'F', NULL);

db/versions/11019-grayDendro/01-aclLocker.sql

@@ -0,0 +1,6 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+	VALUES ('Locker', '__get__codes', 'READ', 'ALLOW', 'ROLE', 'employee'),
+		('Locker', '*', '*', 'ALLOW', 'ROLE', 'hr'),
+		('Locker', '*', '*', 'ALLOW', 'ROLE', 'productionBoss'),
+		('Worker', '__get__locker', 'READ', 'ALLOW', 'ROLE', 'hr'),
+		('Worker', '__get__locker', 'READ', 'ALLOW', 'ROLE', 'productionBoss');

db/versions/11029-tealAnthurium/00-firstScript.sql

@@ -1,2 +0,0 @@
--- Place your SQL code here
-ALTER TABLE vn.productionConfig ADD defaultSectorFk INT UNSIGNED DEFAULT 37 NOT NULL COMMENT 'Default sector';

db/versions/11044-blueOrchid/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.invoiceInConfig CHANGE sageWithholdingFk sageFarmerWithholdingFk smallint(6) NOT NULL;
+ALTER TABLE vn.supplier CHANGE isFarmer isFarmer__ tinyint(1) DEFAULT 0 NOT NULL COMMENT 'refs #7345 @deprecated 2024-05-10 - Utilizar withholdingSageFk';
+ALTER TABLE vn.supplier MODIFY COLUMN isFarmer__ tinyint(1) DEFAULT 0 NOT NULL COMMENT 'refs #7345 @deprecated 2024-05-10 - Utilizar withholdingSageFk';

db/versions/11045-redLaurel/00-firstScript.sql

@@ -0,0 +1,4 @@
+
+
+ALTER TABLE vn.productionConfig 
+   ADD IF NOT EXISTS defaultSectorFk  INT UNSIGNED DEFAULT 37 NOT NULL COMMENT 'Default sector';

db/versions/11046-maroonCamellia/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.item
+MODIFY nonRecycledPlastic DECIMAL(10,2) DEFAULT NULL NULL,
+MODIFY recycledPlastic DECIMAL(10,2) DEFAULT NULL NULL;

e2e/paths/03-worker/02_basicData.spec.js

@@ -25,7 +25,6 @@ describe('Worker basic data path', () => {
         await page.overwrite(selectors.workerBasicData.name, 'David C.');
         await page.overwrite(selectors.workerBasicData.surname, 'H.');
         await page.overwrite(selectors.workerBasicData.phone, '444332211');
-        await page.overwrite(selectors.workerBasicData.locker, '1');
         await page.click(selectors.workerBasicData.saveButton);
 
         const message = await page.waitForSnackbar();
@@ -37,6 +36,5 @@ describe('Worker basic data path', () => {
         expect(await page.waitToGetProperty(selectors.workerBasicData.name, 'value')).toEqual('David C.');
         expect(await page.waitToGetProperty(selectors.workerBasicData.surname, 'value')).toEqual('H.');
         expect(await page.waitToGetProperty(selectors.workerBasicData.phone, 'value')).toEqual('444332211');
-        expect(await page.waitToGetProperty(selectors.workerBasicData.locker, 'value')).toEqual('1');
     });
 });

front/salix/components/bank-entity/index.html

@@ -28,7 +28,7 @@
             ng-model="$ctrl.data.countryFk"
             url="Countries"
             fields="['id', 'country', 'code']"
-            show-field="country"
+            show-field="name"
             value-field="id"
             label="Country">
         </vn-autocomplete>

modules/client/back/methods/client/extendedListFilter.js

@@ -123,7 +123,7 @@ module.exports = Self => {
                     c.hasLcr,
                     c.hasCoreVnl,
                     ct.id AS countryFk,
-                    ct.country,
+                    ct.name country,
                     p.id AS provinceFk,
                     p.name AS province,
                     u.id AS salesPersonFk,

modules/client/back/methods/defaulter/filter.js

@@ -69,7 +69,7 @@ module.exports = Self => {
                         uw.name workerName,
                         c.creditInsurance,
                         d.defaulterSinced,
-                        cn.country,
+                        cn.name country,
                         c.countryFk,
                         pm.name payMethod
                     FROM vn.defaulter d

modules/client/front/address/create/index.html

@@ -61,7 +61,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -83,7 +83,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
             <vn-autocomplete vn-id="province" vn-one
@@ -94,7 +94,7 @@
                 show-field="name"
                 value-field="id"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/client/front/address/edit/index.html

@@ -74,7 +74,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -96,7 +96,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
             <vn-autocomplete vn-id="province" vn-one
@@ -107,7 +107,7 @@
                 show-field="name"
                 value-field="id"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/client/front/address/index/index.html

@@ -50,7 +50,7 @@
                     <span ng-show="::address.postalCode">{{::address.postalCode}} -</span>
                     <span ng-show="::address.city">{{::address.city}},</span>
                     <span ng-show="::address.province.name">{{::address.province.name}},</span>
-                    {{::address.province.country.country}}
+                    {{::address.province.country.name}}
                 </div>
                 <div class="ellipsize">
                     {{::address.phone}}<span ng-if="::address.mobile">, </span>

modules/client/front/create/index.html

@@ -66,7 +66,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -88,7 +88,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
         </vn-horizontal>
@@ -101,14 +101,14 @@
                 url="Provinces/location"
                 fields="['id', 'name', 'countryFk']"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
             <vn-autocomplete
                 vn-id="country"
                 label="Country"
                 ng-model="$ctrl.client.countryFk"
                 url="Countries"
-                show-field="country">
+                show-field="name">
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/client/front/fiscal-data/index.html

@@ -16,7 +16,7 @@
     auto-load="true"
     url="Countries"
     data="countries"
-    order="country">
+    order="name">
 </vn-crud-model>
 <vn-crud-model
     auto-load="true"
@@ -87,7 +87,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -110,7 +110,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
         </vn-horizontal>
@@ -126,14 +126,14 @@
                 show-field="name"
                 value-field="id"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
             <vn-autocomplete
                 vn-one
                 vn-id="country"
                 ng-model="$ctrl.client.countryFk"
                 data="countries"
-                show-field="country"
+                show-field="name"
                 value-field="id"
                 label="Country"
                 rule>

modules/client/front/summary/index.html

@@ -104,7 +104,7 @@
                 value="{{$ctrl.summary.province.name}}">
             </vn-label-value>
             <vn-label-value label="Country"
-                value="{{$ctrl.summary.country.country}}">
+                value="{{$ctrl.summary.country.name}}">
             </vn-label-value>
             <vn-label-value label="Street" no-ellipsize
                 value="{{$ctrl.summary.street}}">

modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js

@@ -29,7 +29,8 @@ module.exports = Self => {
         http: {
             path: '/:id/invoice-in-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.invoiceInPdf = (ctx, id) => Self.printReport(ctx, id, 'invoiceIn');

modules/invoiceIn/back/models/invoice-in-config.json

@@ -26,7 +26,7 @@
 		"sageWithholding": {
 			"type": "belongsTo",
 			"model": "SageWithholding",
-			"foreignKey": "sageWithholdingFk"
+			"foreignKey": "sageFarmerWithholdingFk"
 		}
     },
     "acls": [{

modules/invoiceIn/front/descriptor/index.html

@@ -1,7 +1,7 @@
 <vn-crud-model
     url="InvoiceInConfigs"
     data="$ctrl.config"
-    filter="{fields: ['sageWithholdingFk']}"
+    filter="{fields: ['sageFarmerWithholdingFk']}"
     id-value="1"
     auto-load="true">
 </vn-crud-model>

modules/invoiceIn/front/descriptor/index.js

@@ -112,7 +112,7 @@ class Controller extends Descriptor {
     }
 
     isAgricultural() {
-        return this.invoiceIn.supplier.sageWithholdingFk == this.config[0].sageWithholdingFk;
+        return this.invoiceIn.supplier.sageWithholdingFk == this.config[0].sageFarmerWithholdingFk;
     }
 }
 

modules/invoiceOut/back/methods/invoiceOut/negativeBases.js

@@ -59,7 +59,7 @@ module.exports = Self => {
             `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                 ENGINE = MEMORY
                 SELECT co.code company,
-                        cou.country,
+                        cou.name country,
                         c.id clientId,
                         c.socialName clientSocialName,
                         u.nickname workerSocialName,

modules/item/front/summary/index.html

@@ -181,7 +181,7 @@
                 ng-show="!$ctrl.isBuyer && !$ctrl.isAdministrative">
                 Tax
             </h4>
-            <vn-label-value label="{{tax.country.country}}"
+            <vn-label-value label="{{tax.country.name}}"
                 ng-repeat="tax in $ctrl.summary.item.taxes"
                 value="{{tax.taxClass.description}}">
             </vn-label-value>

modules/item/front/tax/index.html

@@ -15,7 +15,7 @@
             <vn-textfield
                 vn-one
                 label="Country"
-                ng-model="tax.country.country"
+                ng-model="tax.country.name"
                 disabled="true">
             </vn-textfield>
             <vn-autocomplete

modules/route/back/methods/route/getExternalCmrs.js

@@ -103,7 +103,7 @@ module.exports = Self => {
                     SELECT t.cmrFk,
                             t.id ticketFk,
                             t.routeFk,
-                            co.country,
+                            co.name country,
                             t.clientFk,
                             IF(sub.id, TRUE, FALSE) hasCmrDms,
                             DATE(t.shipped) shipped

modules/supplier/front/address/create/index.html

@@ -43,7 +43,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -65,7 +65,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
             <vn-autocomplete vn-id="province" vn-one
@@ -76,7 +76,7 @@
                 show-field="name"
                 value-field="id"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/supplier/front/address/edit/index.html

@@ -41,7 +41,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -63,7 +63,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
             <vn-autocomplete vn-id="province" vn-one
@@ -74,7 +74,7 @@
                 show-field="name"
                 value-field="id"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/supplier/front/fiscal-data/index.html

@@ -16,7 +16,7 @@
     auto-load="true"
     url="Countries"
     data="countries"
-    order="country">
+    order="name">
 </vn-crud-model>
 <vn-crud-model
     auto-load="true"
@@ -143,7 +143,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -172,7 +172,7 @@
                 rule>
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
             <vn-autocomplete
@@ -187,7 +187,7 @@
                 show-field="name"
                 value-field="id"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
@@ -198,7 +198,7 @@
                 vn-name="country"
                 ng-model="$ctrl.supplier.countryFk"
                 data="countries"
-                show-field="country"
+                show-field="name"
                 value-field="id"
                 rule>
             </vn-autocomplete>

modules/supplier/front/summary/index.html

@@ -162,7 +162,7 @@
             </vn-label-value>
             <vn-label-value 
                 label="Country" 
-                value="{{::$ctrl.summary.country.country}}">
+                value="{{::$ctrl.summary.country.name}}">
             </vn-label-value>
         </vn-one>
     </vn-horizontal>

modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js

@@ -1,3 +1,5 @@
+const moment = require('moment');
+
 module.exports = Self => {
     Self.remoteMethodCtx('resendWeeklyHourEmail', {
         description: 'Send the records for the week of the date provided',
@@ -31,7 +33,8 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const yearNumber = dated.getFullYear();
-        const weekNumber = getWeekNumber(dated);
+        const weekNumber = moment(dated).isoWeek();
+
         const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
             where: {
                 workerFk: workerId,
@@ -54,15 +57,4 @@ module.exports = Self => {
 
         return false;
     };
-
-    function getWeekNumber(date) {
-        const tempDate = new Date(date);
-        let dayOfWeek = tempDate.getDay();
-        dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
-        const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
-        const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
-        const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
-        const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
-        return weekNumber;
-    }
 };

modules/worker/back/model-config.json

@@ -121,6 +121,9 @@
     },
     "Operator": {
         "dataSource": "vn"
+    },
+    "Locker": {
+        "dataSource": "vn"
     }
 }
 

modules/worker/back/models/locker.js

@@ -0,0 +1,21 @@
+module.exports = Self => {
+    Self.observe('before save', async ctx => {
+        const models = Self.app.models;
+        const changes = ctx.data || ctx.instance;
+        const instance = ctx.currentInstance;
+
+        const workerFk = changes?.workerFk || instance?.workerFk;
+        if (workerFk) {
+            const locker = await models.Locker.findOne({
+                where: {workerFk}
+            }, ctx.options);
+
+            if (locker) {
+                await Self.rawSql(
+                    'UPDATE locker SET workerFk = NULL where workerFk = ?',
+                    [workerFk],
+                    ctx.options);
+            }
+        }
+    });
+};

modules/worker/back/models/locker.json

@@ -0,0 +1,23 @@
+{
+    "name": "Locker",
+    "base": "VnModel",
+    "description": "Worker's locker",
+    "options": {
+        "mysql": {
+          "table": "locker"
+        }
+    },
+    "properties": {
+        "code": {
+            "type": "string"
+        },
+        "gender": {
+            "type": "string"
+        }
+    },
+    "scopes": {
+        "codes": {
+            "fields": ["id","code"]
+        }
+    }
+}

modules/worker/back/models/specs/locker.spec.js

@@ -0,0 +1,56 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('locker model ', () => {
+    const productionBossId = 50;
+    const hrBuyerId = 124;
+    const hrId = 37;
+    const jessicaJonesId = 1110;
+    const bruceBannerId = 1109;
+    const lockerMaleId = 1;
+    const lockerFemaleId = 147;
+    let ctx;
+    let options;
+    let tx;
+
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: hrId},
+                headers: {origin: 'http://localhost'}
+            },
+        };
+        options = {transaction: tx};
+        tx = await models.Locker.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should allocate a locker', async() => {
+        ctx.req.accessToken.userId = productionBossId;
+
+        const locker = await models.Locker.findById(lockerMaleId, null, options);
+        await locker.updateAttributes({workerFk: bruceBannerId}, options);
+
+        expect(locker.workerFk).toEqual(bruceBannerId);
+    });
+
+    it('should take away a locker', async() => {
+        ctx.req.accessToken.userId = hrBuyerId;
+        const locker = await models.Locker.findById(lockerFemaleId, null, options);
+        await locker.updateAttributes({workerFk: null}, options);
+
+        expect(locker.workerFk).toEqual(null);
+    });
+
+    it('should change a locker', async() => {
+        const locker = await models.Locker.findById(148, null, options);
+        await locker.updateAttributes({workerFk: jessicaJonesId}, options);
+        const oldLocker = await models.Locker.findById(lockerFemaleId, null, options);
+
+        expect(locker.workerFk).toEqual(jessicaJonesId);
+        expect(oldLocker.workerFk).toEqual(null);
+    });
+});

modules/worker/back/models/worker.js

@@ -21,10 +21,6 @@ module.exports = Self => {
     require('../methods/worker/isAuthorized')(Self);
     require('../methods/worker/setPassword')(Self);
 
-    Self.validatesUniquenessOf('locker', {
-        message: 'This locker has already been assigned'
-    });
-
     Self.validateAsync('fi', tinIsValid, {
         message: 'Invalid TIN'
     });

modules/worker/back/models/worker.json

@@ -48,9 +48,6 @@
         "code": {
             "type" : "string"
         },
-        "locker": {
-            "type" : "number"
-        },
         "fi": {
             "type" : "string"
         },
@@ -60,6 +57,9 @@
         "isF11Allowed": {
             "type" : "boolean"
         },
+        "sex": {
+            "type" : "string"
+        },
         "isFreelance": {
             "type" : "boolean"
         }
@@ -94,6 +94,20 @@
             "type": "hasMany",
             "model": "WorkerTeamCollegues",
             "foreignKey": "workerFk"
+        },
+        "locker": {
+            "type": "hasMany",
+            "model": "Locker",
+            "foreignKey": "workerFk"
         }
+    },
+    "acls":[
+        {
+            "property": "__get__locker",
+            "accessType": "READ",
+            "permission": "ALLOW",
+            "principalType": "ROLE",
+            "principalId": "$owner"
         }
+    ]
 }

modules/worker/front/basic-data/index.html

@@ -75,11 +75,6 @@
                     ng-model="$ctrl.worker.SSN"
                     rule>
                 </vn-textfield>
-                <vn-input-number
-                    min="0"
-                    label="Locker"
-                    ng-model="$ctrl.worker.locker">
-                </vn-input-number>
             </vn-horizontal>
         </vn-vertical>
     </vn-card>

modules/worker/front/create/index.html

@@ -65,7 +65,7 @@
                 rule>
                 <tpl-item>
                     {{code}} - {{town.name}} ({{town.province.name}},
-                    {{town.province.country.country}})
+                    {{town.province.country.name}})
                 </tpl-item>
                 <append>
                     <vn-icon-button
@@ -85,7 +85,7 @@
                 url="Provinces/location"
                 fields="['id', 'name', 'countryFk']"
                 rule>
-                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+                <tpl-item>{{name}} ({{country.name}})</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
@@ -99,7 +99,7 @@
                 value-field="name">
                 <tpl-item>
                     {{name}}, {{province.name}}
-                    ({{province.country.country}})
+                    ({{province.country.name}})
                 </tpl-item>
             </vn-datalist>
             <vn-textfield

modules/zone/front/delivery-days/index.html

@@ -37,7 +37,7 @@
                     {{code}} {{town.name}}
                 </div>
                 <div class="text-caption text-secondary">
-                    {{town.province.name}}, {{town.province.country.country}}
+                    {{town.province.name}}, {{town.province.country.name}}
                 </div>
             </tpl-item>
         </vn-autocomplete>

package.json

@@ -39,6 +39,7 @@
         "loopback-context": "^3.5.2",
         "loopback-datasource-juggler": "3.36.1",
         "md5": "^2.2.1",
+        "moment": "^2.30.1",
         "mysql": "2.18.1",
         "node-ssh": "^11.0.0",
         "object.pick": "^1.3.0",

pnpm-lock.yaml

@@ -83,6 +83,9 @@ dependencies:
   md5:
     specifier: ^2.2.1
     version: 2.3.0
+  moment:
+    specifier: ^2.30.1
+    version: 2.30.1
   mysql:
     specifier: 2.18.1
     version: 2.18.1
@@ -10202,6 +10205,10 @@ packages:
       to-iso-string: 0.0.2
     dev: false
 
+  /moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+    dev: false
+
   /ms@0.7.1:
     resolution: {integrity: sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==}
     dev: false

print/templates/reports/campaign-metrics/sql/client.sql

@@ -6,7 +6,7 @@ SELECT
     c.id,
     c.name AS clientName,
     p.name AS province,
-    co.country                    
+    co.name country                   
 FROM client c
     JOIN province p ON c.provinceFk = p.id
     JOIN country co ON c.countryFk = co.id

print/templates/reports/claim-pickup-order/sql/client.sql

@@ -8,7 +8,7 @@ SELECT
     a.street,
     a.nickname,
     p.name AS province,
-    ct.country,
+    ct.name country,
     IFNULL(c.phone, cc.phone) AS phone
 FROM claim cl
     JOIN client c ON c.id = cl.clientFk

print/templates/reports/client-debt-statement/sql/client.sql

@@ -6,7 +6,7 @@ SELECT
     c.city,
     c.fi,
     p.name AS province,
-    ct.country
+    ct.name country
 FROM client c
     JOIN country ct ON ct.id = c.countryFk
     LEFT JOIN province p ON p.id = c.provinceFk

print/templates/reports/cmr/sql/data.sql

@@ -14,12 +14,12 @@ SELECT c.id cmrFk,
 		s.street carrierStreet,
 		s.postCode carrierPostCode,
 		s.city carrierCity,
-		cou.country carrierCountry,
+		cou.name carrierCountry,
 		s2.name senderName,
 		s2.street senderStreet,
 		s2.postCode senderPostCode,
 		s2.city senderCity,
-		cou2.country senderCountry,
+		cou2.name senderCountry,
 		a.street deliveryStreet,
 		a.id deliveryAddressFk,
 		a.postalCode deliveryPostalCode,
@@ -27,12 +27,12 @@ SELECT c.id cmrFk,
 		a.nickname deliveryName,
 		a.phone deliveryPhone,
 		a.mobile deliveryMobile,
-		cou3.country deliveryCountry,
+		cou3.name deliveryCountry,
 		cl.phone clientPhone,
 		a2.street loadStreet,
 		a2.postalCode loadPostalCode,
 		a2.city loadCity,
-		cou4.country loadCountry,
+		cou4.name loadCountry,
 		co.stamp senderStamp,
 		s.stamp deliveryStamp
 	FROM cmr c

print/templates/reports/incoterms-authorization/sql/client.sql

@@ -4,7 +4,7 @@ SELECT
     c.name,
     c.fi,
     c.street,
-    cty.country
+    cty.name country 
 FROM client c
     JOIN country cty ON cty.id = c.countryFk
 WHERE c.id = ?

print/templates/reports/letter-debtor/sql/client.sql

@@ -6,7 +6,7 @@ SELECT
     c.city,
     c.fi,
     p.name AS province,
-    ct.country
+    ct.name country 
 FROM client c
     JOIN country ct ON ct.id = c.countryFk
     LEFT JOIN province p ON p.id = c.provinceFk

print/templates/reports/sepa-core/sql/client.sql

@@ -7,7 +7,7 @@ SELECT
         c.city,
         c.fi,
         p.name AS province,
-        ct.country,
+        ct.name country,
         ct.code AS countryCode,
         ct.ibanLength AS ibanLength
 FROM client c

print/templates/reports/sepa-core/sql/supplier.sql

@@ -2,7 +2,7 @@ SELECT
     m.code mandateCode,
     s.name,
     s.street,
-    sc.country,
+    sc.name country,
     s.postCode,
     s.city,
     sp.name province,

print/templates/reports/supplier-campaign-metrics/sql/supplier.sql

@@ -5,7 +5,7 @@ SELECT
         s.id,
         s.name AS supplierName,
         p.name AS province,
-        co.country                    
+        co.name country
     FROM supplier s
         JOIN province p ON s.provinceFk = p.id
         JOIN country co ON s.countryFk = co.id