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

7691-testToMaster #2703

Merged
alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00
Conversation 0 Commits 268 Files Changed 185 +4 -2
1 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 72ef84d6c2 - Show all commits

6
db/routines/vn/procedures/itemShelving_filterBuyer.sql
View File

@ -21,7 +21,8 @@ proc:BEGIN
sub.downstairs, sub.downstairs,
sub.visible, sub.visible,
CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) nicho, CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) nicho,
sub.name itemColour sub.name itemColour,
CAST(sub2.pendiente AS DECIMAL(10,0)) pendingAmount
FROM (SELECT iss.itemFk, FROM (SELECT iss.itemFk,
CONCAT(i.longName, ' ', IFNULL(i.size, ''),' ', IFNULL(i.subName, '') ) longName, CONCAT(i.longName, ' ', IFNULL(i.size, ''),' ', IFNULL(i.subName, '') ) longName,
'' size, '' size,
@ -58,7 +59,8 @@ proc:BEGIN
0, 0,
v.visible, v.visible,
v.visible nicho, v.visible nicho,
ik.name itemColour ik.name itemColour,
CAST(sub5.pendiente AS DECIMAL(10,0)) pendingAmount
FROM cache.visible v FROM cache.visible v
JOIN item i ON i.id = v.item_id JOIN item i ON i.id = v.item_id
LEFT JOIN ink ik ON ik.id = i.inkFk LEFT JOIN ink ik ON ik.id = i.inkFk