Merge pull request 'fix: shipment' (!3536) from Hotfix-available-for-item_getLack into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
This commit is contained in:
commit
6706e47481
|
@ -130,7 +130,7 @@ BEGIN
|
||||||
)
|
)
|
||||||
SELECT 'ticket',
|
SELECT 'ticket',
|
||||||
s.ticketFk,
|
s.ticketFk,
|
||||||
util.dayEnd(s.shipped),
|
s.shipped,
|
||||||
NULL `in`,
|
NULL `in`,
|
||||||
s.quantity,
|
s.quantity,
|
||||||
s.alertLevel,
|
s.alertLevel,
|
||||||
|
@ -155,7 +155,7 @@ BEGIN
|
||||||
orders AS (
|
orders AS (
|
||||||
SELECT 'order' originType,
|
SELECT 'order' originType,
|
||||||
o.id originId,
|
o.id originId,
|
||||||
r.shipment,
|
util.dayEnd(r.shipment),
|
||||||
NULL 'in',
|
NULL 'in',
|
||||||
r.amount,
|
r.amount,
|
||||||
NULL alertLevel,
|
NULL alertLevel,
|
||||||
|
|
Loading…
Reference in New Issue