7837-testToMaster_2432 #2834

Merged
alexm merged 161 commits from 7837-testToMaster_2432 into master 2024-08-06 05:52:05 +00:00
1 changed files with 26 additions and 6 deletions
Showing only changes of commit 3e14d2fd48 - Show all commits

View File

@ -51,6 +51,7 @@ module.exports = Self => {
'stickers', 'stickers',
'packing', 'packing',
'grouping', 'grouping',
'packing',
'groupingMode', 'groupingMode',
'quantity', 'quantity',
'packagingFk', 'packagingFk',
@ -80,7 +81,9 @@ module.exports = Self => {
fields: [ fields: [
'id', 'id',
'typeFk', 'typeFk',
'stems',
'name', 'name',
'category',
'subName', 'subName',
'size', 'size',
'minPrice', 'minPrice',
@ -96,14 +99,31 @@ module.exports = Self => {
'value9', 'value9',
'tag10', 'tag10',
'value10', 'value10',
'groupingMode' 'groupingMode',
'inkFk',
'originFk',
'producerFk'
], ],
include: { include: [
{
relation: 'itemType', relation: 'itemType',
scope: { scope: {
fields: ['code', 'description'] fields: ['code', 'description']
} }
},
{
relation: 'origin',
scope: {
fields: ['code']
} }
},
{
relation: 'producer',
scope: {
fields: ['name']
}
}
]
} }
}] }]
}; };