#7134 SupplierBalance #3173

Merged
jsegarra merged 27 commits from 7134-supplierBalance into dev 2025-01-29 15:16:00 +00:00
Member
https://gitea.verdnatura.es/verdnatura/salix-front/pulls/905
jsegarra added 1 commit 2024-11-11 13:47:27 +00:00
jsegarra added 1 commit 2024-11-20 10:21:36 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
50b35c3474
Merge branch 'dev' into 7134-supplierBalance
jsegarra added 4 commits 2024-11-20 13:28:53 +00:00
jsegarra added 1 commit 2024-12-02 09:24:43 +00:00
jsegarra added 3 commits 2024-12-27 10:57:33 +00:00
jsegarra added 1 commit 2024-12-27 12:26:55 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
3691daded4
feat: refs #7134 add bank name
jsegarra added 1 commit 2024-12-27 12:57:33 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
a69a767c8a
feat: refs #7134 use filter to order by
jsegarra requested review from jgallego 2024-12-27 12:57:36 +00:00
jsegarra changed title from WIP: #7134 SupplierBalance to #7134 SupplierBalance 2024-12-27 12:57:38 +00:00
jgallego requested changes 2024-12-30 06:45:32 +00:00
Dismissed
@ -4039,3 +4039,3 @@
VALUES (1106,'26493101E','2019-09-20');
INSERT INTO vn.referenceRate (currencyFk, dated, value)
INSERT INTO vn.payment (received,supplierFk,amount,currencyFk,divisa,bankFk,payMethodFk,bankingFees,concept,companyFk,created,isConciliated,dueDated,workerFk) VALUES
Owner

por claridad para leer, pon un espacio después de cada coma

por claridad para leer, pon un espacio después de cada coma
jsegarra marked this conversation as resolved
@ -74,6 +74,7 @@ BEGIN
GROUP BY iid.id, ii.id
UNION ALL
SELECT p.bankFk,
a.bank 'bank' ,
Owner

'bank' sobra

'bank' sobra
Author
Member

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
jgallego marked this conversation as resolved
@ -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
Owner

sin saltos de linea

sin saltos de linea
jsegarra marked this conversation as resolved
@ -109,3 +112,3 @@
AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
UNION ALL
SELECT NULL,
SELECT NULL, NULL bankFk,
Owner

sin bankFk y salta de linea como el resto de campos

sin bankFk y salta de linea como el resto de campos
Author
Member

Así se muestra el valor del bank en la tabla

