Merge branch 'master' into test

db/routines/util/functions/midnight.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`midnight`()
 	RETURNS datetime
-	NOT DETERMINISTIC
+	DETERMINISTIC
 	READS SQL DATA
 BEGIN
 	

db/routines/vn/functions/ticket_isTooLittle.sql

@@ -14,7 +14,7 @@ BEGIN
 	DECLARE vIsTooLittle TINYINT(1);
 
 	SELECT (SUM(IFNULL(sv.litros, 0)) < vc.minTicketVolume 
-			OR IFNULL(t.totalWithoutVat, 0) < vc.minTicketValue) INTO vIsTooLittle
+			AND IFNULL(t.totalWithoutVat, 0) < vc.minTicketValue) INTO vIsTooLittle
 		FROM ticket t
 			LEFT JOIN saleVolume sv ON sv.ticketFk = t.id
 			JOIN volumeConfig vc

db/routines/vn/procedures/collection_new.sql

@@ -49,7 +49,10 @@ BEGIN
 	BEGIN
 		IF vLockName IS NOT NULL THEN
 			DO RELEASE_LOCK(vLockName);
-			CALL util.debugAdd('releaseLock', vLockName); -- Tmp
+			CALL util.debugAdd(JSON_OBJECT(
+						'type', 'releaseLock',
+						'userFk', vUserFk
+					), vLockName); -- Tmp
 		END IF;
 
 		RESIGNAL;

db/routines/vn/procedures/sale_setProblemComponentLackByComponent.sql

@@ -18,7 +18,7 @@ BEGIN
 					FROM ticket t
 						JOIN sale s ON s.ticketFk = t.id
 						LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-					WHERE t.shipped >= util.midnight()
+					WHERE t.shipped >= util.VN_CURDATE()
 						 AND (vComponentFk IS NULL OR sc.componentFk = vComponentFk)
 					GROUP BY s.id) sub;
 

db/routines/vn/procedures/ticket_setProblemFreeze.sql

@@ -13,7 +13,7 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, FALSE hasProblem
 			FROM ticket t 
-			WHERE t.shipped >= util.midnight()
+			WHERE t.shipped >= util.VN_CURDATE()
 				AND (vClientFk IS NULL OR t.clientFk = vClientFk);
 
 	UPDATE tmp.ticket t

db/routines/vn/procedures/ticket_setProblemRequest.sql

@@ -13,7 +13,7 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, FALSE hasProblem 
 			FROM ticket t 
-				WHERE t.shipped >= util.midnight()
+				WHERE t.shipped >= util.VN_CURDATE()
 					AND (vSelf IS NULL OR t.id = vSelf);
 	
 	UPDATE tmp.ticket t

db/routines/vn/procedures/ticket_setProblemTaxDataChecked.sql

@@ -14,7 +14,7 @@ BEGIN
 		SELECT t.id ticketFk, IF(c.isTaxDataChecked, FALSE, TRUE) hasProblem
 			FROM ticket t 
 				JOIN client c ON c.id = t.clientFk 
-			WHERE t.shipped >= util.midnight() 
+			WHERE t.shipped >= util.VN_CURDATE() 
 				AND (c.id = vClientFk OR vClientFk IS NULL);
 
 	CALL ticket_setProblem('isTaxDataChecked');

db/routines/vn/procedures/ticket_setProblemTooLittleItemCost.sql

@@ -16,7 +16,7 @@ BEGIN
 			SELECT t.id ticketFk
 				FROM vn.ticket t
 					LEFT JOIN vn.sale s ON s.ticketFk = t.id
-				WHERE t.shipped >= util.midnight()
+				WHERE t.shipped >= util.VN_CURDATE()
 					AND (s.itemFk = vItemFk OR vItemFk IS NULL)
 				GROUP BY t.id
 		)SELECT ticketFk, ticket_isTooLittle(ticketFk) hasProblem

db/routines/vn/views/ticketPreviousPreparingList.sql

@@ -20,7 +20,7 @@ FROM (
 								`vn`.`saleGroup` `sg`
 								JOIN `vn`.`saleGroupDetail` `sgd` ON(`sgd`.`saleGroupFk` = `sg`.`id`)
 							)
-							JOIN `vn`.`sale` `s` ON(`s`.`id` = `sgd`.`saleFk`)
+							JOIN `vn`.`sale` `s` FORCE INDEX (PRIMARY) ON(`s`.`id` = `sgd`.`saleFk`)
 						)
 						JOIN `vn`.`ticketState` `tls` ON(`tls`.`ticketFk` = `s`.`ticketFk`)
 					)