fixe2e #1934

Merged
carlossa merged 4 commits from fixe2e into dev 2024-01-15 13:34:10 +00:00
3 changed files with 31 additions and 28 deletions
Showing only changes of commit f8939fb5cf - Show all commits

View File

@ -0,0 +1,2 @@
ALTER TABLE vn.invoiceOutConfig
ADD IF NOT EXISTS refLen TINYINT UNSIGNED DEFAULT 5 NOT NULL COMMENT 'Invoice reference identifier length';

View File

@ -4,17 +4,20 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceOut_beforeInse
FOR EACH ROW FOR EACH ROW
BEGIN BEGIN
/** /**
* Generates the next reference for the invoice serial. There cannot be gaps
* between identifiers of the same serial!
*
* Reference format: * Reference format:
* - 0: Serial [A-Z] * {0} Invoice serial
* - 1: Sage company id * {1} The company code
* - 2-3: Last two digits of issued year * {2-3} Last two digits of issue year
* - 4-8: Autoincrement identifier * {4-$} Autoincrement identifier
**/ */
DECLARE vNewRef INT DEFAULT 0; DECLARE vRef INT DEFAULT 0;
DECLARE vCompanyCode INT; DECLARE vRefLen INT;
DECLARE vRefPrefix VARCHAR(255);
DECLARE vLastRef VARCHAR(255); DECLARE vLastRef VARCHAR(255);
DECLARE vRefStr VARCHAR(255); DECLARE vCompanyCode INT;
DECLARE vRefLen INT DEFAULT 5;
DECLARE vYearLen INT DEFAULT 2; DECLARE vYearLen INT DEFAULT 2;
DECLARE vPrefixLen INT; DECLARE vPrefixLen INT;
@ -23,36 +26,34 @@ BEGIN
WHERE id = NEW.companyFk; WHERE id = NEW.companyFk;
IF vCompanyCode IS NULL THEN IF vCompanyCode IS NULL THEN
CALL util.throw('sageCompanyNotDefined'); CALL util.throw('companyCodeNotDefined');
END IF; END IF;
SELECT MAX(i.ref) INTO vLastRef SELECT MAX(i.ref) INTO vLastRef
FROM invoiceOut i FROM invoiceOut i
WHERE i.serial = NEW.serial WHERE i.serial = NEW.serial
AND i.issued BETWEEN util.firstDayOfYear(NEW.issued) AND util.dayEnd(util.lastDayOfYear(NEW.issued)) AND i.issued BETWEEN util.firstDayOfYear(NEW.issued) AND util.lastDayOfYear(NEW.issued)
AND i.companyFk = NEW.companyFk; AND i.companyFk = NEW.companyFk;
IF vLastRef IS NOT NULL THEN IF vLastRef IS NOT NULL THEN
SET vPrefixLen = LENGTH(NEW.serial) + LENGTH(vCompanyCode) + vYearLen; SET vPrefixLen = LENGTH(NEW.serial) + LENGTH(vCompanyCode) + vYearLen;
SET vRefLen = LENGTH(vLastRef) - vPrefixLen; SET vRefLen = LENGTH(vLastRef) - vPrefixLen;
SET vRefStr = SUBSTRING(vLastRef, vPrefixLen + 1); SET vRefPrefix = LEFT(vLastRef, vPrefixLen);
SET vNewRef = vRefStr + 1; SET vRef = RIGHT(vLastRef, vRefLen);
IF LENGTH(vNewRef) > vRefLen THEN
CALL util.throw('refLenExceeded');
END IF;
SET NEW.ref = CONCAT(
SUBSTRING(vLastRef, 1, vPrefixLen),
LPAD(vNewRef, LENGTH(vRefStr), '0')
);
ELSE ELSE
SET NEW.ref = CONCAT( SELECT refLen INTO vRefLen FROM invoiceOutConfig;
SET vRefPrefix = CONCAT(
NEW.serial, NEW.serial,
vCompanyCode, vCompanyCode,
RIGHT(YEAR(NEW.issued), vYearLen), RIGHT(YEAR(NEW.issued), vYearLen)
LPAD(1, vRefLen, '0')
); );
END IF; END IF;
SET vRef = vRef + 1;
IF LENGTH(vRef) > vRefLen THEN
CALL util.throw('refIdLenExceeded');
END IF;
SET NEW.ref = CONCAT(vRefPrefix, LPAD(vRef, vRefLen, '0'));
END$$ END$$
DELIMITER ; DELIMITER ;

View File

@ -600,6 +600,9 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`
('NATIONAL', 0, 1), ('NATIONAL', 0, 1),
('WORLD', 2, 15); ('WORLD', 2, 15);
INSERT INTO vn.invoiceOutConfig
SET parallelism = 8;
INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`) INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
VALUES VALUES
('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'), ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'),
@ -623,9 +626,6 @@ UPDATE `vn`.`invoiceOut` SET ref = 'T3333333' WHERE id = 3;
UPDATE `vn`.`invoiceOut` SET ref = 'T4444444' WHERE id = 4; UPDATE `vn`.`invoiceOut` SET ref = 'T4444444' WHERE id = 4;
UPDATE `vn`.`invoiceOut` SET ref = 'A1111111' WHERE id = 5; UPDATE `vn`.`invoiceOut` SET ref = 'A1111111' WHERE id = 5;
INSERT INTO vn.invoiceOutConfig
SET parallelism = 8;
INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`) INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`)
VALUES VALUES
(1, 895.76, 89.58, 4722000010), (1, 895.76, 89.58, 4722000010),