From 95d9c6c4d500097f499a141fdce7489207612657 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 1 Mar 2019 15:17:50 +0100 Subject: [PATCH] SQL compatibility fixes with MySQL 8 --- debian/changelog | 2 +- forms/ecomerce/catalog/ui.xml | 4 ++-- package.json | 2 +- rest/edi/dml/edi_load.sql | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 318742ff..0ecabb61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.406.33) stable; urgency=low +hedera-web (1.406.34) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index fd2d1246..1a615264 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -438,11 +438,11 @@ on-status-changed-after="onCardLoad" batch="card-batch"> 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 JOIN tmp.bionic_price p ON p.warehouse_id = l.warehouse_id JOIN vn.warehouse w ON w.id = p.warehouse_id - ORDER BY warehouseFk, grouping; + ORDER BY warehouseFk, `grouping`; diff --git a/package.json b/package.json index 1271fb75..6fe4b324 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.406.33", + "version": "1.406.34", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/edi/dml/edi_load.sql b/rest/edi/dml/edi_load.sql index 6dea81e2..9496c256 100644 --- a/rest/edi/dml/edi_load.sql +++ b/rest/edi/dml/edi_load.sql @@ -132,7 +132,7 @@ BEGIN ,Costefijo ,Id_Article ,Nicho - ,grouping + ,`grouping` ,caja ,Packing ,Cantidad @@ -146,7 +146,7 @@ BEGIN ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri ,IFNULL(v_item, cfg.generic_item) ,a.Nicho - ,IFNULL(c.grouping, e.pac) + ,IFNULL(c.`grouping`, e.pac) ,IFNULL(c.caja, TRUE) ,@pac := e.pac / @t ,@pac * e.qty