Merge pull request 'test' (!2506) from test into dev

Reviewed-on: #2506
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

db/dump/fixtures.before.sql

@@ -2549,18 +2549,18 @@ INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroV
         (7, 7, 1.00, 1.00, 1.00),
         (8, 8, 1.00, 1.00, 1.00);
 
-REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
+REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`, `bookEntried`)
     VALUES
-        (1,  1001,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1),
+        (1,  1001,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1,util.VN_CURDATE()),
-        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1),
+        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1,util.VN_CURDATE()),
-        (3,  1003,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1),
+        (3,  1003,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1,util.VN_CURDATE()),
-        (4,  1004,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1),
+        (4,  1004,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1,util.VN_CURDATE()),
-        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1),
+        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1,util.VN_CURDATE()),
-        (6,  1006,  'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1),
+        (6,  1006,  'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1,util.VN_CURDATE()),
-        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1),
+        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1,util.VN_CURDATE()),
-        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1),
+        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1,util.VN_CURDATE()),
-        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1),
+        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1,util.VN_CURDATE()),
-        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1);
+        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1,util.VN_CURDATE());
 
 INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`)
     VALUES
@@ -3792,3 +3792,10 @@ INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, stre
     VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
 
 UPDATE vn.locker SET workerFk = 1110 WHERE id = 147; 
+
+INSERT INTO `vn`.`ledgerCompany` SET
+    fiscalYear = YEAR(util.VN_CURDATE()),
+    bookEntry = 2;
+
+INSERT INTO  `vn`.`ledgerConfig` SET 
+    maxTolerance = 0.01;

db/routines/hedera/procedures/tpvTransaction_confirm.sql

@@ -81,7 +81,7 @@ BEGIN
 
 		-- Código redundante
 
