db/routines/vn/procedures/supplier_statementWithEntries.sql

@@ -40,7 +40,7 @@ BEGIN
 					IFNULL(invoiceCurrency, 0), 2
 				) currencyBalance
 			FROM (
-				SELECT NULL bankFk,
+				SELECT NULL bankFk, NULL bank,
 						ii.companyFk,
 						ii.serial,
 						ii.id,
@@ -74,6 +74,7 @@ BEGIN
 					GROUP BY iid.id, ii.id
 				UNION ALL
 				SELECT p.bankFk,
+						a.bank 'bank' ,
 						p.companyFk,
 						NULL,
 						p.id,
@@ -102,13 +103,15 @@ 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
+
+
 				WHERE p.received >= vBalanceStartingDate
 					AND p.supplierFk = vSupplierFk
 					AND vCurrencyFk IN (p.currencyFk, 0)
 					AND vCompanyFk IN (p.companyFk, 0)
 					AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
 				UNION ALL
-				SELECT NULL,
+				SELECT NULL, NULL bankFk,
 						companyFk,
 						NULL,
 						se.id,
@@ -136,6 +139,7 @@ BEGIN
 						AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
 				UNION ALL
 				SELECT NULL bankFk,
+					NULL,
 					e.companyFk,
 					'E' serial,
 					e.invoiceNumber id,

modules/supplier/back/methods/supplier/receipts.js

@@ -60,9 +60,11 @@ module.exports = Self => {
             args.isConciliated ?? false,
             false
         ]));
-        stmts.push(`
+        const stmt = new ParameterizedSQL(`
             SELECT *
                 FROM tmp.supplierStatement`);
+        stmt.merge(conn.makeSuffix(filter));
+        stmts.push(stmt);
         stmts.push(`DROP TEMPORARY TABLE tmp.supplierStatement`);
         const sql = ParameterizedSQL.join(stmts, ';');
         const results = await conn.executeStmt(sql);