Así se muestra el valor del bank en la tabla
@ -0,0 +1,9 @@
module.exports = Self => {
Self.tillIn = async(ctx, options) => {
const query = `INSERT INTO vn.promissoryNote ( concept, paymentFk) VALUES(?, ? )`;
Owner

Porque no haces un insert de loopback?

Porque no haces un insert de loopback?
Author
Member

He eliminado el archivo

He eliminado el archivo
jsegarra marked this conversation as resolved
@ -0,0 +1,9 @@
module.exports = Self => {
Self.tillOut = async(ctx, options) => {
const query = `INSERT INTO vn.promissoryNote ( id, dated, serie, concept, in, out, bankFk, companyFk, isAccountable, InForeignValue, OutForeignValue, workerFk, calculatedCode, number, isLinked, created, isOk, warehouseFk, isConciliate, supplierAccountFk) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )`;
Owner

Porque no haces un insert de loopback?

Porque no haces un insert de loopback?
Author
Member

He eliminado el archivo

He eliminado el archivo
jsegarra marked this conversation as resolved
@ -0,0 +1,6 @@
module.exports = Self => {
Owner

para que sirve?

para que sirve?
Author
Member

He eliminado el archivo

He eliminado el archivo
jsegarra marked this conversation as resolved
@ -0,0 +1,297 @@
// const UserError = require('vn-loopback/util/user-error');
Owner

comentarios

comentarios
Author
Member

He eliminado el archivo

He eliminado el archivo
jsegarra marked this conversation as resolved
@ -0,0 +71,4 @@
let stmts = [];
stmts.push(new ParameterizedSQL('CALL vn.supplier_statementWithEntries(?,?,?,?,?,?)', [
args.supplierId,
args.currencyFk ?? 1,
Owner

si no ponen currency no pasamos nada, no se ponen numero en el codigo

si no ponen currency no pasamos nada, no se ponen numero en el codigo
jsegarra marked this conversation as resolved
jsegarra changed title from #7134 SupplierBalance to WIP: #7134 SupplierBalance 2025-01-13 10:57:29 +00:00
jsegarra added 3 commits 2025-01-13 18:17:18 +00:00
jsegarra changed title from WIP: #7134 SupplierBalance to #7134 SupplierBalance 2025-01-13 18:21:15 +00:00
jsegarra added 1 commit 2025-01-13 21:52:39 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f0e9cce228
fix: refs #7134 remove unnused method
jsegarra added 1 commit 2025-01-13 22:09:17 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
9bfc2a01c5
perf: refs #7134 sql style
jsegarra added 1 commit 2025-01-13 22:13:30 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
96649f5d8a
feat: refs #7134 remove default value
jsegarra requested review from jgallego 2025-01-13 22:13:37 +00:00
jgallego requested changes 2025-01-14 06:17:02 +00:00
Dismissed
@ -74,6 +75,7 @@ BEGIN
GROUP BY iid.id, ii.id
UNION ALL
SELECT p.bankFk,
a.bank 'bank',
Owner

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
jsegarra marked this conversation as resolved
jsegarra added 1 commit 2025-01-21 12:42:59 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
dfcfd34202
Merge branch 'dev' into 7134-supplierBalance
jsegarra added 1 commit 2025-01-21 13:53:25 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
294c2f832e
Merge branch 'dev' into 7134-supplierBalance
jsegarra requested review from jgallego 2025-01-21 13:57:15 +00:00
jgallego requested changes 2025-01-21 18:31:16 +00:00
Dismissed
@ -4046,2 +4046,4 @@
VALUES (1106,'26493101E','2019-09-20');
INSERT INTO vn.payment (received, supplierFk, amount, currencyFk, divisa, bankFk, payMethodFk, bankingFees, concept, companyFk, created, isConciliated, dueDated, workerFk) VALUES
('2024-09-15', 1, 1000.00, 1, NULL, 1, 1, 0.0, 'n/pago', 442, '2024-11-20 13:06:02.000', 1, '2024-09-15', 9);
Owner

Asegúrate porque todas nuestras fixtures están ubicadas en el año 2001, eso facilita todo.

Asegúrate porque todas nuestras fixtures están ubicadas en el año 2001, eso facilita todo.
Author
Member

He usado util.VN_CURDATE

He usado util.VN_CURDATE
jsegarra marked this conversation as resolved
jsegarra added 1 commit 2025-01-21 22:09:12 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
630d867787
fix: refs #7134 use vn_curdate
jsegarra added 1 commit 2025-01-28 07:48:17 +00:00
gitea/salix/pipeline/pr-dev Build queued... Details
9419eada64
Merge branch 'dev' into 7134-supplierBalance
jsegarra requested review from jgallego 2025-01-28 22:43:07 +00:00
jsegarra added 1 commit 2025-01-28 22:43:16 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b32c7f734f
Merge branch 'dev' into 7134-supplierBalance
jgallego requested changes 2025-01-29 06:11:59 +00:00
Dismissed
@ -4051,2 +4051,4 @@
VALUES (1106,'26493101E','2019-09-20');
INSERT INTO vn.payment (received, supplierFk, amount, currencyFk, divisa, bankFk, payMethodFk, bankingFees, concept, companyFk, created, isConciliated, dueDated, workerFk) VALUES
(util.VN_CURDATE(), 1, 1000.00, 1, NULL, 1, 1, 0.0, 'n/pago', 442, '2024-11-20 13:06:02.000', 1, util.VN_CURDATE(), 9);
Owner

2024 no, ponlo en el 2001
si el supplier tiene una entrada, pon el pago posterior para que tenga sentido

2024 no, ponlo en el 2001 si el supplier tiene una entrada, pon el pago posterior para que tenga sentido
Author
Member

GRRRR...lo tenia en stash, no me preguntes por que

GRRRR...lo tenia en stash, no me preguntes por que
jsegarra added 3 commits 2025-01-29 08:54:20 +00:00
jsegarra requested review from jgallego 2025-01-29 08:56:18 +00:00
jgallego approved these changes 2025-01-29 11:12:00 +00:00
jsegarra added 1 commit 2025-01-29 15:13:52 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
efe0aa708f
Merge branch 'dev' into 7134-supplierBalance
jsegarra scheduled this pull request to auto merge when all checks succeed 2025-01-29 15:14:03 +00:00
jsegarra merged commit 1a8e962382 into dev 2025-01-29 15:16:00 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#3173
No description provided.