From 55b5409624862ed3748c3d1d16597e76f892dad2 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 28 May 2019 16:27:28 +0200
Subject: [PATCH] SQL refactor

---
 debian/changelog              | 2 +-
 forms/ecomerce/confirm/ui.xml | 2 +-
 forms/ecomerce/orders/ui.xml  | 2 +-
 package.json                  | 2 +-
 rest/dms/invoice.sql          | 2 +-
 web/rest-service.php          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c416cac7..bcfe2a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.406.49) stable; urgency=low
+hedera-web (1.406.50) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml
index 6260a58d..75f9ae71 100644
--- a/forms/ecomerce/confirm/ui.xml
+++ b/forms/ecomerce/confirm/ui.xml
@@ -6,7 +6,7 @@
 			SELECT o.id, o.sent, o.notes, o.companyFk, 
 					ag.description agency, v.code method, 
 					ad.nickname, ad.postalCode, ad.city, ad.street, 
-					t.*, c.credit, myClientGetDebt(NULL) debt
+					t.*, c.credit, myClient_getDebt(NULL) debt
 				FROM myBasket o
 					JOIN vn.agencyMode ag ON ag.id = o.agencyModeFk 
 					LEFT JOIN myAddress ad ON ad.id = o.addressFk 
diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml
index 265678d0..cc6e3bed 100644
--- a/forms/ecomerce/orders/ui.xml
+++ b/forms/ecomerce/orders/ui.xml
@@ -26,7 +26,7 @@
 				<db-form property="form">
 					<db-model property="model">
 						<custom>
-							SELECT -myClientGetDebt(NULL) debt
+							SELECT -myClient_getDebt(NULL) debt
 						</custom>
 					</db-model>
 				</db-form>
diff --git a/package.json b/package.json
index e832795a..3bdbce90 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.406.49",
+  "version": "1.406.50",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
diff --git a/rest/dms/invoice.sql b/rest/dms/invoice.sql
index 7cf76196..cf3725b5 100644
--- a/rest/dms/invoice.sql
+++ b/rest/dms/invoice.sql
@@ -1,5 +1,5 @@
 
-SELECT CONCAT_WS('/', c.pdfsDir, invoiceGetPath(#invoice))
+SELECT CONCAT_WS('/', c.pdfsDir, vn.invoiceOut_getPath(#invoice))
 	FROM config c
 	JOIN myInvoice i
 		WHERE i.id = #invoice
diff --git a/web/rest-service.php b/web/rest-service.php
index 6aa6f241..84210a8b 100644
--- a/web/rest-service.php
+++ b/web/rest-service.php
@@ -32,7 +32,7 @@ class RestService extends Service {
 		$method->service = $this;
 
 		if ($method::SECURITY == Security::DEFINER) {
-			$isAuthorized = $db->getValue('SELECT userCheckRestPriv(#)',
+			$isAuthorized = $db->getValue('SELECT myUser_checkRestPriv(#)',
 				[$_REQUEST['method']]);
 	
 			if (!$isAuthorized)