Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing

back/methods/chat/sendQueued.js

@@ -33,14 +33,14 @@ module.exports = Self => {
                     await Self.sendCheckingUserStatus(chat);
                     await updateChat(chat, sentStatus);
                 } catch (error) {
-                    await updateChat(chat, errorStatus);
+                    await updateChat(chat, errorStatus, error);
                 }
             } else {
                 try {
                     await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
                     await updateChat(chat, sentStatus);
                 } catch (error) {
-                    await updateChat(chat, errorStatus);
+                    await updateChat(chat, errorStatus, error);
                 }
             }
         }
@@ -75,7 +75,7 @@ module.exports = Self => {
                 const channelName = department && department.chatName;
 
                 if (channelName)
-                    return Self.sendMessage(chat.senderFk, `#${channelName}`, `@${recipient.name} ➔ ${message}`);
+                    return Self.sendMessage(chat.senderFk, `#${channelName}`, `@${recipient.name} ➔ ${chat.message}`);
                 else
                     return Self.sendMessage(chat.senderFk, `@${recipient.name}`, chat.message);
             } else
@@ -127,12 +127,14 @@ module.exports = Self => {
      *
      * @param {object} chat - The chat
      * @param {string} status - The new status
+     * @param {string} error - The error
      * @return {Promise} - The request promise
      */
-    async function updateChat(chat, status) {
+    async function updateChat(chat, status, error) {
         return chat.updateAttributes({
             status: status,
-            attempts: ++chat.attempts
+            attempts: ++chat.attempts,
+            error: error
         });
     }
 

back/models/chat.json

@@ -32,6 +32,9 @@
         },
         "attempts": {
             "type": "number"
+        },
+        "error": {
+            "type": "string"
         }
     },
     "acls": [{

db/changes/10411-january/00-acl.sql

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

db/changes/10411-january/00-booking.sql

@@ -1,248 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.invoiceInBookingMain;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`invoiceInBookingMain`(vInvoiceInId INT)
-BEGIN
-	DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
-	DECLARE vBookNumber,vSerialNumber INT;
-	DECLARE vRate DECIMAL(10,4);
-
-	CALL invoiceInBookingCommon(vInvoiceInId,vSerialNumber);
-
-	SELECT SUM(iit.taxableBase * IF( i.serial= 'R' AND ti.Iva <> 'HP DEVENGADO 21 ISP', 1 +(ti.PorcentajeIva/100),1)), 
-			SUM(iit.foreignValue * IF( i.serial= 'R', 1 + (ti.PorcentajeIva/100),1)),
-			iit.taxableBase/iit.foreignValue
-			INTO vTotalAmount, vTotalAmountDivisa, vRate
-		FROM newInvoiceIn i
-			JOIN invoiceInTax iit ON iit.invoiceInFk = i.id
-			LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk;
-
-	CALL vn.ledger_next(vBookNumber);
-
-	-- Apunte del proveedor
-
-	INSERT INTO XDiario(ASIEN,
-			FECHA,
-			SUBCTA,
-			EUROHABER,
-			CONCEPTO,
-			CAMBIO,
-			HABERME,
-			NFACTICK,
-			CLAVE,
-			empresa_id
-			)
-		SELECT 
-			vBookNumber,
-			n.bookEntried,
-			s.supplierAccount,
-			vTotalAmount EUROHABER,
-			n.conceptWithSupplier,
-			vRate,
-			vTotalAmountDivisa,
-			n.invoicesCount,
-			vInvoiceInId,
-			n.companyFk
-		FROM newInvoiceIn n 
-			JOIN newSupplier s;
-
-	-- Línea de Gastos
-	INSERT INTO XDiario ( ASIEN,
-			FECHA,
-			SUBCTA,
-			CONTRA,
-			EURODEBE,
-			EUROHABER,
-			CONCEPTO, 
-			CAMBIO,
-			DEBEME,
-			HABERME,
-			NFACTICK,
-			empresa_id
-			)
-		SELECT vBookNumber ASIEN,
-				n.bookEntried FECHA,
-				IF(e.isWithheld , LPAD(RIGHT(s.supplierAccount,5),10,iit.expenceFk),iit.expenceFk) SUBCTA,
-				s.supplierAccount CONTRA,
-				IF(e.isWithheld AND iit.taxableBase < 0, NULL, ROUND(SUM(iit.taxableBase),2)) EURODEBE,
-				IF(e.isWithheld AND iit.taxableBase < 0,ROUND(SUM(-iit.taxableBase),2),NULL) EUROHABER,
-				n.conceptWithSupplier CONCEPTO,
-				vRate,
-				IF(e.isWithheld,NULL,ABS(ROUND(SUM(iit.foreignValue),2))) DEBEME,
-				IF(e.isWithheld,ABS(ROUND(SUM(iit.foreignValue),2)),NULL) HABERME,
-				n.invoicesCount NFACTICK,
-				n.companyFk empresa_id
-			FROM newInvoiceIn n
-				JOIN newSupplier s 
-				JOIN invoiceInTax iit ON iit.invoiceInFk = n.id
-				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = iit.expenceFk
-			WHERE e.name != 'Suplidos Transitarios nacionales'
-			GROUP BY iit.expenceFk;
-
-	-- Líneas de IVA
-
-	INSERT INTO XDiario( ASIEN,
-			FECHA,
-			SUBCTA,
-			CONTRA, 
-			EURODEBE,
-			BASEEURO,
-			CONCEPTO, 
-			FACTURA, 
-			IVA,
-			AUXILIAR, 
-			SERIE,
-			TIPOOPE,
-			FECHA_EX,
-			FECHA_OP,
-			NFACTICK,
-			FACTURAEX,
-			L340,
-			LRECT349,
-			TIPOCLAVE,
-			TIPOEXENCI,
-			TIPONOSUJE,
-			TIPOFACT,
-			TIPORECTIF,
-			TERIDNIF,
-			TERNIF,
-			TERNOM,
-			FECREGCON,
-			empresa_id
-			)
-		SELECT vBookNumber ASIEN,
-				n.bookEntried FECHA,
-				IF(n.expenceFkDeductible>0, n.expenceFkDeductible, ti.CuentaIvaSoportado) SUBCTA,
-				s.supplierAccount CONTRA,
-				SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100 /* + 0.0001*/ , 2)) EURODEBE,
-				SUM(it.taxableBase) BASEEURO,
-				GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
-				vSerialNumber FACTURA,
-				ti.PorcentajeIva IVA,
-				IF(isUeeMember AND eWithheld.id IS NULL,'','*') AUXILIAR,
-				n.serial SERIE,
-				ttr.ClaveOperacionDefecto,
-				n.issued FECHA_EX,
-				n.operated FECHA_OP,
-				n.invoicesCount NFACTICK,
-				n.supplierRef FACTURAEX,
-				TRUE L340,
-				(isSameCountry OR NOT isUeeMember) LRECT349,
-				n.cplusTrascendency472Fk TIPOCLAVE,
-				n.cplusTaxBreakFk TIPOEXENCI,
-				n.cplusSubjectOpFk TIPONOSUJE,
-				n.cplusInvoiceType472Fk TIPOFACT,
-				n.cplusRectificationTypeFk TIPORECTIF,
-				iis.cplusTerIdNifFk TERIDNIF,
-				s.nif AS TERNIF,
-				s.name AS TERNOM,
-				n.booked FECREGCON,
-				n.companyFk
-			FROM newInvoiceIn n
-				JOIN newSupplier s 
-				JOIN invoiceInTax it ON n.id = it.invoiceInFk
-				JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
-				JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
-				JOIN invoiceInSerial iis ON iis.code = n.serial
-				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
-				LEFT JOIN (
-					SELECT eWithheld.id 
-						FROM invoiceInTax hold 
-							JOIN expence eWithheld ON eWithheld.id = hold.expenceFk AND eWithheld.isWithheld 
-						WHERE hold.invoiceInFk = vInvoiceInId LIMIT 1
-						) eWithheld ON TRUE 
-			WHERE it.taxTypeSageFk IS NOT NULL 
-				AND it.taxTypeSageFk NOT IN (22, 90)
-			GROUP BY ti.PorcentajeIva, e.id;
-
-	-- Línea iva inversor sujeto pasivo
- 
-	INSERT INTO XDiario( ASIEN,
-			FECHA,
-			SUBCTA,
-			CONTRA, 
-			EUROHABER,
-			BASEEURO,
-			CONCEPTO, 
-			FACTURA, 
-			IVA,
-			AUXILIAR, 
-			SERIE,
-			TIPOOPE,
-			FECHA_EX,
-			FECHA_OP,
-			NFACTICK,
-			FACTURAEX,
-			L340,
-			LRECT349,
-			TIPOCLAVE,
-			TIPOEXENCI,
-			TIPONOSUJE,
-			TIPOFACT,
-			TIPORECTIF,
-			TERIDNIF,
-			TERNIF,
-			TERNOM,
-			empresa_id
-			)
-		SELECT vBookNumber ASIEN,
-				n.bookEntried FECHA,
-				ti.CuentaIvaRepercutido SUBCTA,
-				s.supplierAccount CONTRA,
-				SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100,2)) EUROHABER,
-				ROUND(SUM(it.taxableBase),2) BASEEURO,
-				GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
-				vSerialNumber FACTURA,
-				ti.PorcentajeIva IVA,
-				'*' AUXILIAR,
-				n.serial SERIE,
-				ttr.ClaveOperacionDefecto,
-				n.issued FECHA_EX,
-				n.operated FECHA_OP,
-				n.invoicesCount NFACTICK,
-				n.supplierRef FACTURAEX,
-				FALSE L340,
-				(isSameCountry OR NOT isUeeMember) LRECT349,
-				1 TIPOCLAVE,
-				n.cplusTaxBreakFk TIPOEXENCI,
-				n.cplusSubjectOpFk TIPONOSUJE,
-				n.cplusInvoiceType472Fk TIPOFACT,
-				n.cplusRectificationTypeFk TIPORECTIF,
-				iis.cplusTerIdNifFk TERIDNIF,
-				s.nif AS TERNIF,
-				s.name AS TERNOM,
-				n.companyFk
-			FROM newInvoiceIn n 
-				JOIN newSupplier s 
-				JOIN invoiceInTax it ON n.id = it.invoiceInFk
-				JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
-				JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
-				JOIN invoiceInSerial iis ON iis.code = n.serial 
-				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
-			WHERE ti.Iva = 'HP DEVENGADO 21 ISP' OR MID(s.account, 4, 1) = '1'
-			GROUP BY ti.PorcentajeIva, e.id;
-		
-	-- Actualización del registro original		
-	UPDATE invoiceIn ii
-			JOIN newInvoiceIn ni ON ii.id = ni.id
-		SET ii.serialNumber = vSerialNumber,
-			ii.isBooked = TRUE;
-	
-	-- Problemas derivados de la precisión en los decimales al calcular los impuestos
-	UPDATE XDiario 
-		SET EURODEBE = EURODEBE - 
-			(SELECT IF(ABS(sub.difference) = 0.01, sub.difference, 0)
-				FROM(
-					SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference 
-						FROM XDiario
-						WHERE ASIEN = vBookNumber
-					)sub
-			)
-		WHERE ASIEN = vBookNumber 
-			AND EURODEBE <> 0
-		ORDER BY id DESC
-		LIMIT 1;
-	
-END$$
-DELIMITER ;

