Merge branch 'test' into dev

back/methods/mrw-config/createShipment.ejs

@@ -33,9 +33,16 @@
                     <mrw:CodigoServicio><%= expeditionData.serviceType %></mrw:CodigoServicio>
                     <mrw:NumeroBultos>1</mrw:NumeroBultos>
                     <mrw:EntregaSabado><%= expeditionData.weekDays %></mrw:EntregaSabado>
-                    <mrw:Peso><%= expeditionData.kg %></mrw:Peso>
                     <mrw:Reembolso/>
                     <mrw:ImporteReembolso/>
+                    <mrw:Bultos>
+                        <mrw:BultoRequest>
+                            <mrw:Alto><%= mrw.defaultHeight %></mrw:Alto>
+                            <mrw:Largo><%= mrw.defaultLength %></mrw:Largo>
+                            <mrw:Ancho><%= mrw.defaultWidth %></mrw:Ancho>
+                            <mrw:Peso><%= mrw.defaultWeight %></mrw:Peso>
+                        </mrw:BultoRequest>
+                    </mrw:Bultos>
                 </mrw:DatosServicio>
             </mrw:request>
         </mrw:TransmEnvio>

back/models/mrw-config.json

@@ -27,6 +27,18 @@
 		},
 		"subscriberCode": {
 			"type": "string"
+		},
+		"defaultHeight": {
+			"type": "number"
+		},
+		"defaultLength": {
+			"type": "number"
+		},
+		"defaultWidth": {
+			"type": "number"
+		},
+		"defaultWeight": {
+			"type": "number"
 		}
 	}
 }

db/routines/vn/procedures/collection_assign.sql

@@ -13,28 +13,12 @@ BEGIN
  * @param vCollectionFk Id de colección
  */
 	DECLARE vHasTooMuchCollections BOOL;
-	DECLARE vItemPackingTypeFk VARCHAR(1);
-	DECLARE vWarehouseFk INT;
-	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 30;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		IF vLockName IS NOT NULL THEN
-			DO RELEASE_LOCK(vLockName);
-			CALL util.debugAdd('releaseLock', vLockName); -- Tmp
-		END IF;
-		
-		RESIGNAL;
-	END;
 
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, 
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
-			collection_assign_lockname
+		INTO vHasTooMuchCollections
-		INTO vHasTooMuchCollections,
-			vLockName
 		FROM productionConfig pc
 			LEFT JOIN tCollection ON TRUE;
 
@@ -44,21 +28,6 @@ BEGIN
 		CALL util.throw('Hay colecciones pendientes');
 	END IF;
 
-	SELECT warehouseFk, itemPackingTypeFk
-		INTO vWarehouseFk, vItemPackingTypeFk
-		FROM operator
-		WHERE workerFk = vUserFk;
-
-	SET vLockName = CONCAT_WS('/',
-		vLockName,
-		vWarehouseFk,
-		vItemPackingTypeFk
-	);
-
-	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
-	END IF;
-
 	-- Se eliminan las colecciones sin asignar que estan obsoletas
 	INSERT INTO ticketTracking(stateFk, ticketFk)
 			SELECT s.id, tc.ticketFk
@@ -80,8 +49,7 @@ BEGIN
 		VALUES(vUserFk);
 
 	-- Comprueba si hay colecciones disponibles que se ajustan a su configuracion
-	SELECT MIN(c.id)
+	SELECT MIN(c.id) INTO vCollectionFk
-		INTO vCollectionFk
 		FROM `collection` c 
 			JOIN operator o
 				ON (o.itemPackingTypeFk = c.itemPackingTypeFk OR c.itemPackingTypeFk IS NULL)
@@ -107,7 +75,5 @@ BEGIN
 	UPDATE `collection`
 		SET workerFk = vUserFk
 		WHERE id = vCollectionFk;
-
-	DO RELEASE_LOCK(vLockName);
 END$$
 DELIMITER ;

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -6,12 +6,12 @@ BEGIN
  *
  * @param vDuaFk Id del dua a recalcular
  */
-	DECLARE done BOOL DEFAULT FALSE;
+	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
-	DECLARE vASIEN BIGINT DEFAULT 0;
+	DECLARE vBookEntry INT;
-	DECLARE vCounter INT DEFAULT 0;
+	DECLARE vFiscalYear INT;
 
