verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

Merge branch 'master' into Hotfix-PriceDifferenceShipped
gitea/salix/pipeline/pr-master This commit looks good Details

This commit is contained in:
Jon Elias 2025-01-28 06:27:00 +00:00
parent 1890e5d541 cd8e04d648
commit 30d3e7df68
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/routines/vn/procedures/ticket_doCmr.sql
View File

@ -21,9 +21,6 @@ BEGIN
IFNULL(sat.supplierFk, su.id) supplierFk,
t.landed
FROM ticket t
JOIN ticketState ts ON ts.ticketFk = t.id
JOIN `state` s ON s.id = ts.stateFk
JOIN alertLevel al ON al.id = s.alertLevel
JOIN client c ON c.id = t.clientFk
JOIN `address` a ON a.id = t.addressFk
JOIN province p ON p.id = a.provinceFk
@ -40,8 +37,7 @@ BEGIN
LEFT JOIN agency ag ON ag.id = am.agencyFk
LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
AND wo.isFreelance
WHERE al.code IN ('PACKED', 'DELIVERED')
AND co.code <> 'ES'
WHERE co.code <> 'ES'
AND am.name <> 'ABONO'
AND w.code = 'ALG'
AND t.id = vSelf