reviewed

db/routines/vn/procedures/supplier_statementWithEntries.sql

@@ -1,5 +1,4 @@
 DELIMITER $$
-$$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
 	vSupplierFk INT,
 	vCurrencyFk INT,
@@ -20,9 +19,15 @@ BEGIN
 * @param vHasEntries Indicates if future entries must be shown
 * @return tmp.supplierStatement 
 */
+	DECLARE vBalanceStartingDate DATETIME;
+
 	SET @euroBalance:= 0;
 	SET @currencyBalance:= 0;
 
+	SELECT balanceStartingDate 
+		INTO vBalanceStartingDate
+		FROM invoiceInConfig;
+
 	CREATE OR REPLACE TEMPORARY TABLE tmp.supplierStatement
 		ENGINE = MEMORY
 		SELECT *,
@@ -35,8 +40,6 @@ BEGIN
 					IFNULL(invoiceCurrency, 0), 2
 				) currencyBalance
 			FROM (
-				SELECT * FROM
-					(
 				SELECT NULL bankFk,
 						ii.companyFk,
 						ii.serial,
@@ -63,8 +66,7 @@ BEGIN
 					FROM invoiceIn ii
 						JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
 						JOIN currency c ON c.id = ii.currencyFk
-								JOIN invoiceInConfig iic
+					WHERE ii.issued >= vBalanceStartingDate
-							WHERE ii.issued >= iic.balanceStartingDate
 						AND ii.supplierFk = vSupplierFk 
 						AND vCurrencyFk IN (ii.currencyFk, 0)
 						AND vCompanyFk IN (ii.companyFk, 0)
@@ -100,8 +102,7 @@ BEGIN
 					LEFT JOIN accounting a ON a.id = p.bankFk
 					LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
 					LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
-							JOIN invoiceInConfig iic
+				WHERE p.received >= vBalanceStartingDate
-						WHERE p.received >= iic.balanceStartingDate
 					AND p.supplierFk = vSupplierFk
 					AND vCurrencyFk IN (p.currencyFk, 0)
 					AND vCompanyFk IN (p.companyFk, 0)
@@ -149,18 +150,17 @@ BEGIN
 					FALSE isBooked,
 					c.code,
 					'order'
-							FROM vn.entry e 
+					FROM entry e 
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN currency c ON c.id = e.currencyFk
 					WHERE e.supplierFk = vSupplierFk
 						AND tr.landed >= CURDATE()
 						AND e.invoiceInFk IS NULL
 						AND vHasEntries
-					) sub
 				ORDER BY (dated IS NULL AND NOT isBooked),
 					dated,
 					IF(vOrderBy = 'dueDate', id, NULL)
 				LIMIT 10000000000000000000
 			) t;
-END;$$
+END$$
 DELIMITER ;