Merge pull request 'refactor: refs #8645 update route kmStart and kmEnd, and include supplierRef in agency-term filter' (!3480) from 8645-addSupplierRefToAgencyTermFilter into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3480 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
commit
2f4adab3e6
|
@ -2833,11 +2833,17 @@ INSERT INTO `bs`.`defaulter` (`clientFk`, `amount`, `created`, `defaulterSinced`
|
||||||
(1109, 500, util.VN_CURDATE(), util.VN_CURDATE());
|
(1109, 500, util.VN_CURDATE(), util.VN_CURDATE());
|
||||||
|
|
||||||
UPDATE `vn`.`route`
|
UPDATE `vn`.`route`
|
||||||
SET `invoiceInFk`=1
|
SET
|
||||||
|
`invoiceInFk` = 1,
|
||||||
|
`kmStart` = 0,
|
||||||
|
`kmEnd` = 0
|
||||||
WHERE `id` = 1;
|
WHERE `id` = 1;
|
||||||
|
|
||||||
UPDATE `vn`.`route`
|
UPDATE `vn`.`route`
|
||||||
SET `invoiceInFk`=2
|
SET
|
||||||
|
`invoiceInFk` = 2,
|
||||||
|
`kmStart` = 0,
|
||||||
|
`kmEnd` = 0
|
||||||
WHERE `id` = 2;
|
WHERE `id` = 2;
|
||||||
|
|
||||||
INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`)
|
INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`)
|
||||||
|
|
|
@ -95,6 +95,7 @@ module.exports = Self => {
|
||||||
+ sat.packagePrice * SUM(t.packages) )
|
+ sat.packagePrice * SUM(t.packages) )
|
||||||
AS DECIMAL(10,2)) price,
|
AS DECIMAL(10,2)) price,
|
||||||
r.invoiceInFk,
|
r.invoiceInFk,
|
||||||
|
i.supplierRef,
|
||||||
sat.supplierFk,
|
sat.supplierFk,
|
||||||
s.name supplierName
|
s.name supplierName
|
||||||
FROM vn.route r
|
FROM vn.route r
|
||||||
|
@ -103,6 +104,7 @@ module.exports = Self => {
|
||||||
LEFT JOIN vn.ticket t ON t.routeFk = r.id
|
LEFT JOIN vn.ticket t ON t.routeFk = r.id
|
||||||
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
|
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
|
||||||
LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
|
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
|
WHERE r.dated > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
|
||||||
GROUP BY r.id
|
GROUP BY r.id
|
||||||
) a`
|
) a`
|
||||||
|
|
Loading…
Reference in New Issue