db/changes/10411-january/00-companyGroup.sql

@@ -1,12 +0,0 @@
-UPDATE `vn`.`companyGroup`
-	SET `code`='verdnatura'
-	WHERE `id`=1;
-UPDATE `vn`.`companyGroup`
-	SET `code`='ornamental'
-	WHERE `id`=2;
-UPDATE `vn`.`companyGroup`
-	SET `code`='other'
-	WHERE `id`=3;
-UPDATE `vn`.`companyGroup`
-	SET `code`='provisional'
-	WHERE `id`=4;

db/changes/10411-january/00-saleVolume.sql

@@ -1,38 +0,0 @@
-USE vn;
-DELIMITER $$
-$$
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `vn`.`saleVolume` AS
-select
-    `s`.`ticketFk` AS `ticketFk`,
-    `s`.`id` AS `saleFk`,
-    round(`ic`.`cm3delivery` * `s`.`quantity` / 1000, 0) AS `litros`,
-    `t`.`routeFk` AS `routeFk`,
-    `t`.`shipped` AS `shipped`,
-    `t`.`landed` AS `landed`,
-    `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `volume`,
-    `s`.`quantity` * `ic`.`grams` / 1000 AS `physicalWeight`,
-    `s`.`quantity` * `ic`.`cm3delivery` * greatest(`i`.`density`, 167) / 1000000 AS `weight`,
-    `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `physicalVolume`,
-    `s`.`quantity` * `ic`.`cm3delivery` * ifnull(`t`.`zonePrice`, `z`.`price`) / (`vc`.`standardFlowerBox` * 1000) AS `freight`,
-    `t`.`zoneFk` AS `zoneFk`,
-    `t`.`clientFk` AS `clientFk`,
-    `s`.`isPicked` AS `isPicked`,
-    `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 AS `eurosValue`,
-    `i`.`itemPackingTypeFk` AS `itemPackingTypeFk`
-from
-    (((((`sale` `s`
-join `item` `i` on
-    (`i`.`id` = `s`.`itemFk`))
-join `ticket` `t` on
-    (`t`.`id` = `s`.`ticketFk`))
-join `zone` `z` on
-    (`z`.`id` = `t`.`zoneFk`))
-join `volumeConfig` `vc`)
-join `itemCost` `ic` on
-    (`ic`.`itemFk` = `s`.`itemFk`
-        and `ic`.`warehouseFk` = `t`.`warehouseFk`))
-where
-    `s`.`quantity` > 0;
-$$
-DELIMITER ;

db/changes/10411-january/00-workerLabour.sql

@@ -1,25 +0,0 @@
-ALTER TABLE `postgresql`.`business` ADD payedHolidays INT NULL;
-ALTER TABLE `postgresql`.`business` CHANGE payedHolidays payedHolidays INT NULL AFTER reasonEndFk;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `vn`.`workerLabour` AS
-select
-`b`.`business_id` AS `businessFk`,
-`p`.`id_trabajador` AS `workerFk`,
-`bl`.`workcenter_id` AS `workCenterFk`,
-`b`.`date_start` AS `started`,
-`b`.`date_end` AS `ended`,
-`d`.`id` AS `departmentFk`,
-`b`.`payedHolidays` AS `payedHolidays`
-from
-((((`postgresql`.`person` `p`
-join `postgresql`.`profile` `pr` on
-((`pr`.`person_id` = `p`.`person_id`)))
-join `postgresql`.`business` `b` on
-((`b`.`client_id` = `pr`.`profile_id`)))
-join `postgresql`.`business_labour` `bl` on
-((`b`.`business_id` = `bl`.`business_id`)))
-join `vn`.`department` `d` on
-((`d`.`id` = `bl`.`department_id`)))
-order by
-`b`.`date_start` desc

db/changes/10420-valentines/00-ImportTicketAcl.sql

@@ -1,2 +0,0 @@
-DELETE FROM `salix`.`ACL`
-WHERE model = 'ClaimEnd' AND property = 'importTicketSales';

db/changes/10420-valentines/00-aclCollection.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL`
-(model, property, accessType, permission, principalType, principalId)
-VALUES('Collection', 'setSaleQuantity', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10420-valentines/00-aclDocuware.sql

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

db/changes/10420-valentines/00-defaultViewConfig.sql

@@ -1,3 +0,0 @@
-UPDATE `salix`.`defaultViewConfig`
-    SET `columns`='{"intrastat":false,"stemMultiplier":false,"landed":false,"producer":false}'
-        WHERE tableCode ='itemsIndex';

db/changes/10420-valentines/00-docuware.sql

@@ -1,11 +0,0 @@
-CREATE TABLE `vn`.`docuware` (
-    `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    `code` varchar(50) NULL,
-    `fileCabinetName` varchar(50) NULL,
-    `dialogName` varchar(255) DEFAULT NULL,
-    `find` varchar(50) DEFAULT NULL
-);
-
-INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `dialogName` , `find`)
-    VALUES
-        ('deliveryClient', 'Albaranes cliente', 'findTicket', 'N__ALBAR_N');

db/changes/10420-valentines/00-docuwareConfig.sql

@@ -1,9 +0,0 @@
-CREATE TABLE `vn`.`docuwareConfig` (
-    `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    `url` varchar(75) NULL,
-    `token` varchar(1000) DEFAULT NULL
-);
-
-INSERT INTO `vn`.`docuwareConfig` (`url`)
-    VALUES
-        ('https://verdnatura.docuware.cloud/docuware/platform');

db/changes/10420-valentines/00-state.sql

@@ -1,26 +0,0 @@
-ALTER TABLE `vn`.`state` ADD classColor varchar(12) NULL;
-
-UPDATE `vn`.`state` s
-    SET s.classColor = 'warning'
-        WHERE s.alertLevel = 1;
-
-UPDATE `vn`.`state` s
-    SET s.classColor = 'alert'
-        WHERE s.alertLevel = 0;
-
-UPDATE `vn`.`state` s
-    SET s.classColor = 'success'
-        WHERE s.code LIKE 'OK';
-
-UPDATE `vn`.`state` s
-    SET s.classColor = 'notice'
-        WHERE s.code LIKE 'FREE';
-
-UPDATE `vn`.`state` s
-    SET s.classColor = 'success'
-        WHERE s.order >= 4 
-            AND (s.alertLevel = 0 OR s.alertLevel = 1);
-
-UPDATE `vn`.`state` s
-    SET s.classColor = 'warning'
-        WHERE s.code IN ('PREVIOUS_PREPARATION', 'PREPARED', 'ON_PREPARATION', 'ON_CHECKING', 'CHECKED');

db/changes/10420-valentines/00-ticket_getMovable.sql

@@ -1,46 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_getMovable`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
-BEGIN
-/**
- * Cálcula el stock movible para los artículos de un ticket
- * vDatedNew debe ser menor que vDatedOld, en los otros casos se
- * asume que siempre es posible
- *
- * @param vTicketFk -> Ticket
- * @param vDatedNew -> Nueva fecha
- * @return Sales con Movible
-*/    
-    DECLARE vDatedOld DATETIME;
-	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
-
-    SELECT t.shipped INTO vDatedOld
-        FROM ticket t 
-        WHERE t.id = vTicketFk;
-
-    CALL itemStock(vWarehouseFk, vDatedNew, NULL); 
-    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
-	
-    SELECT s.id, 
-			s.itemFk, 
-			s.quantity, 
-			s.concept, 
-			s.price, 
-			s.reserved,
-			s.discount,  
-			i.image, 
-			i.subName, 
-			il.stock + IFNULL(im.amount, 0) AS movable
-        FROM ticket t
-            JOIN sale s ON s.ticketFk = t.id
-            JOIN item i ON i.id = s.itemFk 
-            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
-            LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
-        WHERE t.id = vTicketFk;
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
-END$$
-DELIMITER ;

db/changes/10430-ash/00-aclAgencyTerm.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,principalId)
-	VALUES ('AgencyTerm','*','*','administrative');

db/changes/10430-ash/00-aclClaimLog.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-    VALUES
-        ('ClaimLog', '*', 'READ', 'ALLOW', 'ROLE', 'claimManager');

db/changes/10430-ash/00-deliveryBoss.sql

@@ -1 +0,0 @@
-UPDATE `account`.`user` SET `role` = 57 WHERE id IN (2294, 4365, 7294);

db/changes/10440-fallas/00-ACL.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-VALUES ('Edi', 'updateData', 'WRITE', 'ALLOW', 'ROLE', 'employee');

db/changes/10440-fallas/00-aclAgency.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES(304, 'Agency', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10440-fallas/00-aclEducationLevel.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES('EducationLevel', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10440-fallas/00-aclIntrastat.sql

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

db/changes/10440-fallas/00-aclSupplierAgencyTerms.sql

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

db/changes/10440-fallas/00-agencyTermConfig.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `vn`.`agencyTermConfig` (
-  `expenceFk` varchar(10) DEFAULT NULL,
-  `vatAccountSupported` varchar(15) DEFAULT NULL,
-  `vatPercentage` decimal(28,10) DEFAULT NULL,
-  `transaction` varchar(50) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-INSERT INTO `vn`.`agencyTermConfig`
-(`expenceFk`, `vatAccountSupported`, `vatPercentage`, `transaction`)
-VALUES('6240000000', '4721000015', 21.0000000000, 'Adquisiciones intracomunitarias de servicios');

db/changes/10440-fallas/00-claimConfig.sql

@@ -1,8 +0,0 @@
-CREATE TABLE `vn`.`claimConfig` (
-  `id` int(11) NOT NULL,
-  `pickupContact` varchar(250),
-  PRIMARY KEY (`id`)
-);
-
-INSERT INTO vn.claimConfig (id, pickupContact)
-    VALUES(1, 'Email: cmorenoa@logista.com Telf: 961594250 Extensión: 206');

db/changes/10440-fallas/00-claimState.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`claimState` ADD `hasToNotify` TINYINT DEFAULT 0 NULL;
-UPDATE `vn`.`claimState` SET `hasToNotify` = 1 WHERE `code` IN ('canceled', 'incomplete');

db/changes/10440-fallas/00-claim_packages.sql

@@ -1 +0,0 @@
-ALTER TABLE `vn`.`claim` ADD packages smallint(10) unsigned DEFAULT 0 NULL COMMENT 'packages received by the client';

db/changes/10440-fallas/00-component.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`component` (`name`,`typeFk`,`classRate`,`isRenewable`,`code`,`isRequired`) 
-    VALUES ('maná reclamacion',7,4,0,'manaClaim',0);

db/changes/10440-fallas/00-country.sql

@@ -1,90 +0,0 @@
-ALTER TABLE `vn`.`country` ADD `a3Code` INT NULL COMMENT 'Código país para a3';
-
-UPDATE `vn`.`country` c
-JOIN `vn2008`.`payroll_pais` `p` ON `p`.`pais` = `c`.`country`
-SET `c`.`a3Code` = `p`.`codpais`;
-
-UPDATE `vn`.`country`
-SET `a3Code` = 710
-WHERE `country` = 'Sud-Africa'; -- ÁFRICA DEL SUR
-
-UPDATE `vn`.`country`
-SET `a3Code` = 643
-WHERE `country` = 'Rusia'; -- FEDERACIÓN DE RUSIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 28
-WHERE `country` = 'Antigua'; -- ANTIGUA Y BARBUDA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 840
-WHERE `country` = 'USA'; -- ESTADOS UNIDOS
-
-UPDATE `vn`.`country`
-SET `a3Code` = 404
-WHERE `country` = 'Kenya'; -- KENIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 498
-WHERE `country` = 'Moldavia'; -- REPÚBLICA DE MOLDAVIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 826
-WHERE `country` = 'Gran Bretaña'; -- REINO UNIDO
-
-UPDATE `vn`.`country`
-SET `a3Code` = 484
-WHERE `country` = 'Mexico'; -- MÉJICO
-
-UPDATE `vn`.`country`
-SET `a3Code` = 716
-WHERE `country` = 'Zimbawe'; -- ZINBABWE
-
-UPDATE `vn`.`country`
-SET `a3Code` = 203
-WHERE `country` = 'Chequia'; -- REPÚBLICA CHECA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 764
-WHERE `country` = 'Thailandia'; -- TAILANDIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 276
-WHERE `country` = 'Alemania'; -- REPÚBLICA FEDERAL DE ALEMANIA
-
-UPDATE `vn`.`country`
-SET `a3Code` = 112
-WHERE `country` = 'Bielorrusia'; -- BELARUS
-
-UPDATE `vn`.`country`
-SET `a3Code` = 528
-WHERE `country` = 'Holanda'; -- PAÍSES BAJOS
-
-UPDATE `vn`.`country`
-SET `a3Code` = 410
-WHERE `country` = 'Corea del Sur'; -- COREA (REPÚBLICA)
-
-UPDATE `vn`.`country`
-SET `a3Code` = 724
-WHERE `country` = 'España exento'; -- ESPAÑA
-
--- Borrar registro USA de country:
-UPDATE `vn`.`supplier` `s`
-    SET `s`.`countryFk` = 62
-    WHERE `s`.`countryFk` = 12;
-
-UPDATE `vn`.`bankEntity` 
-    SET `countryFk` = 62
-    WHERE `countryFk` = 12;
-
-DELETE FROM `vn`.`country`
-    WHERE `id`= 12;
-
-UPDATE `vn2008`.`payroll_pais`
-SET `pais`='COREA NORTE (REPÚBLICA DEM. POPULAR)'
-WHERE `codpais`=408;
-UPDATE `vn2008`.`payroll_pais`
-SET `pais`='COREA SUR (REPÚBLICA) '
-WHERE `codpais`=410;
-
-RENAME TABLE `vn2008`.`payroll_pais` TO `vn2008`.`payroll_pais__`;

db/changes/10440-fallas/00-invoiceInIntrastat.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
-	VALUES ('InvoiceInIntrastat','*','*','ALLOW','ROLE','employee');

db/changes/10440-fallas/00-manaCustomerUpdate.sql

@@ -1,106 +0,0 @@
-DROP PROCEDURE IF EXISTS `bs`.`manaCustomerUpdate`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaCustomerUpdate`()
-BEGIN
-	DECLARE vToDated DATE;
-	DECLARE vFromDated DATE;
-	DECLARE vForDeleteDated DATE;
-	DECLARE vManaId INT;
-    DECLARE vManaAutoId INT;
-    DECLARE vClaimManaId INT;
-    DECLARE vManaBankId INT;
-    DECLARE vManaGreugeTypeId INT;
-
-	SELECT id INTO vManaId 
-			FROM `component` WHERE code = 'mana';
-		
-	SELECT id INTO vManaAutoId 
-		FROM `component` WHERE code = 'autoMana';
-	
-	SELECT id INTO vClaimManaId
-		FROM `component` WHERE code = 'manaClaim';
-	
-	SELECT id INTO vManaBankId 
-		FROM `bank` WHERE code = 'mana';
-	
-	SELECT id INTO vManaGreugeTypeId 
-		FROM `greugeType` WHERE code = 'mana';
-
-	SELECT IFNULL(max(dated), '2016-01-01')
-            INTO vFromDated 
-        FROM bs.manaCustomer;
-	
-    DELETE 
-		FROM bs.manaCustomer 
-		WHERE dated = vFromDated;
-
-	SELECT IFNULL(max(dated), '2016-01-01')
-            INTO vFromDated 
-        FROM bs.manaCustomer;
-
-    WHILE timestampadd(DAY,30,vFromDated) < CURDATE() DO
-
-        SELECT
-                timestampadd(DAY,30,vFromDated),
-                timestampadd(DAY,-90,vFromDated) 
-            INTO 
-                vToDated,
-                vForDeleteDated;
-            
-        DELETE FROM bs.manaCustomer 
-            WHERE dated <= vForDeleteDated;
-
-
-        INSERT INTO bs.manaCustomer(Id_Cliente, Mana, dated)
-
-            SELECT 
-                    Id_Cliente,
-                    cast(sum(mana) as decimal(10,2)) as mana,
-                    vToDated as dated 
-                FROM 
-
-                (
-                    SELECT cs.Id_Cliente, Cantidad * Valor as mana
-                        FROM vn2008.Tickets t
-                            JOIN vn2008.Consignatarios cs using(Id_Consigna)
-                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
-                            JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
-                        WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
-                            AND t.Fecha > vFromDated 
-                            AND date(t.Fecha) <= vToDated
-                    
-
-                    UNION ALL
-
-                    SELECT r.Id_Cliente, - Entregado
-                        FROM vn2008.Recibos r
-                        WHERE Id_Banco = vManaBankId
-                            AND Fechacobro > vFromDated 
-                            AND Fechacobro <= vToDated
-                    
-                    UNION ALL
-                    
-                    SELECT g.Id_Cliente, g.Importe
-                        FROM vn2008.Greuges g
-                        WHERE Greuges_type_id = vManaGreugeTypeId
-                            AND Fecha > vFromDated 
-                            AND Fecha <= vToDated
-                    
-                    UNION ALL
-                    
-                    SELECT Id_Cliente, mana
-                        FROM bs.manaCustomer
-                        WHERE dated = vFromDated    
-                ) sub
-
-                GROUP BY Id_Cliente
-                HAVING Id_Cliente;
-
-        SET vFromDated = vToDated;
-               
-    END WHILE;
-
-END$$
-DELIMITER ;

db/changes/10440-fallas/00-manaSpellersRequery.sql

@@ -1,75 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`manaSpellersRequery`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`manaSpellersRequery`(vWorkerFk INTEGER)
-BEGIN
-/**
- * Recalcula el mana consumido por un trabajador
- *
- * @param vWorkerFk Id Trabajador
- */  
-	DECLARE vWorkerIsExcluded BOOLEAN;
-	DECLARE vFromDated DATE;
-    DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
-	DECLARE vMana INT;
-    DECLARE vAutoMana INT;
-    DECLARE vClaimMana INT;
-    DECLARE vManaBank INT;
-    DECLARE vManaGreugeType INT;
-    
-    SELECT COUNT(*) INTO vWorkerIsExcluded
-		FROM workerManaExcluded
-		WHERE workerFk = vWorkerFk;
-    
-	IF NOT vWorkerIsExcluded THEN
-		SELECT id INTO vMana 
-			FROM `component` WHERE code = 'mana';
-		
-		SELECT id INTO vAutoMana 
-			FROM `component` WHERE code = 'autoMana';
-		
-		SELECT id INTO vClaimMana 
-			FROM `component` WHERE code = 'manaClaim';
-		
-		SELECT id INTO vManaBank 
-			FROM `bank` WHERE code = 'mana';
-		
-		SELECT id INTO vManaGreugeType 
-			FROM `greugeType` WHERE code = 'mana';
-
-		SELECT max(dated) INTO vFromDated 
-			FROM clientManaCache;
-            
-        REPLACE workerMana (workerFk, amount)
-			SELECT vWorkerFk, sum(mana) FROM 
-			(
-				SELECT s.quantity * sc.value as mana
-					FROM ticket t
-						JOIN address a ON a.id = t.addressFk
-						JOIN client c ON c.id = a.clientFk
-						JOIN sale s ON s.ticketFk = t.id
-						JOIN saleComponent sc ON sc.saleFk = s.id
-					WHERE c.salesPersonFk =  vWorkerFk AND sc.componentFk IN (vMana, vAutoMana, vClaimMana)
-						AND t.shipped > vFromDated AND t.shipped < vToDated
-				UNION ALL
-				SELECT  - r.amountPaid
-					FROM receipt r
-						JOIN client c ON c.id = r.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND bankFk = vManaBank
-						AND payed > vFromDated
-				UNION ALL
-				SELECT g.amount
-					FROM greuge g
-						JOIN client c ON c.id = g.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
-						AND g.shipped > vFromDated and g.shipped < CURDATE()				
-				UNION ALL				
-				SELECT cc.mana
-					FROM clientManaCache cc
-						JOIN client c ON c.id = cc.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND cc.dated = vFromDated
-			) sub;
-	END IF;
-END$$
-DELIMITER ;

db/changes/10440-fallas/00-supplierAgencyTerm.sql

@@ -1,48 +0,0 @@
-ALTER TABLE `vn`.`agencyTerm` ADD `supplierFk` INT NULL;
-ALTER TABLE `vn`.`agencyTerm` CHANGE `supplierFk` `supplierFk` INT NULL AFTER `agencyFk`;
-
-UPDATE `vn`.`agencyTerm` `at`
-	JOIN `vn`.`agency` `a` ON `a`.`id` = `at`.`agencyFk`
-SET `at`.`supplierFk` = `a`.`supplierFk`;
-
-ALTER TABLE `vn`.`agencyTerm` ADD CONSTRAINT `agencyTerm_FK` FOREIGN KEY (`agencyFk`) REFERENCES `vn`.`agency`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`agencyTerm` ADD CONSTRAINT `agencyTerm_FK_1` FOREIGN KEY (`supplierFk`) REFERENCES `vn`.`supplier`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-RENAME TABLE `vn`.`agencyTerm` TO `vn`.`supplierAgencyTerm`;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED 
-DEFINER=`root`@`localhost`  
-VIEW `vn`.`agencyTerm` AS
-SELECT
-    `sat`.`agencyFk` AS `agencyFk`,
-    `sat`.`minimumPackages` AS `minimumPackages`,
-    `sat`.`kmPrice` AS `kmPrice`,
-    `sat`.`packagePrice` AS `packagePrice`,
-    `sat`.`routePrice` AS `routePrice`,
-    `sat`.`minimumKm` AS `minimumKm`,
-    `sat`.`minimumM3` AS `minimumM3`,
-    `sat`.`m3Price` AS `m3Price`
-FROM
-    `vn`.`supplierAgencyTerm` `sat`;
-
-ALTER TABLE `vn`.`agency` DROP FOREIGN KEY `agency_ibfk_4`;
-ALTER TABLE `vn`.`agency` CHANGE `supplierFk` `supplierFk__` int(11) DEFAULT NULL NULL;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED 
-DEFINER=`root`@`localhost`  
-VIEW `vn2008`.`agency` AS
-SELECT
-    `a`.`id` AS `agency_id`,
-    `a`.`name` AS `name`,
-    `a`.`warehouseFk` AS `warehouse_id`,
-    `a`.`isVolumetric` AS `por_volumen`,
-    `a`.`bankFk` AS `Id_Banco`,
-    `a`.`warehouseAliasFk` AS `warehouse_alias_id`,
-    `a`.`isOwn` AS `propios`,
-    `a`.`labelZone` AS `zone_label`,
-    `a`.`workCenterFk` AS `workCenterFk`,
-    `a`.`supplierFk__` AS `supplierFk__`
-FROM
-    `vn`.`agency` `a`;

db/changes/10440-fallas/00-ticketRefund.sql

@@ -1,149 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
-BEGIN
-	
-	DECLARE vDone BIT DEFAULT 0;
-	DECLARE vCustomer MEDIUMINT;
-	DECLARE vWarehouse TINYINT;
-	DECLARE vCompany MEDIUMINT;
-	DECLARE vAddress MEDIUMINT;
-    DECLARE vRefundAgencyMode INT;
-    DECLARE vItemFk INT;
-    DECLARE vQuantity DECIMAL (10,2);
-    DECLARE vConcept VARCHAR(50);
-    DECLARE vPrice DECIMAL (10,2);
-    DECLARE vDiscount TINYINT;
-	DECLARE vSaleNew INT;
-    DECLARE vSaleMain INT;
-    DECLARE vZoneFk INT;
-    
-    DECLARE vRsMainTicket CURSOR FOR
-		SELECT *
-			FROM tmp.sale;
-    
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-	
-    SELECT id INTO vRefundAgencyMode
-		FROM agencyMode WHERE `name` = 'ABONO';
-
-	SELECT clientFk, warehouseFk, companyFk, addressFk 
-			INTO vCustomer, vWarehouse, vCompany, vAddress
-		FROM ticket 
-        WHERE id = vOriginTicket;
-    
-    SELECT id INTO vZoneFk 
-		FROM zone WHERE agencyModeFk = vRefundAgencyMode
-        LIMIT 1;
-        
-	INSERT INTO vn.ticket (
-			clientFk,
-			shipped,
-			addressFk,
-			agencyModeFk,
-			nickname,
-			warehouseFk,
-			companyFk,
-			landed,
-            zoneFk
-		)
-		SELECT
-					vCustomer,
-					CURDATE(),
-					vAddress,
-					vRefundAgencyMode,
-					a.nickname,
-					vWarehouse,
-					vCompany,
-					CURDATE(),
-                    vZoneFk
-			FROM address a
-			WHERE a.id = vAddress;
-
-	SET vNewTicket = LAST_INSERT_ID();
-
-	SET vDone := 0;	
-	OPEN vRsMainTicket ;
-    FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	WHILE NOT vDone DO
-    
-		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
-			VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-            
-        SET vSaleNew = LAST_INSERT_ID();
-        
-        INSERT INTO vn.saleComponent(saleFk,componentFk,`value`) 
-        SELECT vSaleNew,componentFk,`value`  
-			FROM vn.saleComponent 
-            WHERE saleFk = vSaleMain;
-        
-		FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-        
-	END WHILE;
-	CLOSE vRsMainTicket;
-
-	INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
-		VALUES(vNewTicket, vOriginTicket);
-
-END$$
-DELIMITER ;
-
-CREATE TABLE `vn`.`ticketRefund` (
-	`id` INT auto_increment NULL,
-	`refundTicketFk` INT NOT NULL,
-	`originalTicketFk` INT NOT NULL,
-	CONSTRAINT `ticketRefund_PK` PRIMARY KEY (id)
-)
-ENGINE=InnoDB
-DEFAULT CHARSET=utf8
-COLLATE=utf8_unicode_ci;
-
-ALTER TABLE `vn`.`ticketRefund` ADD CONSTRAINT `ticketRefund_FK` FOREIGN KEY (`refundTicketFk`) REFERENCES `vn`.`ticket`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`ticketRefund` ADD CONSTRAINT `ticketRefund_FK_1` FOREIGN KEY (`originalTicketFk`) REFERENCES `vn`.`ticket`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeInsert`
-	BEFORE INSERT ON `ticketRefund`
-	FOR EACH ROW
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-	IF NEW.refundTicketFk = NEW.originalTicketFk THEN
-		CALL util.throw('Original ticket and refund ticket has same id');
-	END IF;
-
-    SELECT COUNT(*) INTO vAlreadyExists
-		FROM ticketRefund 
-		WHERE refundTicketFk = NEW.originalTicketFk;
-	
-	IF vAlreadyExists > 0 THEN
-		CALL util.throw('This ticket is already a refund');
-	END IF;
-END$$
-DELIMITER ;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeUpdate`
-	BEFORE UPDATE ON `ticketRefund`
-	FOR EACH ROW
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-	IF NEW.refundTicketFk = NEW.originalTicketFk THEN
-		CALL util.throw('Original ticket and refund ticket has same id');
-	END IF;
-
-    SELECT COUNT(*) INTO vAlreadyExists
-		FROM ticketRefund 
-		WHERE refundTicketFk = NEW.originalTicketFk;
-	
-	IF vAlreadyExists > 0 THEN
-		CALL util.throw('This ticket is already a refund');
-	END IF;
-END$$
-DELIMITER ;

db/changes/10440-fallas/00-travelThermograph.sql

@@ -1,16 +0,0 @@
-DROP TRIGGER `vn`.`travelThermograph_beforeInsert`;
-
-ALTER TABLE `vn`.`travelThermograph` CHANGE `temperature` `temperature__` enum('COOL','WARM','DRY') CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL;
-
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `vn2008`.`travel_thermograph` AS
-select
-    `tt`.`thermographFk` AS `thermograph_id`,
-    `tt`.`created` AS `odbc_date`,
-    `tt`.`warehouseFk` AS `warehouse_id`,
-    `tt`.`travelFk` AS `travel_id`,
-    `tt`.`temperatureFk` AS `temperature`,
-    `tt`.`result` AS `result`,
-    `tt`.`dmsFk` AS `gestdoc_id`
-from
-    `vn`.`travelThermograph` `tt`;

db/changes/10440-fallas/00-worker.sql

@@ -1,51 +0,0 @@
-
-ALTER TABLE `vn`.`worker` MODIFY COLUMN `maritalStatus__` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-UPDATE `vn`.`worker` `w`  
-    SET `w`.`maritalStatus__` = NULL;
-
-UPDATE `vn`.`worker` `w` 
-    JOIN `vn`.`person` `p` ON `p`.`workerFk` = `w`.`id` 
-    JOIN `postgresql`.`profile` `pr` ON `pr`.`person_id` = `p`.`id` 
-    JOIN `vn2008`.`profile_labour_payroll` `pl` ON `pl`.`profile_id` = `pr`.`profile_id` 
-    SET `w`.`maritalStatus__` = `pl`.`estadocivil`;
-
-ALTER TABLE `vn`.`worker` ADD `originCountryFk` mediumint(8) unsigned NULL COMMENT 'País de origen';
-ALTER TABLE `vn`.`worker` ADD `educationLevelFk` SMALLINT NULL;
-ALTER TABLE `vn`.`worker` ADD `SSN` varchar(15) NULL;
-ALTER TABLE `vn`.`worker` CHANGE `maritalStatus__` `maritalStatus` enum('S','M') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-ALTER TABLE `vn`.`worker` MODIFY COLUMN `maritalStatus` enum('S','M') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-ALTER TABLE `vn`.`worker` CHANGE `maritalStatus` maritalStatus enum('S','M') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER sectorFk;
-ALTER TABLE `vn`.`worker` ADD CONSTRAINT `worker_FK_2` FOREIGN KEY (`educationLevelFk`) REFERENCES `vn`.`educationLevel`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`worker` ADD CONSTRAINT `worker_FK_1` FOREIGN KEY (`originCountryFk`) REFERENCES `vn`.`country`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-INSERT INTO `vn`.`country` (`country`, `CEE`, `code`, `politicalCountryFk`, `isUeeMember`, `a3Code`)
-    VALUES 
-        ('Argentina',2,'AR',80,0,32),
-        ('Cuba',2,'CU',81,0,192),
-        ('Guinea Ecuatorial',2,'GQ',82,0,226),
-        ('Guinea',2,'GN',83,0,324),
-        ('Honduras',2,'HN',84,0,340),
-        ('Mali',2,'ML',85,0,466),
-        ('Nicaragua',2,'NI',86,0,558),
-        ('Pakistán',2,'PK',87,0,586),
-        ('Paraguay',2,'PY',88,0,600),
-        ('Senegal',2,'SN',89,0,686),
-        ('Uruguay',2,'UY',90,0,858),
-        ('Venezuela',2,'VE',91,0,862),
-        ('Bulgaria',2,'BG',92,1,100),
-        ('Georgia',2,'GE',93,0,268);
-
-UPDATE `vn`.`worker` `w` 
-    JOIN `vn`.`person` `p` ON `p`.`workerFk` = `w`.`id` 
-    JOIN `postgresql`.`profile` `pr` ON `pr`.`person_id` = `p`.`id` 
-    JOIN `vn2008`.`profile_labour_payroll` `pl` ON `pl`.`profile_id` = `pr`.`profile_id` 
-    JOIN `vn`.`country` `co` ON `co`.`a3Code` = `pl`.`codpais` 
-    SET `w`.`originCountryFk` = `co`.`id`;
-
-UPDATE `vn`.`worker` `w` 
-    JOIN `vn`.`person` `p` ON `p`.`workerFk` = `w`.`id` 
-    JOIN `postgresql`.`profile` `pr` ON `pr`.`person_id` = `p`.`id` 
-    JOIN `vn2008`.`profile_labour_payroll` pl ON `pl`.`profile_id` = `pr`.`profile_id` 
-    SET `w`.`SSN` = CONCAT(`pl`.`NSSProvincia`, `pl`.`NssNumero`, `pl`.`NssDC`);
-
-RENAME TABLE `vn2008`.`profile_labour_payroll` TO `vn2008`.`profile_labour_payroll__`;

db/changes/10440-fallas/00-workerBusinessType.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `postgresql`.`business_labour_payroll` DROP FOREIGN KEY `business_labour_payroll_cod_contrato`;
-ALTER TABLE `vn`.`workerBusinessType` MODIFY COLUMN `id` int(11) NOT NULL;
-ALTER TABLE `postgresql`.`business_labour_payroll` ADD CONSTRAINT `business_labour_payroll_FK` FOREIGN KEY (cod_contrato) REFERENCES `vn`.`workerBusinessType`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;

db/changes/10450-april/00-timeControl_getError.sql

@@ -1,73 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.timeControl_getError;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeControl_getError`(vDatedFrom DATETIME, vDatedTo DATETIME)
-BEGIN
-/*
- * @param vDatedFrom
- * @param vDatedTo 
- * @table tmp.`user`(userFk)
- * Fichadas incorrectas de las cuales no se puede calcular horas trabajadas
- * @return tmp.timeControlError (id)
- */
-	DECLARE vDayMaxTime INTEGER; 
-
-	SET @journeyCounter := 0;
-	SET @lastUserFk := NULL;
-
-	SELECT dayMaxTime INTO vDayMaxTime
-		FROM workerTimeControlConfig LIMIT 1;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; 
-	CREATE TEMPORARY TABLE tmp.timeControl 
-			(INDEX(id), INDEX(journeyCounter))
-			ENGINE = MEMORY
-		SELECT 	sub.id,
-				sub.direction, 
-				sub.timed,
-				IF(sub.direction = 'in' OR @hasOut OR sub.userFk <> @lastUserFk, @journeyCounter := @journeyCounter + 1, @journeyCounter) journeyCounter,
-				@lastUserFk := sub.userFk workerFk,	
-				IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE) 
-			FROM (
-				SELECT  DISTINCT wtc.id,
-						wtc.direction,
-						wtc.timed,
-						wtc.userFk
-					FROM workerTimeControl wtc
-						JOIN tmp.`user` w ON w.userFk = wtc.userFk
-					WHERE wtc.timed BETWEEN DATE_SUB(vDatedFrom, INTERVAL 1 DAY) AND DATE_ADD(vDatedTo, INTERVAL 1 DAY)
-					ORDER BY wtc.userFk, wtc.timed
-			) sub;
-		
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux; 
-	CREATE TEMPORARY TABLE tmp.timeControlAux
-			(INDEX(id), INDEX(journeyCounter))
-			ENGINE = MEMORY
-		SELECT * FROM tmp.timeControl;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError; 
-		CREATE TEMPORARY TABLE tmp.timeControlError 
-				(INDEX(id))
-				ENGINE = MEMORY
-			SELECT id 
-				FROM tmp.timeControlAux tca
-					JOIN (SELECT journeyCounter, 
-									UNIX_TIMESTAMP(MAX(timed)) - UNIX_TIMESTAMP(MIN(timed)) timeWork,
-									SUM(direction = 'in') totalIn, 
-									SUM(direction = 'out') totalOut,
-									timed
-								FROM tmp.timeControl
-								GROUP BY journeyCounter
-								HAVING COUNT(*) MOD 2 = 1 
-									OR totalIn <> 1 
-									OR totalOut <> 1 
-									OR timeWork >= vDayMaxTime
-						)sub ON sub.journeyCounter = tca.journeyCounter
-				WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo;
-			
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControl; 
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux; 
-
-END$$
-DELIMITER ;

db/changes/10451-april/00-account_user.sql

@@ -1 +0,0 @@
-ALTER TABLE `vn`.`userConfig` ADD darkMode tinyint(1) DEFAULT 1 NOT NULL COMMENT 'Salix interface dark mode';

db/changes/10451-april/00-aclExpeditionState.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('ExpeditionState', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/10451-april/00-aclExpense.sql

@@ -1,5 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES('Expense', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES('Expense', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

db/changes/10451-april/00-aclSaleRefund.sql

@@ -1,6 +0,0 @@
-UPDATE `salix`.`ACL`
-	SET `property`='refund'
-WHERE `model`='Sale' AND `property`='payBack';
-
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('Sale', 'refundAll', 'WRITE', 'ALLOW', 'ROLE', 'employee');

db/changes/10451-april/00-aclSupplierActivity.sql

@@ -1,5 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('SupplierActivity', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-VALUES('SupplierActivity', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

db/changes/10460-mother/00-clientConfig.sql

@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`clientConfig` ADD `maxCreditRows` int(11) NULL COMMENT 'Máximo número de registros a mantener en la tabla clientCredit';
-
-UPDATE `vn`.`clientConfig`
-	SET `maxCreditRows` = 10
-	WHERE `id` = 1;

db/changes/10460-mother/00-dmsForeignKey.sql

@@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`propertyDms` DROP FOREIGN KEY propertyDms_FK;
-ALTER TABLE `vn`.`propertyDms` ADD CONSTRAINT propertyDms_FK FOREIGN KEY (dmsFk) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `vn`.`clientDms` DROP FOREIGN KEY clientDms_ibfk_2;
-ALTER TABLE `vn`.`clientDms` ADD CONSTRAINT clientDms_ibfk_2 FOREIGN KEY (dmsFk) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `vn`.`workerDocument` DROP FOREIGN KEY workerDocument_ibfk_2;
-ALTER TABLE `vn`.`workerDocument` ADD CONSTRAINT workerDocument_ibfk_2 FOREIGN KEY (document) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10460-mother/01-dmsType.sql

@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`dmsType` ADD monthToDelete INT UNSIGNED DEFAULT NULL NULL;
-ALTER TABLE `vn`.`dmsType` MODIFY COLUMN monthToDelete int(10) unsigned DEFAULT NULL NULL COMMENT 'Meses en el pasado para ir borrando registros, dejar a null para no borrarlos nunca';
-UPDATE `vn`.`dmsType`
-	SET monthToDelete=6
-	WHERE id=20;

db/changes/10460-mother/02-dmsTrigger.sql

@@ -1,18 +0,0 @@
-
-DELIMITER $$
-$$
-CREATE TRIGGER `vn`.`dms_beforeDelete`
-BEFORE DELETE
-ON dms FOR EACH ROW
-BEGIN 
-	DECLARE vCanNotBeDeleted INT;
-	SELECT COUNT(*) INTO vCanNotBeDeleted 
-		FROM dmsType dt 
-		WHERE NOT (code <=> 'trash') 
-			AND dt.id = OLD.dmsTypeFk;
-			
-	IF vCanNotBeDeleted THEN 
-		CALL util.throw('A dms can not be deleted');
-	END IF;
-END$$
-DELIMITER ;

db/changes/10460-mother/03-clean.sql

@@ -1,175 +0,0 @@
-DROP PROCEDURE IF EXISTS vn.clean;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
-BEGIN
-	DECLARE vDateShort DATETIME;
-	DECLARE vOneYearAgo DATE;
-	DECLARE vFourYearsAgo DATE;
-	DECLARE v18Month DATE;
-	DECLARE v26Month DATE;
-	DECLARE v3Month DATE;
-	DECLARE vTrashId varchar(15);
-
-	SET vDateShort = TIMESTAMPADD(MONTH, -2, CURDATE());
-	SET vOneYearAgo = TIMESTAMPADD(YEAR,-1,CURDATE());
-	SET vFourYearsAgo = TIMESTAMPADD(YEAR,-4,CURDATE());
-	SET v18Month = TIMESTAMPADD(MONTH, -18,CURDATE());
-	SET v26Month = TIMESTAMPADD(MONTH, -26,CURDATE());
-	SET v3Month = TIMESTAMPADD(MONTH, -3, CURDATE());
-
-	DELETE FROM ticketParking WHERE created < vDateShort;
-	DELETE FROM routesMonitor WHERE dated < vDateShort;
-	DELETE FROM workerTimeControlLog WHERE created < vDateShort;
-	DELETE FROM `message` WHERE sendDate < vDateShort;
-	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
-	DELETE FROM itemShelving WHERE created < CURDATE() AND visible = 0;
-	DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,CURDATE());
-	DELETE FROM entryLog WHERE creationDate < vDateShort;
-	DELETE IGNORE FROM expedition WHERE created < v26Month;
-	DELETE FROM sms WHERE created < v18Month;
-	DELETE FROM saleTracking WHERE created < vOneYearAgo;
-	DELETE tobs FROM ticketObservation tobs 
-		JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,CURDATE());
-	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
-	DELETE FROM sharingCart where ended < vDateShort;
-	DELETE FROM sharingClient where ended < vDateShort;
-	DELETE tw.* FROM ticketWeekly tw 
-		LEFT JOIN sale s ON s.ticketFk = tw.ticketFk WHERE s.itemFk IS NULL;
-	DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
-	DELETE FROM message WHERE sendDate < vDateShort;
-	-- Robert ubicacion anterior de trevelLog comentario para debug
-	DELETE sc FROM saleChecked sc 
-		JOIN sale s ON sc.saleFk = s.id WHERE s.created < vDateShort;
-	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
-	DELETE bm
-		FROM buyMark bm 
-			JOIN buy b ON b.id = bm.id 
-			JOIN entry e ON e.id = b.entryFk
-			JOIN travel t ON t.id = e.travelFk
-		WHERE t.landed <= vDateShort;
-	DELETE FROM stowaway WHERE created < v3Month;
-	DELETE FROM vn.buy WHERE created < vDateShort AND entryFk = 9200;
-	DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
-	DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
-
-
-	-- Equipos duplicados
-	DELETE w.* 
-		FROM workerTeam w
-		JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
-				FROM workerTeam
-				GROUP BY team,workerFk
-				HAVING duplicated
-			 ) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
-
-	DELETE sc 
-		FROM  saleComponent sc
-			JOIN sale s ON s.id=  sc.saleFk
-			JOIN ticket t ON t.id= s.ticketFk
-		WHERE t.shipped < v18Month;
-
-	DELETE c 
-		FROM vn.claim c
-			JOIN vn.claimState cs ON cs.id = c.claimStateFk
-		WHERE cs.description = "Anulado" AND
-			c.created < vDateShort;
-	DELETE
-		FROM vn.expeditionTruck
-		WHERE ETD < v3Month;
-
-	-- borrar travels sin entradas
-	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
-	CREATE TEMPORARY TABLE tmp.thermographToDelete
-		SELECT th.id,th.dmsFk
-		FROM vn.travel t
-			LEFT JOIN vn.entry e ON e.travelFk = t.id
-			JOIN vn.travelThermograph th ON th.travelFk = t.id
-		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, CURDATE()) AND e.travelFk IS NULL;
-
-	SELECT dt.id into vTrashId
-		FROM vn.dmsType dt
-		WHERE dt.code = 'trash';
-
-	UPDATE tmp.thermographToDelete th
-		JOIN vn.dms d ON d.id = th.dmsFk
-		SET d.dmsTypeFk = vTrashId;
-
-	DELETE th 
-		FROM tmp.thermographToDelete tmp
-		JOIN vn.travelThermograph th ON th.id = tmp.id;
-
-	DELETE t
-		FROM vn.travel t
-		LEFT JOIN vn.entry e ON e.travelFk = t.id
-		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, CURDATE()) AND e.travelFk IS NULL;
-	
-	UPDATE dms d
-			JOIN dmsType dt ON dt.id = d.dmsTypeFk 
-		SET d.dmsTypeFk = vTrashId 
-		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, CURDATE());
-	
-	-- borrar entradas sin compras
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	CREATE TEMPORARY TABLE tmp.entryToDelete
-		SELECT e.*
-			FROM vn.entry e
-			LEFT JOIN vn.buy b ON b.entryFk = e.id
-			JOIN vn.entryConfig  ec ON e.id != ec.defaultEntry
-		WHERE e.dated < TIMESTAMPADD(MONTH, -3, CURDATE()) AND b.entryFK IS NULL;
-
-	DELETE e
-		FROM vn.entry e
-		JOIN tmp.entryToDelete tmp ON tmp.id = e.id;    
-	
-	-- borrar de route registros menores a 4 años
-	DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
-	CREATE TEMPORARY TABLE tmp.routeToDelete
-		SELECT *
-		FROM vn.route r
-		WHERE created < TIMESTAMPADD(YEAR,-4,CURDATE());   
-
-	UPDATE  tmp.routeToDelete tmp
-		JOIN vn.dms d ON d.id = tmp.gestdocFk
-		SET d.dmsTypeFk = vTrashId;
-
-	DELETE r 
-		FROM tmp.routeToDelete tmp
-		JOIN vn.route r ON  r.id = tmp.id;
-
-	-- borrar registros de dua y awb menores a 2 años
-	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-	CREATE TEMPORARY TABLE tmp.duaToDelete
-		SELECT * 
-			FROM vn.dua 
-			WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE()); 
-
-	UPDATE  tmp.duaToDelete tm
-		JOIN vn.dms d ON d.id = tm.gestdocFk
-		SET d.dmsTypeFk = vTrashId;
-
-	DELETE d
-		FROM tmp.duaToDelete tmp
-		JOIN vn.dua d ON d.id = tmp.id;
-
-	DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,CURDATE());        
-
-	-- Borra los ficheros gestDoc
-	INSERT INTO vn.printServerQueue(priorityFk, labelReportFk)VALUES(1,11);
-
-	-- Borra los registros de collection y ticketcollection
-	DELETE FROM vn.collection  WHERE created < vDateShort;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-
-	DELETE FROM travelLog WHERE creationDate < v3Month;
-
-	CALL shelving_clean;	
-
-END$$
-DELIMITER ;

db/changes/10460-mother/04-acl.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee')

db/changes/10461-mother/00-ClientUnpaid.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `vn`.`clientUnpaid` (
-  `clientFk` int(11) NOT NULL,
-  `dated` date NOT NULL,
-  `amount` double DEFAULT 0,
-  PRIMARY KEY (`clientFk`),
-  CONSTRAINT `clientUnpaid_clientFk` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON UPDATE CASCADE
-);
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES('ClientUnpaid', '*', '*', 'ALLOW', 'ROLE', 'administrative');

db/changes/10461-mother/00-invoiceOut_queue.sql

@@ -1,8 +0,0 @@
-CREATE TABLE `vn`.`invoiceOut_queue` (
-  `invoiceFk` int(10) unsigned not null,
-  `queued` datetime default now() not null,
-  `printed` datetime  null,
-  `status` VARCHAR(50) DEFAULT '' NULL,
-  CONSTRAINT `invoiceOut_queue_pk` PRIMARY KEY (`invoiceFk`),
-  CONSTRAINT `invoiceOut_queue_invoiceOut_id_fk` FOREIGN KEY (`invoiceFk`) REFERENCES `vn`.`invoiceOut` (`id`) ON UPDATE CASCADE ON DELETE CASCADE 
-) comment 'Queue for PDF invoicing';

db/dump/fixtures.sql

@@ -122,17 +122,17 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
         (3, 'GBP', 'Libra',         1),
         (4, 'JPY', 'Yen Japones',   1);
 
-INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `politicalCountryFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
+INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`, `politicalCountryFk`)
     VALUES
-        (1, 'España',   1, 'ES', 1, 1,  24, 4, 0, 1),
+        (1, 'España',   1, 'ES', 1, 24, 4, 0, 1, 1),
-        (2, 'Italia',   1, 'IT', 1, 2,  27, 4, 0, 1),
+        (2, 'Italia',   1, 'IT', 1, 27, 4, 0, 1, 2),
-        (3, 'Alemania', 1, 'DE', 1, 3,  22, 4, 0, 1),
+        (3, 'Alemania', 1, 'DE', 1, 22, 4, 0, 1, 3),
-        (4, 'Rumania',  1, 'RO', 1, 4,  24, 4, 0, 1),
+        (4, 'Rumania',  1, 'RO', 1, 24, 4, 0, 1, 4),
-        (5, 'Holanda',  1, 'NL', 1, 5,  18, 4, 0, 1),
+        (5, 'Holanda',  1, 'NL', 1, 18, 4, 0, 1, 5),
-        (8, 'Portugal', 1, 'PT', 1, 8,  27, 4, 0, 1),
+        (8, 'Portugal', 1, 'PT', 1, 27, 4, 0, 1, 8),
-        (13,'Ecuador',  0, 'EC', 1, 13, 24, 2, 1, 2),
+        (13,'Ecuador',  0, 'EC', 1, 24, 2, 1, 2, 13),
-        (19,'Francia',  1, 'FR', 1, 19, 27, 4, 0, 1),
+        (19,'Francia',  1, 'FR', 1, 27, 4, 0, 1, 19),
-        (30,'Canarias', 1, 'IC', 1, 1,  24, 4, 1, 2);
+        (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2, 30);
 
 INSERT INTO `vn`.`warehouseAlias`(`id`, `name`)
     VALUES
@@ -497,12 +497,28 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
         ('flowerPlants',  'Wholesale of flowers and plants'),
         ('vegetablesFruits', 'Fruit and vegetable trade');
 
+INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
+    VALUES
+        (1, 1,   'Ace Chemicals',                 'The Midtown',      1, '46000', 'Gotham', '111111111', '222222222'),
+        (2, 1,   'Arkham Asylum',                 'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
+        (3, 2,   'Wayne Tower',                   'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
+        (4, 2,   'Bank of Gotham',                'Founders Island',  1, '46000', 'Gotham', '111111111', '222222222'),
+        (5, 442, 'GCR building',                  'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
+        (6, 442, 'The Gotham Tonight building',   'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
+
 INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
     VALUES
         (1,   'Plants SL',             'Plants nick',   4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
         (2,   'Farmer King',           'The farmer',    4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM',      2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
         (442, 'Verdnatura Levante SL', 'Verdnatura',    5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',      1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');
 
+INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
+    VALUES
+        (1, 1,    123121212, 654789123,     'supplier1@email.es',   'observation1',     'the boss'),
+        (2, 1,    987456132, NULL,          NULL,                   NULL,               'the salesperson'),
+        (3, 2,    321654987, NULL,          'supplier2@email.es',   NULL,               NULL),
+        (4, 442,  321654987, NULL,          NULL,                   'observation442',   NULL);
+
 INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
     VALUES
          (241, 442, 'ES111122333344111122221111', 128);
@@ -554,18 +570,16 @@ INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`)
         (4, 8.07,   0.81,   4770000010),
         (5, 8.07,   0.81,   4770000010);
 
-INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`)
+INSERT INTO `vn`.`expence`(`id`, `name`, `isWithheld`)
     VALUES
-        (2000000000, 1, 'Inmovilizado pendiente',           0),
+        (2000000000, 'Inmovilizado pendiente',           0),
-        (2000000000, 3, 'Compra de bienes de inmovilizado', 0),
+        (2000000001, 'Compra de bienes de inmovilizado', 0),
-        (4751000000, 0, 'Retenciones',                      1),
+        (4751000000, 'Retenciones',                      1),
-        (4751000000, 1, 'Retenciones',                      1),
+        (4751000001, 'Retencion',                        0),
-        (4751000000, 6, 'Retencion',                        0),
+        (6210000567, 'Alquiler VNH',                     0),
-        (6210000567, 0, 'Alquiler VNH',                     0),
+        (6240000000, 'Transportes de ventas rutas',      0),
-        (6240000000, 1, 'Transportes de ventas rutas',      0),
+        (7001000000, 'Mercaderia',                       0),
-        (6240000000, 4, 'Transportes de ventas rutas',      0),
+        (7050000000, 'Prestacion de servicios',          1);
-        (7001000000, 1, 'Mercaderia',                       0),
-        (7050000000, 1, 'Prestacion de servicios',          1);
 
 
 INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk`, `created`)
