db/routines/vn/procedures/supplierPackaging_ReportSource.sql

@@ -5,14 +5,14 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`supplierPackaging_Rep
 )
 BEGIN
 /**
-* Create a report with packaging balance
-*
-* @param vFromDated Starting date
-* @param vSupplierFk Supplier ID
-*/
-	DECLARE vUser INT;
+ * Create a report with packaging balance
+ *
+ * @param vFromDated Starting date
+ * @param vSupplierFk Supplier ID
+ */
+	DECLARE vPerson INT;
 
-	SELECT id INTO vUser
+	SELECT id INTO vPerson
 		FROM supplier
 		WHERE nif = vNif;
 
@@ -104,11 +104,11 @@ BEGIN
 						GROUP BY p.itemFk
 						ORDER BY itemFk , landed, entryFk
 			)sub
-			WHERE (`out` OR `in`);
+			WHERE `out` OR `in`;
 
-	IF vUser IS NULL THEN
+	IF vPerson IS NULL THEN
 
-		SELECT id INTO vUser
+		SELECT id INTO vPerson
 			FROM client
 			WHERE fi = vNif;
 
@@ -154,11 +154,11 @@ BEGIN
 						GROUP BY itemFk
 						ORDER BY itemFk , landed, entryFk
 				) sub
-			WHERE (`out` OR `in`);
+			WHERE `out` OR `in`;
 
 	END IF;
 
-	SELECT vUser,
+	SELECT vPerson,
 			itemFk,
 			longName,
 			name,
@@ -170,7 +170,7 @@ BEGIN
 			buyingValue,
 			CAST(SUM(IF(`in`=0, -`out`, `in`)) OVER (PARTITION BY itemFk ORDER BY itemFk , landed, entryFk) AS DECIMAL(10,2)) balance
 		FROM tSupplierPackaging
-		WHERE NOT (landed < CURDATE() - INTERVAL 1 YEAR)
+		WHERE NOT (landed < util.VN_CURDATE() - INTERVAL 1 YEAR)
 		ORDER BY itemFk, landed, entryFk;
 
 	DROP TEMPORARY TABLE tSupplierPackaging;