verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

#7134 SupplierBalance #3173

Merged
jsegarra merged 27 commits from 7134-supplierBalance into dev 2025-01-29 15:16:00 +00:00
Conversation 0 Commits 27 Files Changed 5 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9bfc2a01c5 - Show all commits

10
db/routines/vn/procedures/supplier_statementWithEntries.sql
View File

@ -40,7 +40,8 @@ BEGIN
IFNULL(invoiceCurrency, 0), 2 IFNULL(invoiceCurrency, 0), 2
) currencyBalance ) currencyBalance
FROM ( FROM (
SELECT NULL bankFk, NULL bank, SELECT NULL bankFk,
NULL bank,
ii.companyFk, ii.companyFk,
ii.serial, ii.serial,
ii.id, ii.id,
@ -74,7 +75,7 @@ BEGIN
GROUP BY iid.id, ii.id GROUP BY iid.id, ii.id
UNION ALL UNION ALL
SELECT p.bankFk, SELECT p.bankFk,
jgallego marked this conversation as resolved Outdated
jgallego commented 2024-12-30 06:35:32 +00:00
Outdated
Review
Copy Link

'bank' sobra

'bank' sobra
jsegarra commented 2025-01-13 22:07:35 +00:00
Outdated
Review
Copy Link

He añadido bank para que en la tabla se vea el valor del banco en vez del id

He añadido bank para que en la tabla se vea el valor del banco en vez del id
a.bank 'bank' , a.bank 'bank',
jsegarra marked this conversation as resolved Outdated
jgallego commented 2025-01-14 06:15:25 +00:00
Outdated
Review
Copy Link

a.bank,
el alias al ser un union all usa el de arriba

`a.bank,` el alias al ser un union all usa el de arriba
p.companyFk, p.companyFk,
NULL, NULL,
p.id, p.id,
@ -103,15 +104,14 @@ BEGIN
LEFT JOIN accounting a ON a.id = p.bankFk LEFT JOIN accounting a ON a.id = p.bankFk
LEFT JOIN payMethod pm ON pm.id = p.payMethodFk LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
jsegarra marked this conversation as resolved Outdated
jgallego commented 2024-12-30 06:36:08 +00:00
Outdated
Review
Copy Link

sin saltos de linea

sin saltos de linea
WHERE p.received >= vBalanceStartingDate WHERE p.received >= vBalanceStartingDate
AND p.supplierFk = vSupplierFk AND p.supplierFk = vSupplierFk
AND vCurrencyFk IN (p.currencyFk, 0) AND vCurrencyFk IN (p.currencyFk, 0)
AND vCompanyFk IN (p.companyFk, 0) AND vCompanyFk IN (p.companyFk, 0)
AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated) AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
UNION ALL UNION ALL
SELECT NULL, NULL bankFk, SELECT NULL,
NULL bankFk,
jgallego commented 2024-12-30 06:36:32 +00:00
Outdated
Review
Copy Link

sin bankFk y salta de linea como el resto de campos

sin bankFk y salta de linea como el resto de campos
jsegarra commented 2025-01-13 22:09:37 +00:00
Outdated
Review
Copy Link

Así se muestra el valor del bank en la tabla

Así se muestra el valor del bank en la tabla
companyFk, companyFk,
NULL, NULL,
se.id, se.id,