-	DECLARE rs CURSOR FOR
+	DECLARE vInvoicesIn CURSOR FOR
 		SELECT DISTINCT e.invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
@@ -20,9 +20,7 @@ BEGIN
 				AND de.customsValue
 				AND ii.isBooked = FALSE;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	OPEN rs;
 
 	UPDATE invoiceIn ii
 			JOIN entry e ON e.invoiceInFk = ii.id
@@ -36,38 +34,36 @@ BEGIN
 			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
 
-	SELECT IFNULL(ASIEN,0) INTO vASIEN
+	SELECT ASIEN INTO vBookEntry FROM dua WHERE id = vDuaFk;
-		FROM dua
-			WHERE id = vDuaFk;
-
-	FETCH rs INTO vInvoiceFk;
-
-	WHILE NOT done DO
-
-		CALL invoiceIn_booking(vInvoiceFk);
-
-		IF vCounter > 0 OR vASIEN > 0 THEN
-
-			UPDATE XDiario x
-				JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
-				SET x.ASIEN = vASIEN;
-
-		ELSE
-
-			SELECT lastBookEntry INTO vASIEN FROM ledgerConfig;
 
+	IF vBookEntry IS NULL THEN 
+		SELECT YEAR(IFNULL(ii.bookEntried, d.bookEntried)) INTO vFiscalYear
+			FROM invoiceIn ii
+				JOIN entry e ON e.invoiceInFk = ii.id
+				JOIN duaEntry de ON de.entryFk = e.id
+				JOIN dua d ON d.id = de.duaFk
+			WHERE d.id = vDuaFk
+			LIMIT 1;
+		CALL ledger_next(vFiscalYear, FALSE, vBookEntry);
 	END IF; 
 
-		SET vCounter = vCounter + 1;
+	OPEN vInvoicesIn;
 
-		FETCH rs INTO vInvoiceFk;
+l: 	LOOP
+		SET vDone = FALSE;
+		FETCH vInvoicesIn INTO vInvoiceFk;
 
-	END WHILE;
+		IF vDone THEN
+			LEAVE l;
+		END IF;
 
-	CLOSE rs;
+		CALL invoiceIn_booking(vInvoiceFk, vBookEntry);
+	END LOOP;
+
+	CLOSE vInvoicesIn;
 
 	UPDATE dua
-		SET ASIEN = vASIEN
+		SET ASIEN = vBookEntry
 		WHERE id = vDuaFk;
 
 	UPDATE invoiceIn ii

db/routines/vn/procedures/duaTaxBooking.sql

@@ -12,7 +12,7 @@ BEGIN
 		WHERE id = vDuaFk;
 
 	IF vBookNumber IS NULL OR NOT vBookNumber THEN
-		CALL ledger_next(YEAR(vBookDated), vBookNumber);
+		CALL ledger_next(YEAR(vBookDated), FALSE, vBookNumber);
 	END IF;
 
 	-- Apunte de la aduana

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -1,7 +1,17 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceIn_booking`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceIn_booking`(
+	vSelf INT, 
+	vBookNumber INT
+)
 BEGIN
-	DECLARE vBookNumber INT;
+/**
+ * Genera la contabilidad para una factura y la marca como contabilizada
+ * Cuadra el asiento generado en si encuentra problemas derivados 
+ * de los calculos con decimales
+ * 
+ * @param vSelf Id invoiceIn 
+ * @param vBookEntry Id de asiento, si es NULL se genera uno nuevo
+ */
 	DECLARE vFiscalYear INT;
 
 	CREATE OR REPLACE TEMPORARY TABLE tInvoiceIn
@@ -58,7 +68,10 @@ BEGIN
 			WHERE ii.id = vSelf;
 
 	SELECT YEAR(bookEntried) INTO vFiscalYear FROM tInvoiceIn LIMIT 1;
