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

Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-07-25 07:24:46 +02:00
parent b92165cf76 1639f7155e
commit 3e0e43da2f
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/routines/vn/procedures/multipleInventory.sql
View File

@ -86,8 +86,8 @@ proc: BEGIN
WHERE calc_id = vCalcFk; WHERE calc_id = vCalcFk;
UPDATE tmp.itemInventory it UPDATE tmp.itemInventory it
JOIN tItemInventoryCalc iic ON iic.itemFk = it.id LEFT JOIN tItemInventoryCalc iic ON iic.itemFk = it.id
JOIN tItemVisibleCalc ivc ON ivc.item_id = it.id LEFT JOIN tItemVisibleCalc ivc ON ivc.item_id = it.id
SET it.inventory = iic.quantity, SET it.inventory = iic.quantity,
it.visible = ivc.visible, it.visible = ivc.visible,
it.avalaible = iic.quantity, it.avalaible = iic.quantity,

32
modules/entry/back/methods/entry/getBuys.js
View File

@ -50,6 +50,7 @@ module.exports = Self => {
'stickers', 'stickers',
'packing', 'packing',
'grouping', 'grouping',
'packing',
'groupingMode', 'groupingMode',
'quantity', 'quantity',
'packagingFk', 'packagingFk',
@ -79,7 +80,9 @@ module.exports = Self => {
fields: [ fields: [
'id', 'id',
'typeFk', 'typeFk',
'stems',
'name', 'name',
'category',
'subName', 'subName',
'size', 'size',
'minPrice', 'minPrice',
@ -95,14 +98,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']
}
} }
} ]
} }
}] }]
}; };

1
modules/ticket/back/methods/expedition/deleteExpeditions.js
View File

@ -53,7 +53,6 @@ module.exports = Self => {
const deletedExpedition = await models.Expedition.destroyById(expeditionId); const deletedExpedition = await models.Expedition.destroyById(expeditionId);
deletedExpeditions.push(deletedExpedition); deletedExpeditions.push(deletedExpedition);
} catch (e) { } catch (e) {
console.log('e: ', e);
notDeletedExpeditions.push(expeditionId); notDeletedExpeditions.push(expeditionId);
} }
} }