diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json
index 6cdc40eb9d..3333331de7 100644
--- a/client/src/i18n/en/form.json
+++ b/client/src/i18n/en/form.json
@@ -388,6 +388,7 @@
"CONVERSION_RATE": "Conversion rate",
"CONVERTION_RATE" : "Conversion rate",
"COST_CENTER": "Cost Center",
+ "COST_CENTER_OPTIONAL": "Cost Center (optional)",
"COST": "Cost",
"COUNTRY": "Country",
"CREATE": "Create",
@@ -494,6 +495,7 @@
"FORM": "Form",
"FROM_ACCOUNT": "From Account",
"FROM": "From",
+ "FUNCTION": "Function",
"FUNCTION_BONUS":"Function bonus",
"GAIN_ACCOUNT": "Gain on Exchange Rate Account",
"GENDER": "Gender",
diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json
index 0eb790e489..a9d7746af6 100644
--- a/client/src/i18n/fr/form.json
+++ b/client/src/i18n/fr/form.json
@@ -391,6 +391,7 @@
"CONVERSION_RATE": "Taux de conversion",
"CONVERTION_RATE" : "Taux de conversion",
"COST_CENTER": "Centre de coûts",
+ "COST_CENTER_OPTIONAL": "Centre de coûts (optionnel)",
"COST": "Coût",
"COUNTRY": "Pays",
"CREATE": "CRÉATION",
diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json
index d1eb4d9281..d823318ee0 100644
--- a/client/src/i18n/fr/tree.json
+++ b/client/src/i18n/fr/tree.json
@@ -79,6 +79,7 @@
"FISCAL_YEAR":"Année Fiscale",
"FORMS_CONFIGURATION": "Configuration des formulaires",
"FORMS_MANAGEMENT": "Gestion des formulaires",
+ "FUNCTION": "Fonction",
"FUNCTION_BONUS_MANAGEMENT":"Gestion des primes sur la responsabilté",
"GENERAL_LEDGER":"Grand Livre",
"GRADES" : "Gestion des Grades",
diff --git a/client/src/js/components/bhCostCenterSelect/bhCostCenterSelect.js b/client/src/js/components/bhCostCenterSelect/bhCostCenterSelect.js
index c10fd24927..af3a8969b2 100644
--- a/client/src/js/components/bhCostCenterSelect/bhCostCenterSelect.js
+++ b/client/src/js/components/bhCostCenterSelect/bhCostCenterSelect.js
@@ -47,7 +47,7 @@ function CostCenterSelectController(CostCenters, Notify, $translate) {
$ctrl.$onInit = () => {
$ctrl.required = !!($ctrl.required);
- $ctrl.label = $ctrl.label || 'COST_CENTER.TITLE';
+ $ctrl.label = $ctrl.label || $ctrl.required ? 'FORM.LABELS.COST_CENTER' : 'FORM.LABELS.COST_CENTER_OPTIONAL';
$ctrl.costCenterId = $ctrl.costCenterId ? +$ctrl.costCenterId : null;
loadCostCenters();
};
diff --git a/client/src/modules/employees/employee.service.js b/client/src/modules/employees/employee.service.js
index 031abeef8c..73d4c0bf01 100644
--- a/client/src/modules/employees/employee.service.js
+++ b/client/src/modules/employees/employee.service.js
@@ -49,6 +49,7 @@ function EmployeeService(Filters, $uibModal, Api, AppCache, Languages, $httpPara
{ key : 'reference', label : 'FORM.LABELS.REFERENCE' },
{ key : 'fonction_id', label : 'FORM.LABELS.PROFESSION' },
{ key : 'service_uuid', label : 'FORM.LABELS.SERVICE' },
+ { key : 'cost_center_id', label : 'FORM.LABELS.COST_CENTER' },
{ key : 'is_medical', label : 'FORM.LABELS.MEDICAL_STAFF', valueFilter : 'boolean' },
]);
diff --git a/client/src/modules/employees/registry/registry.js b/client/src/modules/employees/registry/registry.js
index 0430d23074..a0fa078eae 100644
--- a/client/src/modules/employees/registry/registry.js
+++ b/client/src/modules/employees/registry/registry.js
@@ -67,7 +67,16 @@ function EmployeeRegistryController(
field : 'service_name',
displayName : 'TABLE.COLUMNS.SERVICE',
headerCellFilter : 'translate',
+ sort : { direction : uiGridConstants.ASC, priority : 2 },
+ visible : false,
+ cellClass : muteDisabledCells,
+ },
+ {
+ field : 'cost_center',
+ displayName : 'TABLE.COLUMNS.COST_CENTER',
+ headerCellFilter : 'translate',
sort : { direction : uiGridConstants.ASC, priority : 1 },
+ visible : false,
cellClass : muteDisabledCells,
},
{
@@ -171,13 +180,6 @@ function EmployeeRegistryController(
visible : false,
cellClass : muteDisabledCells,
},
- {
- field : 'service_name',
- displayName : 'FORM.LABELS.SERVICE',
- headerCellFilter : 'translate',
- visible : false,
- cellClass : muteDisabledCells,
- },
{
name : 'actions',
displayName : '',
diff --git a/client/src/modules/employees/registry/search.modal.html b/client/src/modules/employees/registry/search.modal.html
index 82a1480025..4b46ae5e77 100644
--- a/client/src/modules/employees/registry/search.modal.html
+++ b/client/src/modules/employees/registry/search.modal.html
@@ -87,6 +87,13 @@