SQL compatibility fixes with MySQL 8

This commit is contained in:
Juan Ferrer 2019-03-01 15:17:50 +01:00
parent 0a5aa8e6cd
commit 95d9c6c4d5
4 changed files with 6 additions and 6 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.406.33) stable; urgency=low hedera-web (1.406.34) stable; urgency=low
* Initial Release. * Initial Release.

View File

@ -438,11 +438,11 @@
on-status-changed-after="onCardLoad" on-status-changed-after="onCardLoad"
batch="card-batch"> batch="card-batch">
CALL bionic_from_item (#item); CALL bionic_from_item (#item);
SELECT w.id warehouseFk, w.name warehouse, p.grouping, p.price, p.rate, l.available SELECT w.id warehouseFk, w.name warehouse, p.`grouping`, p.price, p.rate, l.available
FROM tmp.bionic_lot l FROM tmp.bionic_lot l
JOIN tmp.bionic_price p ON p.warehouse_id = l.warehouse_id JOIN tmp.bionic_price p ON p.warehouse_id = l.warehouse_id
JOIN vn.warehouse w ON w.id = p.warehouse_id JOIN vn.warehouse w ON w.id = p.warehouse_id
ORDER BY warehouseFk, grouping; ORDER BY warehouseFk, `grouping`;
</db-model> </db-model>
<htk-column-text title="_Store" column="warehouse"/> <htk-column-text title="_Store" column="warehouse"/>
<htk-column-spin title="_Price" column="price" unit="€" digits="2"/> <htk-column-spin title="_Price" column="price" unit="€" digits="2"/>

View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "1.406.33", "version": "1.406.34",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {

View File

@ -132,7 +132,7 @@ BEGIN
,Costefijo ,Costefijo
,Id_Article ,Id_Article
,Nicho ,Nicho
,grouping ,`grouping`
,caja ,caja
,Packing ,Packing
,Cantidad ,Cantidad
@ -146,7 +146,7 @@ BEGIN
,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri
,IFNULL(v_item, cfg.generic_item) ,IFNULL(v_item, cfg.generic_item)
,a.Nicho ,a.Nicho
,IFNULL(c.grouping, e.pac) ,IFNULL(c.`grouping`, e.pac)
,IFNULL(c.caja, TRUE) ,IFNULL(c.caja, TRUE)
,@pac := e.pac / @t ,@pac := e.pac / @t
,@pac * e.qty ,@pac * e.qty