db/routines/vn/functions/invoiceSerial.sql

@@ -1,26 +1,32 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceSerial`(vClientFk INT, vCompanyFk INT, vType CHAR(1))
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceSerial`(vClientFk INT, vCompanyFk INT, vType CHAR(15))
 	RETURNS char(1) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
 	DETERMINISTIC
 BEGIN
 	/**
-	* Obtiene la serie de de una factura 
+	* Obtiene la serie de de una factura
 	* dependiendo del area del cliente.
-	* 
+	*
 	* @param vClientFk Id del cliente
 	* @param vCompanyFk Id de la empresa
-	* @param vType Tipo de factura ["R", "M", "G"]
-	* @return Serie de la factura
+	* @param vType Tipo de factura ['global','multiple','quick']
+	* @return vSerie de la factura
 	*/
 	DECLARE vTaxArea VARCHAR(25);
-	DECLARE vSerie CHAR(1);
+	DECLARE vSerie CHAR(2);
 
 	IF (SELECT hasInvoiceSimplified FROM client WHERE id = vClientFk) THEN
 		RETURN 'S';
 	END IF;
 
-	SELECT clientTaxArea(vClientFk, vCompanyFk) INTO vTaxArea;
-    SELECT invoiceSerialArea(vType,vTaxArea) INTO vSerie;
+	SELECT addressTaxArea(defaultAddressFk, vCompanyFk) INTO vTaxArea
+		FROM client
+		WHERE id = vClientFk;
+
+	SELECT code INTO vSerie
+		FROM invoiceOutSerial
+		WHERE `type` = vType AND taxAreaFk = vTaxArea;
+
 	RETURN vSerie;
 END$$
 DELIMITER ;

db/routines/vn/functions/invoiceSerialArea.sql

