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 9 additions and 8 deletions
Showing only changes of commit fcaf854c87 - Show all commits

View File

@ -178,17 +178,18 @@ module.exports = Self => {
i.isFloramondo,
i.recycledPlastic,
i.nonRecycledPlastic,
pr.name AS producer,
it.name AS typeName,
it.workerFk AS buyerFk,
u.name AS userName,
ori.code AS origin,
ic.name AS category,
pr.name producer,
it.name typeName,
it.workerFk buyerFk,
u.name userName,
ori.code origin,
ic.name category,
i.intrastatFk,
intr.description AS intrastat,
intr.description intrastat,
b.grouping,
b.packing,
lb.landing AS landed
lb.landing landed,
it.name typeName
FROM item i
LEFT JOIN itemType it ON it.id = i.typeFk
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk