Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
62596de1dd
|
@ -147,7 +147,7 @@ proc:BEGIN
|
||||||
(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
|
(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
|
||||||
IFNULL(vItem, vDefaultEntry) itemFk,
|
IFNULL(vItem, vDefaultEntry) itemFk,
|
||||||
e.qty stickers,
|
e.qty stickers,
|
||||||
@pac := GREATEST(1, i.stemMultiplier * e.pac / @t) packing,
|
@pac := GREATEST(1, IFNULL(i.stemMultiplier * e.pac / @t, 0)) packing,
|
||||||
IFNULL(b.`grouping`, e.pac),
|
IFNULL(b.`grouping`, e.pac),
|
||||||
@pac * e.qty,
|
@pac * e.qty,
|
||||||
vForceToPacking,
|
vForceToPacking,
|
||||||
|
|
Loading…
Reference in New Issue