#7134 SupplierBalance #3173
|
@ -40,7 +40,8 @@ BEGIN
|
|||
IFNULL(invoiceCurrency, 0), 2
|
||||
) currencyBalance
|
||||
FROM (
|
||||
SELECT NULL bankFk, NULL bank,
|
||||
SELECT NULL bankFk,
|
||||
NULL bank,
|
||||
ii.companyFk,
|
||||
ii.serial,
|
||||
ii.id,
|
||||
|
@ -74,7 +75,7 @@ BEGIN
|
|||
GROUP BY iid.id, ii.id
|
||||
UNION ALL
|
||||
SELECT p.bankFk,
|
||||
a.bank 'bank' ,
|
||||
a.bank 'bank',
|
||||
p.companyFk,
|
||||
NULL,
|
||||
p.id,
|
||||
|
@ -103,15 +104,14 @@ 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, NULL bankFk,
|
||||
SELECT NULL,
|
||||
NULL bankFk,
|
||||
companyFk,
|
||||
NULL,
|
||||
se.id,
|
||||
|
|
Loading…
Reference in New Issue