@@ -1,34 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceSerialArea`(vType CHAR(1), vTaxArea VARCHAR(25))
-	RETURNS char(1) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
-	DETERMINISTIC
-BEGIN
-	DECLARE vSerie CHAR(1);
-
-	IF vType = 'R' THEN
-		SELECT
-			CASE vTaxArea
-				WHEN 'CEE' THEN 'H'
-				WHEN 'WORLD' THEN 'E'
-				ELSE 'T'
-			END INTO vSerie;
-	-- Factura multiple
-	ELSEIF vType = 'M' THEN
-		SELECT
-			CASE vTaxArea
-				WHEN 'CEE' THEN 'H'
-				WHEN 'WORLD' THEN 'E'
-				ELSE 'M'
-			END INTO vSerie;
-	-- Factura global
-	ELSEIF vType = 'G' THEN
-		SELECT
-			CASE vTaxArea
-				WHEN 'CEE' THEN 'V'
-				WHEN 'WORLD' THEN 'X'
-				ELSE 'A'
-			END INTO vSerie;
-	END IF;
-	RETURN vSerie;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_close.sql

@@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_close`()
 BEGIN
 /**
- * Realiza el cierre de todos los 
+ * Realiza el cierre de todos los
  * tickets de la tabla tmp.ticket_close.
  *
  * @table tmp.ticket_close(ticketFk) Identificadores de los tickets a cerrar
@@ -20,7 +20,7 @@ BEGIN
 
 	DECLARE cur CURSOR FOR
 		SELECT ticketFk FROM tmp.ticket_close;
-		
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN
 		RESIGNAL;
@@ -30,7 +30,7 @@ BEGIN
 
 	proc: LOOP
 		SET vDone = FALSE;
-		
+
 		FETCH cur INTO vCurTicketFk;
 
 		IF vDone THEN
@@ -47,12 +47,12 @@ BEGIN
 				c.hasToInvoice
 			INTO vClientFk,
 				vIsTaxDataChecked,
-				vCompanyFk, 
+				vCompanyFk,
 				vShipped,
 				vHasDailyInvoice,
 				vWithPackage,
 				vHasToInvoice
-			FROM ticket t 
+			FROM ticket t
 				JOIN `client` c ON c.id = t.clientFk
 				JOIN province p ON p.id = c.provinceFk
 				LEFT JOIN autonomy a ON a.id = p.autonomyFk
@@ -62,7 +62,7 @@ BEGIN
 
 		INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity)
 			(SELECT vCurTicketFk, p.id, COUNT(*)
-				FROM expedition e 
+				FROM expedition e
 					JOIN packaging p ON p.id = e.packagingFk
 					JOIN ticket t ON t.id = e.ticketFk
 					LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
@@ -73,15 +73,15 @@ BEGIN
 				GROUP BY p.itemFk);
 
 		-- No retornables o no catalogados
-		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed) 
+		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
 			(SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1
-				FROM expedition e 
+				FROM expedition e
 					JOIN item i ON i.id = e.freightItemFk
 					LEFT JOIN packaging p ON p.itemFk = i.id
 				WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0
 					AND getSpecialPrice(e.freightItemFk, vClientFk) > 0
 				GROUP BY e.freightItemFk);
-			
+
 		IF(vHasDailyInvoice) AND vHasToInvoice THEN
 
 			-- Facturacion rapida
@@ -89,10 +89,10 @@ BEGIN
 			-- Facturar si está contabilizado
 			IF vIsTaxDataChecked THEN
 				CALL invoiceOut_newFromClient(
-					vClientFk, 
-					(SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')), 
-					vShipped, 
-					vCompanyFk, 
+					vClientFk,
+					(SELECT invoiceSerial(vClientFk, vCompanyFk, 'multiple')),
+					vShipped,
+					vCompanyFk,
 					NULL,
 					NULL,
 					vNewInvoiceId);

modules/ticket/back/methods/ticket/closeAll.js

@@ -91,8 +91,8 @@ module.exports = Self => {
                                 SUM(t.isDeleted) hasErrorDeleted,
                                 SUM(itc.id IS NULL) hasErrorItemTaxCountry,
                                 SUM(a.id IS NULL) hasErrorAddress,
-                                SUM(ios.code IS NOT NULL 
-                                    AND(ad.customsAgentFk IS NULL 
+                                SUM(ios.code IS NOT NULL
+                                    AND(ad.customsAgentFk IS NULL
                                         OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld
                             FROM ticket t
                                 LEFT JOIN address ad ON ad.id = t.addressFk
@@ -110,24 +110,24 @@ module.exports = Self => {
                                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
                                 LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
                                     AND itc.countryFk = su.countryFk
-                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD' 
-                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'M')
+                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD'
+                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'multiple')
                             WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
                                 AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                                 AND t.refFk IS NULL
                                 AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
-                            GROUP BY ticketFk   
-                            HAVING hasErrorToInvoice 
-                                OR hasErrorTaxDataChecked 
-                                OR hasErrorDeleted 
-                                OR hasErrorItemTaxCountry 
-                                OR hasErrorAddress 
+                            GROUP BY ticketFk
+                            HAVING hasErrorToInvoice
+                                OR hasErrorTaxDataChecked
+                                OR hasErrorDeleted
+                                OR hasErrorItemTaxCountry
+                                OR hasErrorAddress
                                 OR hasErrorInfoTaxAreaWorld
                     )sub
                 )sub2
             ) SELECT IF(errors = '{"tickets": null}',
                     'No errors',
-                    util.notification_send('invoice-ticket-closure', errors, NULL)) 
+                    util.notification_send('invoice-ticket-closure', errors, NULL))
                 FROM ticketNotInvoiceable`, [toDate, toDate]);
 
         await closure(ctx, Self, tickets);

modules/ticket/back/methods/ticket/invoiceTickets.js

@@ -95,7 +95,7 @@ module.exports = function(Self) {
                     FROM vn.ticket
                     WHERE id IN (?)
         `, [ticketsIds], myOptions);
-        return models.Ticket.makeInvoice(ctx, 'R', companyId, Date.vnNew(), invoiceCorrection, myOptions);
+        return models.Ticket.makeInvoice(ctx, 'quick', companyId, Date.vnNew(), invoiceCorrection, myOptions);
     }
 };
 

modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js

@@ -3,7 +3,7 @@ const LoopBackContext = require('loopback-context');
 
 describe('ticket makeInvoice()', () => {
     const userId = 19;
-    const invoiceType = 'R';
+    const invoiceType = 'quick';
     const companyFk = 442;
     const invoiceDate = Date.vnNew();
     const activeCtx = {