@@ -1152,13 +1166,6 @@ INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`)
         (3, 2, NULL),
         (23, 1, NULL);
 
-INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `level`)
-    VALUES
-        (1, 1, 1);
-INSERT INTO `vn`.`parking` (`column`, `row`, `sectorFk`, `code`, `pickingOrder`)
-    VALUES
-        ('100', '01', 1, '100-01', 1);
-
 INSERT INTO `vn`.`genus`(`id`, `name`)
     VALUES
         (1, 'Abelia'),
@@ -1328,22 +1335,6 @@ INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
         (1104, 500),
         (1105, 5000);
 
-INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
-    VALUES
-        (1, 1,   'Ace Chemicals',                 'The Midtown',      1, '46000', 'Gotham', '111111111', '222222222'),
-        (2, 1,   'Arkham Asylum',                 'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
-        (3, 2,   'Wayne Tower',                   'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
-        (4, 2,   'Bank of Gotham',                'Founders Island',  1, '46000', 'Gotham', '111111111', '222222222'),
-        (5, 442, 'GCR building',                  'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
-        (6, 442, 'The Gotham Tonight building',   'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
-
-INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
-    VALUES
-        (1, 1,    123121212, 654789123,     'supplier1@email.es',   'observation1',     'the boss'),
-        (2, 1,    987456132, NULL,          NULL,                   NULL,               'the salesperson'),
-        (3, 2,    321654987, NULL,          'supplier2@email.es',   NULL,               NULL),
-        (4, 442,  321654987, NULL,          NULL,                   'observation442',   NULL);
-
 INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_refresh`, `expires`, `created`, `connection_id`)
     VALUES
         (1, 2, 'available', CONCAT_WS('/',1,util.VN_CURDATE()), util.VN_NOW(), DATE_ADD(util.VN_NOW(),INTERVAL 15 MINUTE), util.VN_CURDATE(), NULL),
