7806_devToTest_2332 #2801

Merged
alexm merged 126 commits from 7806_devToTest_2330 into test 2024-07-30 06:14:09 +00:00
1 changed files with 28 additions and 7 deletions
Showing only changes of commit ddd6c799dc - 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',
@ -59,7 +60,8 @@ module.exports = Self => {
'price2', 'price2',
'price3', 'price3',
'printedStickers', 'printedStickers',
'entryFk' 'entryFk',
], ],
include: [{ include: [{
relation: 'entry', relation: 'entry',
@ -80,7 +82,9 @@ module.exports = Self => {
fields: [ fields: [
'id', 'id',
'typeFk', 'typeFk',
'stems',
'name', 'name',
'category',
'subName', 'subName',
'size', 'size',
'minPrice', 'minPrice',
@ -96,14 +100,31 @@ module.exports = Self => {
'value9', 'value9',
'tag10', 'tag10',
'value10', 'value10',
'groupingMode' 'groupingMode',
'inkFk',
'originFk',
'producerFk'
], ],
include: { include: [
relation: 'itemType', {
scope: { relation: 'itemType',
fields: ['code', 'description'] scope: {
fields: ['code', 'description']
}
},
{
relation: 'origin',
scope: {
fields: ['code']
}
},
{
relation: 'producer',
scope: {
fields: ['name']
}
} }
} ]
} }
}] }]
}; };