refs 6500 rateView

db/routines/vn/procedures/rateView.sql

@@ -2,9 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`rateView`()
 BEGIN
 
-	DECLARE v10Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 10 YEAR;
+	SELECT
-
-		SELECT
 			t.year,
 			t.month,
 			pagos.dollars,
@@ -15,28 +13,24 @@ BEGIN
 			JOIN time t ON t.dated = ii.issued
 			JOIN invoiceInTax iit ON ii.id = iit.invoiceInFk
 			JOIN
-			(
+			(	SELECT
-				SELECT
+						t.year,
-					t.year,
+						t.month,
-					t.month,
+						CAST(SUM(divisa) AS DECIMAL(10,2)) dollars,
-					CAST(SUM(divisa) AS DECIMAL(10,2)) dollars,
+						CAST(SUM(divisa) / SUM(amount) AS DECIMAL(5,4)) changePractical,
-					CAST(SUM(divisa) / SUM(amount) AS DECIMAL(5,4)) changePractical,
+						CAST(rr.value * 0.998 AS DECIMAL(5,4)) changeOfficial
-					CAST(rr.value * 0.998 AS DECIMAL(5,4)) changeOfficial
+					FROM payment p
-				FROM payment p
+						JOIN time t ON t.dated = p.received
-					JOIN time t ON t.dated = p.received
+						JOIN referenceRate rr ON rr.dated = p.received
-					JOIN referenceRate rr ON rr.dated = p.received
+						JOIN currency c ON c.id = rr.currencyFk
-					JOIN currency c ON c.id = rr.currencyFk
+					WHERE divisa
-				WHERE divisa
+						AND c.code = 'USD'
-					AND p.received >= v10Years
+					GROUP BY t.year, t.month
-					AND c.code = 'USD'
-				GROUP BY t.year, t.month
 			) pagos ON t.year = pagos.year AND t.month = pagos.MONTH
 			JOIN currency c ON c.id = ii.currencyFk
 		WHERE c.code = 'USD'
-			AND ii.issued >= v10Years
 			AND iit.foreignValue
 			AND iit.taxableBase
 		GROUP BY t.year, t.month;
-
 END$$
 DELIMITER ;