@@ -1772,6 +1763,11 @@ INSERT INTO `vn`.`claimDestination`(`id`, `description`, `addressFk`)
         (4, 'Reclam.PRAG',  12),
         (5, 'Corregido',    11);
 
+INSERT INTO `vn`.`claimResponsible`(`id`, `description`, `responsability`)
+    VALUES
+        (1, 'Buyers', 0),
+        (7, 'Quality', 0);
+
 INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`)
     VALUES
         (1, 1, 1, 21, 1,  1, 2, 5),
@@ -1879,29 +1875,20 @@ INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
         (5, 1102),
         (9, 1201);
 
-INSERT INTO `postgresql`.`person`(`person_id`, `name`, `nickname`, `nif`, `firstname`, `id_trabajador`)
+INSERT INTO `postgresql`.`profile`(`profile_id`, `workerFk`, `profile_type_id`)
-		SELECT w.id, w.lastName, u.nickname,CONCAT(RPAD(CONCAT(w.id,9),8,w.id),'A'),w.firstName,w.id
+        SELECT w.id, w.id, 1
-			FROM `vn`.`worker` `w`
+			FROM `vn`.`worker` `w`;
-				JOIN `account`.`user` `u` ON `u`.`id` = `w`.`userFk`;
 
-INSERT INTO `postgresql`.`person`(`person_id`, `name`, `nickname`, `nif`, `firstname`, `id_trabajador`)
+INSERT INTO `postgresql`.`business`(`business_id`, `client_id`, `companyCodeFk`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
-    VALUES
+        SELECT p.profile_id, p.profile_id, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL +1 YEAR)), '-01-25'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
-        (1000, 'VERDNATURA LEVANTE SL', 'VNL', 'B78945612', NULL, NULL);
-
-INSERT INTO `postgresql`.`profile`(`profile_id`, `person_id`, `profile_type_id`)
-        SELECT p.person_id, p.person_id, 1
-			FROM `postgresql`.`person` `p`;
-
-INSERT INTO `postgresql`.`business`(`business_id`, `client_id`, `provider_id`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
-        SELECT p.profile_id, p.profile_id, 1000, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-01-25'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
 			FROM `postgresql`.`profile` `p`;
 
 INSERT INTO `postgresql`.`business_labour`(`business_id`, `notes`, `department_id`, `professional_category_id`, `incentivo`, `calendar_labour_type_id`, `porhoras`, `labour_agreement_id`, `workcenter_id`)
         SELECT b.business_id, NULL, 23, 1, 0, 1, 1, 1, 1
 			FROM `postgresql`.`business` `b`;
 
-INSERT INTO `postgresql`.`business` (`client_id`, `provider_id`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
+INSERT INTO `postgresql`.`business` (`client_id`, `companyCodeFk`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
-    SELECT p.profile_id, 1000, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
+    SELECT p.profile_id, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
 			FROM `postgresql`.`profile` `p`
 			WHERE `p`.`profile_id` = 1109;
 
@@ -1914,11 +1901,10 @@ INSERT INTO `postgresql`.`business_labour` (`business_id`, `notes`, `department_
         (1111, NULL, 23, 1, 0.0, 1, 1, 1, 1);
 
 UPDATE `postgresql`.`business_labour` bl
