From aae137d35ed31154d915f05fac100ffa05097e79 Mon Sep 17 00:00:00 2001
From: Daniel Herrero <dherrero@alfatecsistemas.es>
Date: Wed, 22 Nov 2017 13:35:05 +0100
Subject: [PATCH] changed datasource in employeeList service

---
 .../client/common/methods/client/employee.js  |  8 +++----
 services/production/server/model-config.json  | 22 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/services/client/common/methods/client/employee.js b/services/client/common/methods/client/employee.js
index 8ad6dbbaad..4e6d897567 100644
--- a/services/client/common/methods/client/employee.js
+++ b/services/client/common/methods/client/employee.js
@@ -23,10 +23,10 @@ module.exports = function(Client) {
 
     Client.employeeList = function(callback) {
         let query = `SELECT  em.id, CASE em.surname WHEN NULL THEN em.name ELSE concat(em.name, " ", em.surname) END \`name\` 
-                     FROM Employee em 
-                     JOIN Account ac ON em.userFk = ac.id
-                     JOIN RoleMapping rm on ac.id=rm.principalId
-                     JOIN Role rl on rm.roleId = rl.id
+                     FROM salix.Employee em 
+                     JOIN salix.Account ac ON em.userFk = ac.id
+                     JOIN salix.RoleMapping rm on ac.id=rm.principalId
+                     JOIN salix.Role rl on rm.roleId = rl.id
                      WHERE ac.active 
                      and rl.\`name\`='employee'
                      ORDER BY em.name ASC`;
diff --git a/services/production/server/model-config.json b/services/production/server/model-config.json
index 3b60b6f130..d4d72f77d9 100644
--- a/services/production/server/model-config.json
+++ b/services/production/server/model-config.json
@@ -25,40 +25,40 @@
     "dataSource": "salix"
   },
   "Ticket": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "State":{
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "TicketState":{
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Warehouse":{
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Employee":{
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Client":{
     "dataSource": "client"
   },
   "Province":{
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Agency": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "FakeProduction": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Message": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "MessageInbox": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   },
   "Route": {
-    "dataSource": "vn"
+    "dataSource": "salix"
   }
 
 }