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

8355-testToMaster #3336

Merged
alexm merged 241 commits from 8355-testToMaster into master 2025-01-07 06:44:57 +00:00
Conversation 0 Commits 241 Files Changed 87 +9 -8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fcaf854c87 - Show all commits

17
modules/item/back/methods/item/filter.js
View File

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