Merge pull request 'fix: riesgos' (!2225) from hotFixCompany_getSuppliersDebt into master

Reviewed-on: #2225
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

db/routines/vn/procedures/company_getSuppliersDebt.sql

@@ -34,19 +34,19 @@ BEGIN
 			currencyFk
 			FROM (
 				SELECT p.supplierFk,
-                        p.companyFk,
-                        IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
-                        p.dueDated < vStartingDate isBeforeStarting,
-                        p.currencyFk
+						p.companyFk,
+						IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
+						p.dueDated < vStartingDate isBeforeStarting,
+						p.currencyFk
 					FROM payment p 
 					WHERE p.received > vStartDate
 						AND p.companyFk = vSelf
 					UNION ALL
 				SELECT r.supplierFk,
-                        r.companyFk,
-                        - IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
-                        rv.dueDated < vStartingDate isBeforeStarting,
-                        r.currencyFk 
+						r.companyFk,
+						- IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
+						rv.dueDated < vStartingDate isBeforeStarting,
+						r.currencyFk 
 					FROM invoiceIn r 
 						INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk 
 					WHERE r.issued > vStartDate
@@ -57,7 +57,7 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tPendingDuedates;
 	CREATE TEMPORARY TABLE tPendingDuedates (
 		id INT auto_increment,
-        expirationId INT,
+		expirationId INT,
 		dated DATE,
 		supplierFk INT NOT NULL,
 		companyFk INT NOT NULL,
@@ -82,35 +82,35 @@ BEGIN
 		isPayment,
 		isReconciled
 	)SELECT p.id,
-            p.dueDated,
-            p.supplierFk,
-            p.companyFk,
-            IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa),
-            p.currencyFk,
-            TRUE isPayment,
-            p.isConciliated
-        FROM payment p
-        WHERE p.dueDated >= vStartingDate
-            AND p.companyFk = vSelf
-    UNION ALL
-    SELECT r.id,
-            rv.dueDated,
-            r.supplierFk,
-            r.companyFk,
-            -IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
-            r.currencyFk,
-            FALSE isPayment,
-            TRUE 
-        FROM invoiceIn r 
-            LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
-                AND r.supplierFk = si.supplierFk
-                AND r.currencyFk = si.currencyFk 
-            JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
-        WHERE rv.dueDated >= vStartingDate
-            AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
-            AND r.isBooked
-            AND r.companyFk = vSelf
-        ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id;
+			p.dueDated,
+			p.supplierFk,
+			p.companyFk,
+			IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa),
+			p.currencyFk,
+			TRUE isPayment,
+			p.isConciliated
+		FROM payment p
+		WHERE p.dueDated >= vStartingDate
+			AND p.companyFk = vSelf
+	UNION ALL
+	SELECT r.id,
+			rv.dueDated,
+			r.supplierFk,
+			r.companyFk,
+			-IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
+			r.currencyFk,
+			FALSE isPayment,
+			TRUE 
+		FROM invoiceIn r 
+			LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
+				AND r.supplierFk = si.supplierFk
+				AND r.currencyFk = si.currencyFk 
+			JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
+		WHERE rv.dueDated >= vStartingDate
+			AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
+			AND r.isBooked
+			AND r.companyFk = vSelf
+		ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id;
 	-- Now, we calculate the outstanding amount for each receipt in descending order
 	SET @risk := 0.0;
 	SET @supplier := 0.0;
@@ -169,26 +169,29 @@ BEGIN
 			AND vp.supplierFk = rd.supplierFk
 			AND vp.companyFk = rd.companyFk
 			AND vp.currencyFk = rd.currencyFk
-		WHERE vp.isPayment = FALSE;
+		WHERE NOT vp.isPayment;
 
 	SELECT vp.expirationId,
 			vp.dated,
 			vp.supplierFk,
-            vp.companyFk,
-            vp.currencyFk,
-            vp.amount,
-            vp.pending,
-            vp.balance,
-            s.payMethodFk,
-            vp.isPayment,
-            vp.isReconciled,
-            vp.endingBalance,
-			cr.amount clientRiskAmount
+			vp.companyFk,
+			vp.currencyFk,
+			vp.amount,
+			vp.pending,
+			vp.balance,
+			s.payMethodFk,
+			vp.isPayment,
+			vp.isReconciled,
+			vp.endingBalance,
+			cr.amount clientRiskAmount,
+			co.CEE
 		FROM tPendingDuedates vp
-		    LEFT JOIN supplier s ON s.id = vp.supplierFk
+			LEFT JOIN supplier s ON s.id = vp.supplierFk
 			LEFT JOIN client c ON c.fi = s.nif
-			LEFT JOIN clientRisk cr ON cr.clientFk = c.id 
-				AND cr.companyFk = vp.companyFk;
+			JOIN clientRisk cr ON cr.clientFk = c.id AND cr.companyFk = vp.companyFk
+			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
+			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
+			LEFT JOIN country co ON co.id = be.countryFk;
 	
 	DROP TEMPORARY TABLE tOpeningBalances;
 	DROP TEMPORARY TABLE tPendingDuedates;