-    JOIN `postgresql`.`business` b ON b.business_id = bl.business_id
+        JOIN `postgresql`.`business` b ON b.business_id = bl.business_id
-    JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id
+        JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id
-    JOIN `postgresql`.`person` p ON p.person_id = pr.person_id
     SET bl.`professional_category_id` = 31
-    WHERE p.`Id_trabajador` = 1110;
+    WHERE pr.`workerFk` = 1110;
 
 UPDATE `postgresql`.`business_labour` bl
     SET bl.`department_id` = 43
@@ -1941,15 +1927,6 @@ INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`)
         ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))),
         ('5', '23', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)));
 
-INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`)
-    VALUES
-        (1,  'Holidays',            '#FF4444', 'holiday',       0,      0),
-        (2,  'Leave of absence',    '#C71585', 'absence',       0,      1),
-        (6,  'Half holiday',        '#E65F00', 'halfHoliday',   0,      0.5),
-        (15, 'Half Paid Leave',     '#5151c0', 'halfPaidLeave', 0,      1),
-        (20, 'Furlough',            '#97B92F', 'furlough',      1,      1),
-        (21, 'Furlough half day',   '#778899', 'halfFurlough',  0.5,    1);
-
 ALTER TABLE `postgresql`.`business_labour_payroll` DROP FOREIGN KEY `business_labour_payroll_cod_categoria`;
 
 INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`, `hasHolidayEntitlement`)
@@ -1965,6 +1942,15 @@ INSERT INTO `postgresql`.`business_labour_payroll` (`business_id`, `cod_tarifa`,
         (1107, 7, 12, 100, 2000),
         (1108, 7, 12, 100, 1500);
 
+INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`)
+    VALUES
+        (1,  'Holidays',            '#FF4444', 'holiday',       0,      0),
+        (2,  'Leave of absence',    '#C71585', 'absence',       0,      1),
+        (6,  'Half holiday',        '#E65F00', 'halfHoliday',   0,      0.5),
+        (15, 'Half Paid Leave',     '#5151c0', 'halfPaidLeave', 0,      1),
+        (20, 'Furlough',            '#97B92F', 'furlough',      1,      1),
+        (21, 'Furlough half day',   '#778899', 'halfFurlough',  0.5,    1);
+
 INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`)
     VALUES
         (1,    6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
@@ -2481,8 +2467,8 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo
         (2, 16.10, 6021010, 25.00, 80,  5);
 
 INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
-    SELECT `id`
+    SELECT t.id
-        FROM `vn`.`ticket` t
+        FROM vn.ticket t
             LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id
         WHERE tr.ticketFk IS NULL;
 
@@ -2579,8 +2565,8 @@ INSERT INTO `vn`.`supplierAgencyTerm` (`agencyFk`, `supplierFk`, `minimumPackage
 
 INSERT INTO `vn`.`chat` (`senderFk`, `recipient`, `dated`, `checkUserStatus`, `message`, `status`, `attempts`)
     VALUES
