refactor: refs #8645 update route kmStart and kmEnd, and include supplierRef in agency-term filter
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jose Antonio Tubau 2025-02-21 09:51:26 +01:00
parent 009eae44ef
commit 5c24a5684e
2 changed files with 10 additions and 2 deletions

View File

@ -2829,11 +2829,17 @@ INSERT INTO `bs`.`defaulter` (`clientFk`, `amount`, `created`, `defaulterSinced`
(1109, 500, util.VN_CURDATE(), util.VN_CURDATE());
UPDATE `vn`.`route`
SET `invoiceInFk`=1
SET
`invoiceInFk`=1,
`kmStart`=0,
`kmEnd`=0
WHERE `id`=1;
UPDATE `vn`.`route`
SET `invoiceInFk`=2
SET
`invoiceInFk`=2,
`kmStart`=0,
`kmEnd`=0
WHERE `id`=2;
INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`)

View File

@ -95,6 +95,7 @@ module.exports = Self => {
+ sat.packagePrice * SUM(t.packages) )
AS DECIMAL(10,2)) price,
r.invoiceInFk,
i.supplierRef,
sat.supplierFk,
s.name supplierName
FROM vn.route r
@ -103,6 +104,7 @@ module.exports = Self => {
LEFT JOIN vn.ticket t ON t.routeFk = r.id
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
LEFT JOIN vn.invoiceIn i ON i.id = r.invoiceInFk
WHERE r.dated > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
GROUP BY r.id
) a`