Merge pull request 'feat: refs #7977 muestra las facturas sin vencimientos tambien' (!2964) from 7977-supplierStatement into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2964 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
This commit is contained in:
commit
be95162d1a
|
@ -17,14 +17,14 @@ BEGIN
|
|||
* @param vOrderBy Order by criteria
|
||||
* @param vIsConciliated Indicates whether it is reconciled or not
|
||||
* @param vHasEntries Indicates if future entries must be shown
|
||||
* @return tmp.supplierStatement
|
||||
* @return tmp.supplierStatement
|
||||
*/
|
||||
DECLARE vBalanceStartingDate DATETIME;
|
||||
|
||||
SET @euroBalance:= 0;
|
||||
SET @currencyBalance:= 0;
|
||||
|
||||
SELECT balanceStartingDate
|
||||
SELECT balanceStartingDate
|
||||
INTO vBalanceStartingDate
|
||||
FROM invoiceInConfig;
|
||||
|
||||
|
@ -64,14 +64,14 @@ BEGIN
|
|||
c.code,
|
||||
'invoiceIn' statementType
|
||||
FROM invoiceIn ii
|
||||
JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
|
||||
LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
|
||||
JOIN currency c ON c.id = ii.currencyFk
|
||||
WHERE ii.issued >= vBalanceStartingDate
|
||||
AND ii.supplierFk = vSupplierFk
|
||||
AND ii.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (ii.currencyFk, 0)
|
||||
AND vCompanyFk IN (ii.companyFk, 0)
|
||||
AND (vIsConciliated = ii.isBooked OR NOT vIsConciliated)
|
||||
GROUP BY iid.id
|
||||
GROUP BY iid.id, ii.id
|
||||
UNION ALL
|
||||
SELECT p.bankFk,
|
||||
p.companyFk,
|
||||
|
@ -107,7 +107,7 @@ BEGIN
|
|||
AND vCurrencyFk IN (p.currencyFk, 0)
|
||||
AND vCompanyFk IN (p.companyFk, 0)
|
||||
AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
|
||||
UNION ALL
|
||||
UNION ALL
|
||||
SELECT NULL,
|
||||
companyFk,
|
||||
NULL,
|
||||
|
@ -134,7 +134,7 @@ BEGIN
|
|||
AND vCurrencyFk IN (se.currencyFk,0)
|
||||
AND vCompanyFk IN (se.companyFk,0)
|
||||
AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
|
||||
UNION ALL
|
||||
UNION ALL
|
||||
SELECT NULL bankFk,
|
||||
e.companyFk,
|
||||
'E' serial,
|
||||
|
@ -150,7 +150,7 @@ BEGIN
|
|||
FALSE isBooked,
|
||||
c.code,
|
||||
'order'
|
||||
FROM 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
|
||||
|
|
Loading…
Reference in New Issue