-        (1101, '@PetterParker', CURDATE(), 1, 'First test message', 0, 0),
+        (1101, '@PetterParker', util.VN_CURDATE(), 1, 'First test message', 0, 0),
-        (1101, '@PetterParker', CURDATE(), 0, 'Second test message', 0, 0);
+        (1101, '@PetterParker', util.VN_CURDATE(), 0, 'Second test message', 0, 0);
 
 
 INSERT INTO `vn`.`mobileAppVersionControl` (`appName`, `version`, `isVersionCritical`)
@@ -2601,9 +2587,9 @@ INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`
         (1106, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),    DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY));
 
 INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
-VALUES
+    VALUES
-    (1, 1, DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=7, 7, 14) - DAYOFWEEK(CURDATE())) DAY), CURDATE(), 100),
+        (1, 1, DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
-    (2, 1, DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=8, 8, 15) - DAYOFWEEK(CURDATE())) DAY), CURDATE(), 100);
+        (2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=8, 8, 15) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100);
 
 INSERT INTO `vn`.`zoneExclusionGeo` (`zoneExclusionFk`, `geoFk`)
     VALUES
@@ -2619,6 +2605,11 @@ INSERT INTO `vn`.`mdbVersion` (`app`, `branchFk`, `version`)
         ('tpv', 'test', '1'),
         ('lab', 'master', '1');
 
+INSERT INTO `vn`.`accountingConfig` (`id`, `minDate`, `maxDate`)
+    VALUES
+        (1, '2022-01-01', '2023-01-01');
+
+
 INSERT INTO `vn`.`saleGroup` (`userFk`, `parkingFk`, `sectorFk`)
     VALUES
         (1, 1, 1);

loopback/common/methods/vn-model/specs/rewriteDbError.spec.js

@@ -24,6 +24,6 @@ describe('Model rewriteDbError()', () => {
             error = e;
         }
 
-        expect(error.message).toEqual(`The tag can't be repeated`);
+        expect(error.message).toEqual(`The tag or priority can't be repeated for an item`);
     });
 });

