8355-testToMaster #3336

Merged
alexm merged 241 commits from 8355-testToMaster into master 2025-01-07 06:44:57 +00:00
1 changed files with 2 additions and 0 deletions
Showing only changes of commit bca22e8ad3 - Show all commits

View File

@ -194,6 +194,7 @@ module.exports = Self => {
u.name userName,
c.salesPersonFk,
c.credit,
pm.name payMethod,
z.hour zoneLanding,
z.name zoneName,
z.id zoneFk,
@ -211,6 +212,7 @@ module.exports = Self => {
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
LEFT JOIN state st ON st.id = ts.stateFk
LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN account.user u ON u.id = wk.id
LEFT JOIN (