Merge branch 'test' into dev

db/routines/vn/procedures/multipleInventory.sql

@@ -1,9 +1,9 @@
-DELIMITER $$
+DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventory`(
 	vDate DATE,
 	vWarehouseFk TINYINT,
 	vMaxDays TINYINT
-)
+)
 proc: BEGIN
 	DECLARE vDateTomorrow DATE DEFAULT vDate + INTERVAL 1 DAY;
 	DECLARE vDateFrom DATE DEFAULT vDate;
@@ -36,9 +36,12 @@ proc: BEGIN
 		ADD `life` TINYINT NOT NULL DEFAULT '0';
 
 	-- Calculo del inventario
-	UPDATE tmp.itemInventory ai
+	CREATE OR REPLACE TEMPORARY TABLE tItemInventoryCalc
-		JOIN (
+		(PRIMARY KEY (itemFk))
-		SELECT itemFk Id_Article, SUM(quantity) Subtotal
+		ENGINE = MEMORY
+		SELECT itemFk,
+				SUM(quantity) quantity,
+				SUM(quantity) visible
 			FROM (
 				SELECT s.itemFk, - s.quantity quantity
 					FROM sale s
@@ -69,18 +72,13 @@ proc: BEGIN
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
 						AND NOT e.isRaid
-			) sub2
+			) sub
-			GROUP BY itemFk
+			GROUP BY itemFk;
-	) sub ON ai.id = sub.Id_Article
-	SET ai.inventory = sub.Subtotal,
-		ai.visible = sub.Subtotal,
-		ai.avalaible = sub.Subtotal,
-		ai.sd = sub.Subtotal;
 
 	-- Cálculo del visible
-	UPDATE tmp.itemInventory ai
+	UPDATE tItemInventoryCalc iic
 		JOIN (
-			SELECT itemFk Id_Article, SUM(quantity) Subtotal
+			SELECT itemFk, SUM(quantity) visible
 				FROM (
 					SELECT s.itemFk, s.quantity
 						FROM sale s
@@ -117,8 +115,15 @@ proc: BEGIN
 							AND w.isComparative
 				) sub2
 				GROUP BY itemFk
-		) sub ON ai.id = sub.Id_Article
+		) sub ON sub.itemFk = iic.itemFk
-		SET ai.visible = ai.visible + sub.Subtotal;
+		SET iic.visible = iic.visible + sub.visible;
+
+	UPDATE tmp.itemInventory ai
+			JOIN tItemInventoryCalc iic ON iic.itemFk = ai.id
+		SET ai.inventory = iic.quantity,
+			ai.visible = iic.visible,
+			ai.avalaible = iic.quantity,
+			ai.sd = iic.quantity;
 
 	-- Calculo del disponible
 	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
@@ -189,6 +194,7 @@ proc: BEGIN
 	DROP TEMPORARY TABLE
 		tmp.itemTravel,
 		tmp.itemCalc,
+		tItemInventoryCalc,
 		tmp.itemAtp;
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;

modules/account/back/models/mail-alias-account.json

@@ -6,6 +6,9 @@
 			"table": "account.mailAliasAccount"
 		}
 	},
+    "mixins": {
+        "Loggable": true
+    },
 	"properties": {
 		"id": {
 			"type": "number",