loopback/locale/es.json

@@ -44,7 +44,7 @@
 	"is not a valid date": "No es una fecha valida",
 	"Barcode must be unique": "El código de barras debe ser único",
 	"The warehouse can't be repeated": "El almacén no puede repetirse",
-	"The tag can't be repeated": "El tag no puede repetirse",
+	"The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
 	"The observation type can't be repeated": "El tipo de observación no puede repetirse",
 	"A claim with that sale already exists": "Ya existe una reclamación para esta línea",
 	"You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",

modules/account/back/models/role-config.js

@@ -56,6 +56,12 @@ module.exports = Self => {
                     if (!userExists) {
                         await Self.rawSql('CREATE USER ?@? IDENTIFIED BY ?',
                             [mysqlUser, this.userHost, password]);
+                        await Self.rawSql(
+                            `UPDATE mysql.global_priv
+                                SET Priv = JSON_SET(Priv, '$.autogenerated' , TRUE)
+                                WHERE User = ? AND Host = ?`,
+                            [mysqlUser, this.userHost]
+                        );
                         userExists = true;
                     } else {
                         switch (this.dbType) {

modules/client/front/notification/index.js

@@ -108,6 +108,7 @@ export default class Controller extends Section {
         case 'fi':
         case 'postcode':
         case 'salesPersonFk':
+        case 'provinceFk':
             return {[param]: value};
         }
     }

modules/entry/front/summary/index.html

@@ -123,12 +123,12 @@
                         <td center title="{{::line.weight}}">{{::line.weight}}</td>
                         <td center>
                             <vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}"> 
-                                <span translate>{{::line.packing | dashIfEmpty}}</span>
+                                <span>{{::line.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </td>
                         <td center>
                             <vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}"> 
-                                <span translate>{{::line.grouping | dashIfEmpty}}</span>
+                                <span>{{::line.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <td center title="{{::line.buyingValue | currency: 'EUR':2}}">{{::line.buyingValue | currency: 'EUR':2}}</td>

modules/item/back/models/item-tag.js

@@ -5,7 +5,7 @@ module.exports = Self => {
 
     Self.rewriteDbError(function(err) {
         if (err.code === 'ER_DUP_ENTRY')
-            return new UserError(`The tag can't be repeated`);
+            return new UserError(`The tag or priority can't be repeated for an item`);
         if (err.code === 'ER_BAD_NULL_ERROR')
             return new UserError(`Tag value cannot be blank`);
         return err;

modules/item/front/last-entries/index.html

@@ -70,12 +70,12 @@
                         <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
                         <vn-td number>
                             <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}"> 
-                                <span translate>{{::entry.packing | dashIfEmpty}}</span>
+                                <span>{{::entry.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <vn-td number>
                             <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}"> 
-                                <span translate>{{::entry.grouping | dashIfEmpty}}</span>
+                                <span>{{::entry.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>

modules/mdb/back/methods/mdbVersion/upload.js

@@ -88,17 +88,19 @@ module.exports = Self => {
                 await fs.mkdir(branchPath, {recursive: true});
 
                 const destinationBranch = path.join(branchPath, `${appName}.7z`);
-                const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+                const destinationRelative = `../../.archive/${appName}/${newVersion}.7z`;
                 try {
                     await fs.unlink(destinationBranch);
                 } catch (e) {}
-                await fs.symlink(destinationFile, destinationBranch);
+                await fs.symlink(destinationRelative, destinationBranch);
 
                 if (branch == 'master') {
+                    const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
+                    const rootRelative = `./.archive/${appName}/${newVersion}.7z`;
                     try {
                         await fs.unlink(destinationRoot);
                     } catch (e) {}
-                    await fs.symlink(destinationFile, destinationRoot);
+                    await fs.symlink(rootRelative, destinationRoot);
                 }
             }
 

modules/ticket/back/methods/packaging/specs/listPackaging.spec.js

@@ -1,6 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
-describe('ticket listPackaging()', () => {
+// 4376
+xdescribe('ticket listPackaging()', () => {
     it('should return the packaging', async() => {
         const tx = await models.Packaging.beginTransaction({});
 
@@ -8,9 +9,9 @@ describe('ticket listPackaging()', () => {
             const options = {transaction: tx};
 
             const filter = {where: {packagingFk: 1}};
-            const response = await models.Packaging.listPackaging(filter, options);
+            const [response] = await models.Packaging.listPackaging(filter, options);
 
-            expect(response[0].name).toEqual('Container ammo box 1m');
+            expect(response.name).toEqual('Container ammo box 1m');
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/methods/sale/refund.js

@@ -98,7 +98,7 @@ module.exports = Self => {
                 const createdSale = await models.Sale.create({
                     ticketFk: refundTicketId,
                     itemFk: sale.itemFk,
-                    quantity: sale.quantity,
+                    quantity: - sale.quantity,
                     concept: sale.concept,
                     price: sale.price,
                     discount: sale.discount,
@@ -122,7 +122,7 @@ module.exports = Self => {
 
                     await models.TicketService.create({
                         description: service.description,
-                        quantity: service.quantity,
+                        quantity: - service.quantity,
                         price: service.price,
                         taxClassFk: service.taxClassFk,
                         ticketFk: refundTicketId,

modules/worker/back/methods/department/specs/removeChild.spec.js

@@ -8,7 +8,7 @@ describe('department removeChild()', () => {
     });
 
     it('should remove a child department', async() => {
-        const childId = 130;
+        const childId = 44;
 
         removedChild = await app.models.Department.findById(childId);
         const result = await app.models.Department.removeChild(childId);

modules/worker/back/methods/worker/createAbsence.js

@@ -88,9 +88,8 @@ module.exports = Self => {
                     FROM vn.calendar c 
                         JOIN postgresql.business b ON b.business_id = c.businessFk 
                         JOIN postgresql.profile p ON p.profile_id = b.client_id 
-                        JOIN vn.person pe ON pe.id = p.person_id 
                     WHERE c.dayOffTypeFk = 6 
-                        AND pe.workerFk = ? 
+                        AND p.workerFk = ? 
                         AND c.dated BETWEEN util.firstDayOfYear(?) 
                         AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
 

print/templates/reports/item-label/locale/es.yml

@@ -0,0 +1 @@
+reportName: Etiqueta