Merge pull request '6275_getExpeditionSummary' (!2381) from 6275_getExpeditionSummary into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2381 Reviewed-by: Pako Natek <pako@verdnatura.es>
This commit is contained in:
commit
e1fe1cef7f
|
@ -49,8 +49,7 @@ module.exports = Self => {
|
||||||
JOIN vn.agencyMode am ON am.id = r.agencyModeFk
|
JOIN vn.agencyMode am ON am.id = r.agencyModeFk
|
||||||
JOIN vn.agency ag ON ag.id = am.agencyFk
|
JOIN vn.agency ag ON ag.id = am.agencyFk
|
||||||
LEFT JOIN vn.userConfig uc ON uc.userFk = account.myUser_getId()
|
LEFT JOIN vn.userConfig uc ON uc.userFk = account.myUser_getId()
|
||||||
WHERE (r.created = util.VN_CURDATE() OR r.created = util.yesterday())
|
WHERE t.routeFk = ?
|
||||||
AND t.routeFk = ?
|
|
||||||
GROUP BY t.addressFk, e.itemPackingTypeFk
|
GROUP BY t.addressFk, e.itemPackingTypeFk
|
||||||
) sub
|
) sub
|
||||||
GROUP BY addressFk
|
GROUP BY addressFk
|
||||||
|
|
Loading…
Reference in New Issue