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

7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
Conversation 0 Commits 643 Files Changed 208 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b86110c898 - Show all commits

2
back/methods/collection/getSales.js
View File

@ -46,7 +46,7 @@ module.exports = Self => {
const [sales] = await Self.rawSql('CALL vn.sale_getFromTicketOrCollection(?)',
[id], myOptions);
const isPicker = source == 'CHECKER';
const isPicker = source != 'CHECKER';
const [placements] = await Self.rawSql('CALL vn.collectionPlacement_get(?, ?)',
[id, isPicker], myOptions
);

4
modules/item/back/methods/item-shelving/getAlternative.js
View File

@ -52,7 +52,9 @@ module.exports = Self => {
return {
id: itemShelving.id,
itemFk: itemShelving.itemFk,
longName: item ? item.longName || `${item.name} ${item.size}` : '',
name: item.name,
size: item.size,
longName: item.longName,
quantity: itemShelving.visible,
carros
};