Merge branch 'dev' into 4893-formato-correo

db/changes/10470-family/00-accountingType.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`accountingType` ADD daysInFuture INT NULL;
-ALTER TABLE `vn`.`accountingType` MODIFY COLUMN daysInFuture int(11) DEFAULT 0 NULL;
-UPDATE `vn`.`accountingType` SET daysInFuture=1 WHERE id=8;

db/changes/10470-family/00-aclItemType.sql

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

db/changes/10470-family/00-aclMdb.sql

@@ -1,14 +0,0 @@
-CREATE TABLE IF NOT EXISTS `vn`.`mdbBranch` (
-	`name` VARCHAR(255),
-    PRIMARY KEY(`name`)
-);
-
-CREATE TABLE IF NOT EXISTS `vn`.`mdbVersion` (
-	`app` VARCHAR(255) NOT NULL,
-	`branchFk` VARCHAR(255) NOT NULL,
-	`version` INT,
-    CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `vn`.`mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-INSERT IGNORE INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES(318, 'MdbVersion', '*', '*', 'ALLOW', 'ROLE', 'developer');

db/changes/10470-family/00-chat.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`chat` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `senderFk` int(10) unsigned DEFAULT NULL,
-  `recipient` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `dated` date DEFAULT NULL,
-  `checkUserStatus` tinyint(1) DEFAULT NULL,
-  `message` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` tinyint(1) DEFAULT NULL,
-  `attempts` int(1) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `chat_FK` (`senderFk`),
-  CONSTRAINT `chat_FK` FOREIGN KEY (`senderFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

db/changes/10470-family/00-creditInsurance.sql

@@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance` ADD creditClassificationFk int(11) NULL;
-
-UPDATE `vn`.`creditInsurance` AS `destiny`
-   SET `destiny`.`creditClassificationFk`= (SELECT creditClassification FROM `vn`.`creditInsurance` AS `origin` WHERE `origin`.id = `destiny`.id);
-
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10470-family/00-defaultViewConfig.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
-VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}');
-

db/changes/10470-family/00-ticket_doRefund.sql

@@ -1,127 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(OUT vNewTicket INT)
-BEGIN
-/**
- * Crea un ticket de abono a partir de tmp.sale y/o tmp.ticketService
- * 
- * @return vNewTicket
- */  
-	DECLARE vDone BIT DEFAULT 0;
-	DECLARE vClientFk 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 vDescription VARCHAR(50);
-	DECLARE vTaxClassFk INT;
-	DECLARE vTicketServiceTypeFk INT;
-	DECLARE vOriginTicket INT;
-
-	DECLARE cSales CURSOR FOR
-		SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
-			FROM tmp.sale s;
-
-	DECLARE cTicketServices CURSOR FOR
-		SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
-			FROM tmp.ticketService ts;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	SELECT sub.ticketFk INTO vOriginTicket
-		FROM (
-			SELECT s.ticketFk
-				FROM tmp.sale s
-			UNION ALL
-			SELECT ts.ticketFk
-				FROM tmp.ticketService ts
-		) sub
-	LIMIT 1;
-
-	SELECT id INTO vRefundAgencyMode
-		FROM agencyMode WHERE `name` = 'ABONO';
-
-	SELECT clientFk, warehouseFk, companyFk, addressFk 
-			INTO vClientFk, 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
-					vClientFk,
-					CURDATE(),
-					vAddress,
-					vRefundAgencyMode,
-					a.nickname,
-					vWarehouse,
-					vCompany,
-					CURDATE(),
-					vZoneFk
-			FROM address a
-			WHERE a.id = vAddress;
-
-	SET vNewTicket = LAST_INSERT_ID();
-
-	SET vDone := FALSE;
-	OPEN cSales;
-	FETCH cSales 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 cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	END WHILE;
-	CLOSE cSales;
-
-	SET vDone := FALSE;
-	OPEN cTicketServices;
-	FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.ticketService(description, quantity, price, taxClassFk, ticketFk, ticketServiceTypeFk)
-			VALUES(vDescription, vQuantity, vPrice, vTaxClassFk, vNewTicket, vTicketServiceTypeFk);
-
-		FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	END WHILE;
-	CLOSE cTicketServices;
-
-	INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
-		VALUES(vNewTicket, vOriginTicket);
-END$$
-DELIMITER ;

db/changes/10470-family/01-creditInsuranceTriggers.sql

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

db/changes/10470-family/01-tableConfig.sql

@@ -1 +0,0 @@
-RENAME TABLE `edi`.`fileConfig` to `edi`.`tableConfig`;

db/changes/10470-family/02-fileConfig.sql

@@ -1,22 +0,0 @@
-CREATE TABLE `edi`.`fileConfig`
-(
-    name     varchar(25)             NOT NULL,
-    checksum text                    NULL,
-    keyValue tinyint(1) default true NOT NULL,
-    constraint fileConfig_pk
-        primary key (name)
-);
-
-create unique index fileConfig_name_uindex
-    on  `edi`.`fileConfig` (name);
-
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('FEC010104', null, 0);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('VBN020101', null, 1);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('florecompc2', null, 1);
-

db/changes/10471-family/00-chat.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`chat` MODIFY COLUMN message TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` MODIFY COLUMN dated DATETIME DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` ADD error TEXT NULL;

db/changes/10472-family/00-creditInsurance.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-ACL.sql

@@ -1,21 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES 
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Sale','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),
-		('ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),
-		('ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),
-		('Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),
-		('Client','updateUser','WRITE','ALLOW','ROLE','salesPerson');
-
-DELETE FROM `salix`.`ACL` WHERE id=313;
-
-UPDATE `salix`.`ACL`
-	SET principalId='invoicing'
-	WHERE id=297;

db/changes/10480-june/00-aclShelvingLog.sql

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

db/changes/10480-june/00-aclZoneExclusionGeos.sql

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

db/changes/10480-june/00-albaran_gestdoc.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn2008`.`albaran_gestdoc` DROP FOREIGN KEY fk_albaran_gestdoc_gestdoc1;
-ALTER TABLE `vn2008`.`albaran_gestdoc` ADD CONSTRAINT albaran_gestdoc_FK FOREIGN KEY (gestdoc_id) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-client.sql

@@ -1,3 +0,0 @@
-alter table `vn`.`client`
-    add hasIncoterms tinyint(1) default 0 not null comment 'Received incoterms authorization from client';
-

db/changes/10480-june/00-deprecations.sql

@@ -1,13 +0,0 @@
-DROP FUNCTION `account`.`userGetId`;
-DROP FUNCTION `account`.`myUserGetName`;
-DROP FUNCTION `account`.`myUserGetId`;
-DROP FUNCTION `account`.`myUserHasRole`;
-DROP FUNCTION `account`.`myUserHasRoleId`;
-DROP FUNCTION `account`.`userGetName`;
-DROP FUNCTION `account`.`userHasRole`;
-DROP FUNCTION `account`.`userHasRoleId`;
-DROP PROCEDURE `account`.`myUserLogout`;
-DROP PROCEDURE `account`.`userLogin`;
-DROP PROCEDURE `account`.`userLoginWithKey`;
-DROP PROCEDURE `account`.`userLoginWithName`;
-DROP PROCEDURE `account`.`userSetPassword`;

db/changes/10480-june/00-item.sql

@@ -1 +0,0 @@
-ALTER TABLE `vn`.`item` MODIFY COLUMN description TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/changes/10480-june/00-route.sql

@@ -1,10 +0,0 @@
-UPDATE `vn`.`route` r
-      JOIN(SELECT r.id, wl.workcenterFk 
-            FROM `vn`.`route` r     
-              JOIN `vn`.`routeLog` rl ON rl.originFk = r.id
-              JOIN `vn`.`workerLabour` wl ON wl.workerFk = rl.userFk 
-                AND r.created BETWEEN wl.started AND IFNULL(wl.ended, r.created)
-            WHERE r.created BETWEEN '2021-12-01' AND CURDATE()     
-              AND rl.action = 'insert'
-          )sub ON sub.id = r.id 
-    SET r.commissionWorkCenterFk = sub.workcenterFk;

db/changes/10480-june/00-sample.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`sample` (code, description, isVisible, hasCompany, hasPreview, datepickerEnabled)
-VALUES ('incoterms-authorization', 'Autorización de incoterms', 1, 1, 1, 0);

db/changes/10480-june/00-shelving.sql

@@ -1,18 +0,0 @@
-ALTER TABLE `vn`.`itemShelving` DROP FOREIGN KEY itemShelving_fk2;
-ALTER TABLE `vn`.`shelvingLog` DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE `vn`.`smartTag` DROP FOREIGN KEY smartTag_shelving_fk;
-ALTER TABLE `vn`.`workerShelving` DROP FOREIGN KEY workerShelving_shelving_fk;
-
-ALTER TABLE `vn`.`shelving` DROP PRIMARY KEY;
-ALTER TABLE `vn`.`shelving` ADD id INT auto_increment PRIMARY KEY NULL;
-ALTER TABLE `vn`.`shelving` CHANGE id id int(11) auto_increment NOT NULL FIRST;
-ALTER TABLE `vn`.`shelving` ADD CONSTRAINT shelving_UN UNIQUE KEY (code);
-
-ALTER TABLE `vn`.`itemShelving` ADD CONSTRAINT itemShelving_fk2 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE vn.shelvingLog MODIFY COLUMN originFk INT NOT NULL;
-ALTER TABLE vn.shelvingLog ADD CONSTRAINT shelvingLog_FK FOREIGN KEY (originFk) REFERENCES vn.shelving(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-ticketRefund_beforeUpsert.sql

@@ -1,21 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticketRefund_beforeUpsert`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_beforeUpsert`(vRefundTicketFk INT, vOriginalTicketFk INT)
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-	IF vRefundTicketFk = vOriginalTicketFk THEN
-		CALL util.throw('Original ticket and refund ticket has same id');
-	END IF;
-
-    SELECT COUNT(*) INTO vAlreadyExists
-		FROM ticketRefund 
-		WHERE originalTicketFk = vOriginalTicketFk; 
-	
-	IF vAlreadyExists > 0 THEN
-		CALL util.throw('This ticket is already a refund');
-	END IF;
-END$$
-DELIMITER ;

db/changes/10480-june/01-claimObservation.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`claimObservation` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `claimFk` int(10) unsigned NOT NULL,
-  `workerFk` int(10) unsigned DEFAULT NULL,
-  `text` text COLLATE utf8_unicode_ci NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `worker_key` (`workerFk`),
-  KEY `claim_key` (`claimFk`),
-  KEY `claimObservation_created_IDX` (`created`) USING BTREE,
-  CONSTRAINT `claimObservation_ibfk_1` FOREIGN KEY (`claimFk`) REFERENCES `vn`.`claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `claimObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) COMMENT='Todas las observaciones referentes a una reclamación'

db/changes/10480-june/02-claimTextMigration.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`claimObservation` (`claimFk`, `text`, `created`)
-SELECT `id`, `observation`, `created` FROM `vn`.`claim`

db/changes/10480-june/04-aclParking.sql

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

db/changes/10480-june/04-aclShelving.sql

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

db/changes/10481-june/00-aclOsTicket.sql

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

db/changes/10481-june/00-aclOsTicketConfig.sql

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

db/changes/10481-june/00-osTicketConfig.sql

@@ -1,16 +0,0 @@
-CREATE TABLE `vn`.`osTicketConfig` (
-  `id` int(11) NOT NULL,
-  `host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `oldStatus` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `newStatusId` int(11) DEFAULT NULL,
-  `action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `day` int(11) DEFAULT NULL,
-  `comment` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `hostDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `userDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `passwordDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `portDb` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/changes/10510-december/deleteMe.keep

@@ -1 +0,0 @@
-Delete this file

db/dump/dumpedFixtures.sql

@@ -22,7 +22,7 @@ USE `util`;
 
 LOCK TABLES `config` WRITE;
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
-INSERT INTO `config` VALUES (1,'10480',0,'production',NULL);
+INSERT INTO `config` VALUES (1,'224602',0,'production',NULL);
 /*!40000 ALTER TABLE `config` ENABLE KEYS */;
 UNLOCK TABLES;
 

db/import-changes.sh

@@ -81,9 +81,9 @@ N_CHANGES=0
 
 for DIR_PATH in "$DIR/changes/"*; do
     DIR_NAME=$(basename $DIR_PATH)
-    DIR_VERSION=${DIR_NAME:0:5}
+    DIR_VERSION=${DIR_NAME:0:6}
 
-    if [[ ! "$DIR_NAME" =~ ^[0-9]{5}(-[a-zA-Z0-9]+)?$ ]]; then
+    if [[ ! "$DIR_NAME" =~ ^[0-9]{6}$ ]]; then
         echo "[WARN] Ignoring wrong directory name: $DIR_NAME"
         continue
     fi

modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js

@@ -138,7 +138,7 @@ module.exports = Self => {
             recipient: invoiceOut.client().email
         };
         try {
-            await models.InvoiceOut.invoiceEmail(ctx);
+            await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
         } catch (err) {}
 
         return invoiceId;

modules/supplier/front/agency-term/create/index.html

@@ -26,6 +26,7 @@
                 type="number"
                 label="Minimum M3"
                 ng-model="$ctrl.supplierAgencyTerm.minimumM3"
+                step="0.01"
                 rule>
             </vn-input-number>
         </vn-horizontal>
@@ -46,6 +47,7 @@
                 type="number"
                 label="M3 Price"
                 ng-model="$ctrl.supplierAgencyTerm.m3Price"
+                step="0.01"
                 rule>
             </vn-input-number>
         </vn-horizontal>

modules/ticket/back/methods/ticket/componentUpdate.js

@@ -137,7 +137,7 @@ module.exports = Self => {
                 const params = [args.id, args.shipped, args.warehouseFk];
                 const [salesMovable] = await Self.rawSql(query, params, myOptions);
 
-                const sales = await models.Sale.find({ticketFk: args.id}, myOptions);
+                const sales = await models.Sale.find({where: {ticketFk: args.id}}, myOptions);
                 const salesNewTicket = salesMovable.filter(sale => (sale.movable ? sale.movable : 0) >= sale.quantity);
 
                 const salesNewTicketLength = salesNewTicket.length;

print/templates/reports/invoice/invoice.js

@@ -82,7 +82,7 @@ module.exports = {
             return this.rawSqlFromDef(`taxes`, [reference]);
         },
         fetchIntrastat(reference) {
-            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference]);
+            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference, reference]);
         },
         fetchRectified(reference) {
             return this.rawSqlFromDef(`rectified`, [reference]);

print/templates/reports/invoice/sql/intrastat.sql

@@ -1,4 +1,9 @@
+SELECT *
+	FROM invoiceOut io
+		JOIN invoiceOutSerial ios ON io.serial = ios.code
+		JOIN
 		(SELECT
+			t.refFk,
 		    ir.id code,
 		    ir.description description,
 		    CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
@@ -19,14 +24,16 @@
 		        WHERE t.refFk = ?
 		            AND i.intrastatFk
 		        GROUP BY i.intrastatFk
-        ORDER BY i.intrastatFk)
 		UNION ALL
-(SELECT
+		SELECT
+			NULL AS refFk,
 		    NULL AS code,
 		    NULL AS description,
 		    0 AS stems,
 		    0 AS netKg,
-    CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)) AS subtotal
+		    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) AS subtotal
 		    FROM vn.ticketService ts
 		        JOIN vn.ticket t ON ts.ticketFk = t.id
-    WHERE t.refFk = ?);
+		    WHERE t.refFk = ?) sub
+	WHERE io.`ref` = ? AND ios.isCEE
+	ORDER BY sub.code;

print/templates/reports/invoice/sql/rectified.sql

@@ -3,8 +3,8 @@ SELECT
     io.ref,
     io.issued,
     ict.description
-FROM vn.invoiceCorrection ic
+FROM invoiceOut io
-    JOIN vn.invoiceOut io ON io.id = ic.correctedFk
+    JOIN invoiceCorrection ic ON ic.correctingFk = io.id
-    JOIN vn.invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
     LEFT JOIN ticket t ON t.refFk = io.ref
-WHERE t.refFk = ?
+WHERE io.ref = ?