-	CALL ledger_next(vFiscalYear, vBookNumber);
+
+	IF vBookNumber IS NULL THEN 
+		CALL ledger_next(vFiscalYear, FALSE, vBookNumber);
+	END IF;
 
 	-- Apunte del proveedor
 	INSERT INTO XDiario(

db/routines/vn/procedures/invoiceOutBooking.sql

@@ -61,7 +61,7 @@ BEGIN
 			WHERE io.id = vInvoice;
 
 	SELECT YEAR(FECHA) INTO vFiscalYear FROM rs LIMIT 1;
-	CALL ledger_next(vFiscalYear, vBookNumber);
+	CALL ledger_next(vFiscalYear, FALSE, vBookNumber);
 	-- Linea del cliente
 	INSERT INTO XDiario(
 			ASIEN,

db/routines/vn/procedures/ledger_doCompensation.sql

@@ -28,7 +28,7 @@ BEGIN
 	DECLARE vIsOriginalAClient BOOL;
 	DECLARE vPayMethodCompensation INT;
 
-	CALL ledger_next(YEAR(vDated), vNewBookEntry);
+	CALL ledger_next(YEAR(vDated), FALSE, vNewBookEntry);
 
 	SELECT COUNT(id) INTO vIsOriginalAClient 
 		FROM client 

db/routines/vn/procedures/ledger_next.sql

@@ -1,6 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_next`(
 	IN vFiscalYear INT,
+	IN vIsManageTransaction BOOLEAN,
 	OUT vLastBookEntry INT
 )
 BEGIN
@@ -22,6 +23,7 @@ BEGIN
 		CALL util.throw('Fiscal year is required');
 	END IF;
 
+	IF NOT vIsManageTransaction THEN 
 		SELECT @@in_transaction INTO vHasStartTransaction;
 	
 		IF NOT vHasStartTransaction THEN
@@ -29,6 +31,7 @@ BEGIN
 		ELSE
 			SAVEPOINT sp;
 		END IF;
+	END IF;	
 
 	SELECT bookEntry + 1 INTO vLastBookEntry
 		FROM ledgerCompany
@@ -46,10 +49,12 @@ BEGIN
 		SET bookEntry = vLastBookEntry 
 		WHERE fiscalYear = vFiscalYear;
 
+	IF NOT vIsManageTransaction THEN 
 		IF vHasStartTransaction THEN
 			RELEASE SAVEPOINT sp;	
 		ELSE
 			COMMIT;
 		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/xdiario_new.sql

@@ -39,7 +39,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`xdiario_new`(
  */
 BEGIN
 	IF vBookNumber IS NULL THEN
-		CALL ledger_next(YEAR(vDated), vBookNumber);
+		CALL ledger_next(YEAR(vDated), FALSE, vBookNumber);
 	END IF;
 
 	INSERT INTO XDiario

db/routines/vn/triggers/payment_beforeInsert.sql

@@ -9,7 +9,6 @@ BEGIN
 	DECLARE vIsCash BOOLEAN;
 	DECLARE vIsSupplierActive BOOLEAN;
 
-	-- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH
 	SELECT (at2.code = 'cash') INTO vIsCash
 		FROM accounting a
 			JOIN accountingType at2 ON at2.id = a.accountingTypeFk
@@ -24,7 +23,7 @@ BEGIN
 			FROM supplier
 			WHERE id = NEW.supplierFk;
 
-		CALL ledger_next(YEAR(NEW.received), NEW.companyFk, vNewBookEntry);
+		CALL ledger_next(YEAR(NEW.received), TRUE, vNewBookEntry);
 
 		INSERT INTO XDiario (
 				ASIEN,

db/versions/11075-salmonLilium/00-firstScript.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE vn.mrwConfig ADD IF NOT EXISTS defaultHeight INT UNSIGNED NULL COMMENT 'default height in centimeters';
+ALTER TABLE vn.mrwConfig ADD IF NOT EXISTS  defaultLength INT UNSIGNED NULL COMMENT 'default length in centimeters';
+ALTER TABLE vn.mrwConfig ADD IF NOT EXISTS  defaultWidth INT UNSIGNED NULL COMMENT 'default width in centimeters';
+ALTER TABLE vn.mrwConfig ADD IF NOT EXISTS  defaultWeight INT UNSIGNED NULL COMMENT 'default weight in centimeters';

modules/invoiceIn/back/methods/invoice-in/toBook.js

@@ -32,7 +32,7 @@ module.exports = Self => {
         }
 
         try {
-            await Self.rawSql(`CALL vn.invoiceIn_booking(?)`, [id], myOptions);
+            await Self.rawSql(`CALL vn.invoiceIn_booking(?, NULL)`, [id], myOptions);
             if (tx) await tx.commit();
         } catch (e) {
             if (tx) await tx.rollback();