From 95f819c22f36a20d49e642792ed9fe2ae025240f Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 1 Feb 2024 09:46:16 +0100 Subject: [PATCH 1/2] refactor: refs #6780 Deleted references to warehouse vn2008 --- forms/reports/items-form/ui.xml | 86 ++++++------- forms/reports/shelves/ui.xml | 212 ++++++++++++++++---------------- 2 files changed, 151 insertions(+), 147 deletions(-) diff --git a/forms/reports/items-form/ui.xml b/forms/reports/items-form/ui.xml index 8b6462db..8e857561 100644 --- a/forms/reports/items-form/ui.xml +++ b/forms/reports/items-form/ui.xml @@ -1,42 +1,44 @@ - - -
-

Item list

-
-
- -
-
-
-
- - - - SELECT id, name FROM vn2008.warehouse - WHERE reserve ORDER BY name - - -
-
- - - - SELECT id, reino FROM vn2008.reinos - WHERE display != FALSE ORDER BY reino - - -
-
- - -
-
-
- + + +
+

Item list

+
+
+ +
+
+
+
+ + + + SELECT id, name + FROM vn.warehouse + WHERE hasAvailable + ORDER BY name + + +
+
+ + + + SELECT id, reino FROM vn2008.reinos + WHERE display != FALSE ORDER BY reino + + +
+
+ + +
+
+
+ diff --git a/forms/reports/shelves/ui.xml b/forms/reports/shelves/ui.xml index 376a1bff..ca3c8fc7 100644 --- a/forms/reports/shelves/ui.xml +++ b/forms/reports/shelves/ui.xml @@ -1,105 +1,107 @@ - - - - - -
-

Shelves

-
-
- -
-
-
-
- - - - SELECT c.id, c.name reportTitle, c.namePrefix, c.warehouse, c.family, - c.shelf, c.maxAmount, c.showPacking, c.stack, t.reino_id realm - FROM shelfConfig c - JOIN vn2008.Tipos t ON t.tipo_id = c.family - - -
-
- - -
-
- - - - SELECT id, reino FROM vn2008.reinos - WHERE display != FALSE ORDER BY reino - - -
-
- - - - SELECT tipo_id, Tipo FROM vn2008.Tipos - WHERE reino_id = #realm ORDER BY Tipo - - -
-
- - - - SELECT id, name FROM vn2008.warehouse - WHERE reserve ORDER BY name - - -
-
- - - - SELECT id, name FROM shelf - - -
-
- - -
-
- - -
-
- - -
-
- -
-
- -
-
- -
-
-
- + + + + + +
+

Shelves

+
+
+ +
+
+
+
+ + + + SELECT c.id, c.name reportTitle, c.namePrefix, c.warehouse, c.family, + c.shelf, c.maxAmount, c.showPacking, c.stack, t.reino_id realm + FROM shelfConfig c + JOIN vn2008.Tipos t ON t.tipo_id = c.family + + +
+
+ + +
+
+ + + + SELECT id, reino FROM vn2008.reinos + WHERE display != FALSE ORDER BY reino + + +
+
+ + + + SELECT tipo_id, Tipo FROM vn2008.Tipos + WHERE reino_id = #realm ORDER BY Tipo + + +
+
+ + + + SELECT id, name + FROM vn.warehouse + WHERE hasAvailable + ORDER BY name + + +
+
+ + + + SELECT id, name FROM shelf + + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+
+ -- 2.40.1 From 7f1d8ebb8e8f355230e17fe4888b7a452e6db00f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 15 Feb 2024 13:34:20 +0100 Subject: [PATCH 2/2] version updated --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47040092..26efb32e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hedera-web", - "version": "23.6.12", + "version": "24.8.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hedera-web", - "version": "23.6.12", + "version": "24.8.0", "license": "GPL-3.0", "dependencies": { "js-yaml": "^3.12.1", diff --git a/package.json b/package.json index ef46e548..646fdfc1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "23.40.6", + "version": "24.8.0", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { -- 2.40.1