-		DO vn.till_new(
+		CALL vn.till_new(
 			 vCustomer
 			,vBank
 			,vAmount / 100

db/routines/vn/functions/till_new.sql

@@ -1,79 +1,73 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`till_new`(vClient INT
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`till_new`(
-	,vBank INT
+	vClient INT,
-	,vAmount DOUBLE
+	vBank INT,
-	,vConcept VARCHAR(25)
+	vAmount DOUBLE,
-	,vDated DATE
+	vConcept VARCHAR(25),
-	,vSerie CHAR(1)
+	vDated DATE,
-	,vBatch TINYINT
+	vSerie CHAR(1),
-	,vNumber INT
+	vBatch TINYINT,
-	,vCompany SMALLINT
+	vNumber INT,
-	,vWorker INT
+	vCompany SMALLINT,
+	vWorker INT
 )
-	RETURNS int(11)
-	DETERMINISTIC
 BEGIN
 	DECLARE vAccount VARCHAR(12);
 	DECLARE vSubaccount VARCHAR(12);
 	DECLARE vAsiento INT DEFAULT NULL;
 
 	-- Inserta el registro en cajas
-
 	INSERT INTO till
 	SET
-		workerFk = vWorker
+		workerFk = vWorker,
-		,bankFk = vBank
+		bankFk = vBank,
-		,`in` = vAmount
+		`in` = vAmount,
-		,concept = vConcept
+		concept = vConcept,
-		,dated = vDated
+		dated = vDated,
-		,serie = vSerie
+		serie = vSerie,
-		,isAccountable = vBatch
+		isAccountable = vBatch,
-		,`number` = vNumber
+		`number` = vNumber,
-		,companyFk = vCompany;
+		companyFk = vCompany;
 
 	-- Inserta los asientos contables
-
 	SELECT account INTO vAccount
 		FROM accounting WHERE id = vBank;
 
 	SELECT accountingAccount INTO vSubaccount
 		FROM `client` WHERE id = vClient;
 
-	SET vAsiento = xdiario_new
+	CALL xdiario_new(
-	(
+		vAsiento,
-		vAsiento
+		vDated,
-		,vDated
+		vAccount,
-		,vAccount
+		vSubaccount,
-		,vSubaccount
+		vConcept,
-		,vConcept
+		vAmount,
-		,vAmount
+		0,
-		,0
+		0,
-		,0
+		NULL, -- Serie
-		,NULL -- Serie
+		NULL, -- Factura
-		,NULL -- Factura
+		NULL, -- IVA
-		,NULL -- IVA
+		NULL, -- Recargo
-		,NULL -- Recargo
+		FALSE, -- Auxiliar
-		,FALSE -- Auxiliar
+		vCompany,
-		,vCompany
+		vAsiento);
-	);
-	DO xdiario_new
-	(
-		vAsiento
-		,vDated
-		,vSubaccount
-		,vAccount
-		,vConcept
-		,0
-		,vAmount
-		,0
-		,NULL -- Serie
-		,NULL -- Factura
-		,NULL -- IVA
-		,NULL -- Recargo
-		,FALSE -- Auxiliar
-		,vCompany
-	);
 
-	RETURN NULL;
+	CALL xdiario_new(
+		vAsiento,
+		vDated,
+		vSubaccount,
+		vAccount,
+		vConcept,
+		0,
+		vAmount,
+		0,
+		NULL, -- Serie
+		NULL, -- Factura
+		NULL, -- IVA
+		NULL, -- Recargo
+		FALSE, -- Auxiliar
+		vCompany,
+		vAsiento);
 END$$
 DELIMITER ;

db/routines/vn/functions/xdiario_new.sql

@@ -1,45 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`xdiario_new`(
-	vBookNumber INT,
-	vDated DATE,
-	vSubaccount VARCHAR(12),
-	vAccount VARCHAR(12),
-	vConcept VARCHAR(25),
-	vDebit DOUBLE,
-	vCredit DOUBLE,
-	vEuro DOUBLE,
-	vSerie CHAR(1),
-	vInvoice VARCHAR(8),
-	vVat DOUBLE,
-	vRe DOUBLE,
-	vAux TINYINT,
-	vCompanyFk INT
-)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	NO SQL
-BEGIN
-	IF vBookNumber IS NULL THEN
-		CALL ledger_next(YEAR(vDated), vBookNumber);
-	END IF;
-
-	INSERT INTO XDiario
-		SET ASIEN = vBookNumber,
-			FECHA = vDated,
-			SUBCTA = vSubaccount,
-			CONTRA = vAccount,
-			CONCEPTO = vConcept,
-			EURODEBE = vDebit,
-			EUROHABER = vCredit,
-			BASEEURO = vEuro,
-			SERIE = vSerie,
-			FACTURA = vInvoice,
-			IVA = vVat,
-			RECEQUIV = vRe,
-			AUXILIAR = IF(vAux = FALSE, NULL, '*'),
-			MONEDAUSO = 2,
-			empresa_id = vCompanyFk;
-
-	RETURN vBookNumber;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ledger_next.sql

@@ -1,13 +1,55 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_next`(
 	IN vFiscalYear INT,
-	OUT vNewBookEntry INT
+	OUT vLastBookEntry INT
 )
 BEGIN
+	DECLARE vHasStartTransaction BOOLEAN;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+		BEGIN
+
+		IF vHasStartTransaction THEN
+			ROLLBACK TO sp;
+			RESIGNAL;
+		ELSE
+			ROLLBACK;
+			CALL util.throw ('It has not been possible to generate a new ledger');
+		END IF;
+	END;
+
+	IF vFiscalYear IS NULL THEN
+		CALL util.throw('Fiscal year is required');
+	END IF;
+
+	SELECT @@in_transaction INTO vHasStartTransaction;
+	
+	IF NOT vHasStartTransaction THEN
+		START TRANSACTION;
+	ELSE
+		SAVEPOINT sp;
+	END IF;
+
+	SELECT bookEntry + 1 INTO vLastBookEntry
+		FROM ledgerCompany
+		WHERE fiscalYear = vFiscalYear
+		FOR UPDATE;
+
+	IF vLastBookEntry IS NULL THEN 
+		INSERT INTO ledgerCompany
+			SET fiscalYear = vFiscalYear,
+				bookEntry = 1;
+		SET vLastBookEntry = 1;
+	END IF;
+
 	UPDATE ledgerCompany
-		SET bookEntry = LAST_INSERT_ID(bookEntry + 1)
+		SET bookEntry = vLastBookEntry 
 		WHERE fiscalYear = vFiscalYear;
 
-		SET vNewBookEntry = LAST_INSERT_ID();
+	IF vHasStartTransaction THEN
+		RELEASE SAVEPOINT sp;	
+	ELSE
+		COMMIT;
+    END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/xdiario_new.sql

@@ -0,0 +1,64 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`xdiario_new`(
+	vBookNumber INT,
+	vDated DATE,
+	vSubaccount VARCHAR(12),
+	vAccount VARCHAR(12),
+	vConcept VARCHAR(25),
+	vDebit DOUBLE,
+	vCredit DOUBLE,
+	vEuro DOUBLE,
+	vSerie CHAR(1),
+	vInvoice VARCHAR(8),
+	vVat DOUBLE,
+	vRe DOUBLE,
+	vAux TINYINT,
+	vCompanyFk INT,
+	OUT vNewBookNumber INT
+)
+/**
+ * Este procedimiento se encarga de la inserción de registros en la tabla XDiario.
+ * Si el número de asiento (vBookNumber) no está definido, se genera uno nuevo utilizando
+ * vn.ledger_next.
+ *
+ * @param vBookNumber Número de asiento. Si es NULL, se generará uno nuevo.
+ * @param vDated Fecha utilizada para generar un nuevo número de libro si vBookNumber es NULL.
+ * @param vSubaccount Subcuenta para la transacción.
+ * @param vAccount Cuenta para la transacción.
+ * @param vConcept Concepto de la transacción.
+ * @param vDebit Monto del débito para la transacción.
+ * @param vCredit Monto del crédito para la transacción.
+ * @param vEuro Monto en euros para la transacción.
+ * @param vSerie Serie para la transacción.
+ * @param vInvoice Número de factura para la transacción.
+ * @param vVat Monto del IVA para la transacción.
+ * @param vRe Monto del RE para la transacción.
+ * @param vAux Variable auxiliar para la transacción.
+ * @param vCompanyFk Clave foránea de la compañía para la transacción.
+ * @return No retorna un valor, pero realiza una inserción en la tabla XDiario.
+ */
+BEGIN
+	IF vBookNumber IS NULL THEN
+		CALL ledger_next(YEAR(vDated), vBookNumber);
+	END IF;
+
+	INSERT INTO XDiario
+		SET ASIEN = vBookNumber,
+			FECHA = vDated,
+			SUBCTA = vSubaccount,
+			CONTRA = vAccount,
+			CONCEPTO = vConcept,
+			EURODEBE = vDebit,
+			EUROHABER = vCredit,
+			BASEEURO = vEuro,
+			SERIE = vSerie,
+			FACTURA = vInvoice,
+			IVA = vVat,
+			RECEQUIV = vRe,
+			AUXILIAR = IF(vAux = FALSE, NULL, '*'),
+			MONEDAUSO = 2,
+			empresa_id = vCompanyFk;
+
+	SET vNewBookNumber = vBookNumber;
+END$$
+DELIMITER ;

modules/client/back/methods/client/createReceipt.js

@@ -95,9 +95,11 @@ module.exports = function(Self) {
                     myOptions
                 );
             } else if (accountingType.isAutoConciliated == true) {
-                const description = `${originalClient.id} : ${originalClient.socialName} - ${accountingType.receiptDescription}`;
+                const description =
-                const [xdiarioNew] = await Self.rawSql(
+                    `${originalClient.id} : ${originalClient.socialName} - ${accountingType.receiptDescription}`;
-                    `SELECT xdiario_new(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ledger;`,
+                const [, [xdiarioNew]] = await Self.rawSql(
+                    `CALL xdiario_new(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @xdiarioNew); 
+                    SELECT @xdiarioNew ledger;`,
                     [
                         null,
                         date,
@@ -118,7 +120,7 @@ module.exports = function(Self) {
                 );
 
                 await Self.rawSql(
-                    `SELECT xdiario_new(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`,
+                    `CALL xdiario_new(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @xdiarioNew);`,
                     [
                         xdiarioNew.ledger,
                         date,