-
+
+ {{ EmployeeCtrl.enterprise.currencySymbol || '...' }}
+
+
diff --git a/client/src/modules/employees/registration/employees.js b/client/src/modules/employees/registration/employees.js
index 6237132bfe..b4c9dae7da 100644
--- a/client/src/modules/employees/registration/employees.js
+++ b/client/src/modules/employees/registration/employees.js
@@ -5,11 +5,12 @@ angular.module('bhima.controllers')
EmployeeController.$inject = [
'EmployeeService', 'ServiceService', 'GradeService', 'FunctionService',
'CreditorGroupService', 'DebtorGroupService', 'util', 'NotifyService',
- 'bhConstants', 'ReceiptModal'
+ 'bhConstants', 'ReceiptModal', 'SessionService'
];
-function EmployeeController(Employees, Services, Grades, Functions, CreditorGroups, DebtorGroups, util, Notify, bhConstants, Receipts) {
+function EmployeeController(Employees, Services, Grades, Functions, CreditorGroups, DebtorGroups, util, Notify, bhConstants, Receipts, Session) {
var vm = this;
+ vm.enterprise = Session.enterprise;
// Expose lenths from util
vm.length20 = util.length20;
@@ -27,7 +28,7 @@ function EmployeeController(Employees, Services, Grades, Functions, CreditorGrou
vm.submit = submit;
// Loading Grades
- Grades.read(null, { detailed : 1 }).then((data) => {
+ Grades.read(null, { detailed : 1 }).then(function (data) {
data.forEach(function (g){
g.format = g.code + ' - ' + g.text;
});
diff --git a/client/src/modules/employees/registry/registry.js b/client/src/modules/employees/registry/registry.js
index 3ba62ae392..b9c8462221 100644
--- a/client/src/modules/employees/registry/registry.js
+++ b/client/src/modules/employees/registry/registry.js
@@ -2,8 +2,8 @@ angular.module('bhima.controllers')
.controller('EmployeeRegistryController', EmployeeRegistryController);
EmployeeRegistryController.$inject = [
- '$state', 'EmployeeService', 'NotifyService', 'AppCache',
- 'util', 'ReceiptModal', 'uiGridConstants', '$translate',
+ 'EmployeeService', 'NotifyService',
+ 'util', 'ReceiptModal', 'uiGridConstants',
'GridColumnService', 'bhConstants', 'FilterService'
];
@@ -12,8 +12,8 @@ EmployeeRegistryController.$inject = [
*
* This module is responsible for the management of Employe Registry.
*/
-function EmployeeRegistryController($state, Employees, Notify, AppCache,
- util, Receipts, uiGridConstants, $translate,
+function EmployeeRegistryController(Employees, Notify,
+ util, Receipts, uiGridConstants,
Columns, bhConstants, Filters) {
var vm = this;
diff --git a/client/src/modules/employees/registry/search.modal.js b/client/src/modules/employees/registry/search.modal.js
index d3d16437ec..c27129cdd9 100644
--- a/client/src/modules/employees/registry/search.modal.js
+++ b/client/src/modules/employees/registry/search.modal.js
@@ -18,7 +18,7 @@ function EmployeeRegistryModalController(ModalInstance, Functions, Grades, bhCon
var changes = new Store({identifier : 'key'});
vm.filters = filters;
- vm.serchQueries = {};
+ vm.searchQueries = {};
vm.defaultQueries = {};
vm.today = new Date();
diff --git a/client/src/modules/templates/bhCurrencyInput.tmpl.html b/client/src/modules/templates/bhCurrencyInput.tmpl.html
index ac245e351b..f00c350e2e 100644
--- a/client/src/modules/templates/bhCurrencyInput.tmpl.html
+++ b/client/src/modules/templates/bhCurrencyInput.tmpl.html
@@ -15,7 +15,6 @@
required>
-
diff --git a/server/controllers/payroll/employees/index.js b/server/controllers/payroll/employees/index.js
index f47bf73e75..7ba72d7f83 100644
--- a/server/controllers/payroll/employees/index.js
+++ b/server/controllers/payroll/employees/index.js
@@ -42,7 +42,7 @@ function list(req, res, next) {
.then((rows) => {
res.status(200).json(rows);
})
- .catch(function (err){console.log(err);})
+ .catch(next)
.done();
}