From cd1a9d8cd47a26697e673d614333520e808dda2e Mon Sep 17 00:00:00 2001 From: Jonathan Niles Date: Sat, 28 Dec 2024 21:05:40 -0600 Subject: [PATCH] chore(HR): correct HR spelling in dictionary. Corrects the spelling of "Human Resources" throughout the application. --- client/src/i18n/en/tree.json | 2 +- client/src/i18n/fr/tree.json | 2 +- .../employees/registration/employees.html | 2 +- .../modules/employees/registry/registry.html | 2 +- client/src/modules/functions/functions.html | 2 +- .../functions/modals/function.modal.html | 2 +- client/src/modules/grades/grades.html | 2 +- .../src/modules/grades/modals/grade.modal.html | 2 +- client/src/modules/holidays/holidays.html | 2 +- .../modules/holidays/modals/holiday.modal.html | 2 +- .../ipr_tax/configuration/iprTaxConfig.html | 2 +- client/src/modules/ipr_tax/ipr_tax.html | 2 +- .../multiple_payroll/modals/config.modal.html | 2 +- .../multiple_payroll/modals/search.modal.html | 2 +- .../modals/waitingListConfirmation.html | 2 +- .../multiple_payroll/multiple_payroll.html | 2 +- .../modals/config.modal.html | 2 +- .../modals/import.modal.html | 2 +- .../modals/parameter.modal.html | 2 +- .../modals/search.modal.html | 2 +- .../multiple_payroll_indice.html | 2 +- client/src/modules/offdays/offdays.html | 2 +- .../account_configuration/configuration.html | 2 +- .../modals/account.modal.html | 2 +- .../employee_configuration/configuration.html | 2 +- .../modals/employee.modal.html | 2 +- .../modules/payroll/modals/payroll.modal.html | 2 +- client/src/modules/payroll/payroll.html | 2 +- .../rubric_configuration/configuration.html | 2 +- .../rubric_configuration/configuration.js | 17 +++++++---------- .../modals/config.modal.html | 2 +- .../modals/rubric.modal.html | 2 +- .../payroll/rubrics/modals/rubric.modal.html | 2 +- client/src/modules/payroll/rubrics/rubrics.html | 2 +- .../src/modules/payroll/settings/settings.html | 2 +- .../staffing_indice/modal/createUpdate.html | 2 +- .../modal/funcitonIndiceModal.html | 2 +- .../staffing_indice/modal/gradeIndiceModal.html | 2 +- .../staffing_indice/modal/search.modal.html | 2 +- .../payroll/staffing_indice/staffingIndice.html | 2 +- .../weekend_configuration/configuration.html | 2 +- .../modals/weekEnd.modal.html | 2 +- client/src/modules/titles/titles.html | 2 +- server/models/06-bhima.sql | 2 +- server/models/migrations/next/migrate.sql | 7 +++++++ 45 files changed, 57 insertions(+), 53 deletions(-) diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index dc2428a911..51efa3aac6 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -86,7 +86,7 @@ "GRADES" : "Grade Management", "HOLIDAYS_MANAGEMENT" : "Holidays Management", "HOSPITAL" : "Hospital", - "HUMANS_RESSOURCES" : "Human Resources", + "HUMAN_RESOURCES" : "Human Resources", "IMPORT_STOCK_FROM_FILE":"Stock Import", "INDEXES" : "Indexes", "INDICATORS" : "Indicators", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index 952fbc012e..b5085be735 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -86,7 +86,7 @@ "GRADE_EMPLOYERS":"Gestion Grades", "HOLIDAYS_MANAGEMENT" : "Gestion des Vacances", "HOSPITAL":"Hôpital", - "HUMANS_RESSOURCES":"Ressources humaines", + "HUMAN_RESOURCES":"Ressources humaines", "IMPORT_STOCK_FROM_FILE":"Importation de stock", "INDEXES" : "Indices", "INDICATORS" : "Indicateurs", diff --git a/client/src/modules/employees/registration/employees.html b/client/src/modules/employees/registration/employees.html index 6ddde5b234..dc54b64bd5 100644 --- a/client/src/modules/employees/registration/employees.html +++ b/client/src/modules/employees/registration/employees.html @@ -1,7 +1,7 @@
    -
  1. TREE.HUMANS_RESSOURCES
    2. +
  2. TREE.HUMAN_RESOURCES
  3. EMPLOYEE.TITLE
  4. {{ EmployeeCtrl.employee.name }}
diff --git a/client/src/modules/employees/registry/registry.html b/client/src/modules/employees/registry/registry.html index 96fb59d994..3d83e18d75 100644 --- a/client/src/modules/employees/registry/registry.html +++ b/client/src/modules/employees/registry/registry.html @@ -1,7 +1,7 @@
    -
  1. TREE.HUMANS_RESSOURCES
    2. +
  2. TREE.HUMAN_RESOURCES
  3. EMPLOYEE_REGISTRY.TITLE
diff --git a/client/src/modules/functions/functions.html b/client/src/modules/functions/functions.html index b9362a628a..c74d66b6b5 100644 --- a/client/src/modules/functions/functions.html +++ b/client/src/modules/functions/functions.html @@ -1,7 +1,7 @@
    -
  1. TREE.HUMANS_RESSOURCES
    2. +
  2. TREE.HUMAN_RESOURCES
  3. TREE.PROFESSION
diff --git a/client/src/modules/functions/modals/function.modal.html b/client/src/modules/functions/modals/function.modal.html index 8b2fd02239..db6ddefae5 100644 --- a/client/src/modules/functions/modals/function.modal.html +++ b/client/src/modules/functions/modals/function.modal.html @@ -2,7 +2,7 @@
    -
  1. TREE.HUMANS_RESSOURCES
    2. +
  2. TREE.HUMAN_RESOURCES
  3. TREE.PROFESSION
  4. FORM.INFO.ADD_FUNCTION diff --git a/client/src/modules/grades/grades.html b/client/src/modules/grades/grades.html index a8356070ff..653dde844d 100644 --- a/client/src/modules/grades/grades.html +++ b/client/src/modules/grades/grades.html @@ -1,7 +1,7 @@
      -
    1. TREE.HUMANS_RESSOURCES
      2. +
    2. TREE.HUMAN_RESOURCES
    3. GRADE.TITLE
    diff --git a/client/src/modules/grades/modals/grade.modal.html b/client/src/modules/grades/modals/grade.modal.html index 6cfe294e44..fffc5f4e94 100644 --- a/client/src/modules/grades/modals/grade.modal.html +++ b/client/src/modules/grades/modals/grade.modal.html @@ -1,7 +1,7 @@
      -
    1. TREE.HUMANS_RESSOURCES
      2. +
    2. TREE.HUMAN_RESOURCES
    3. GRADE.TITLE
    4. GRADE.ADD_GRADE diff --git a/client/src/modules/holidays/holidays.html b/client/src/modules/holidays/holidays.html index b92f5539a9..b636b2dd0a 100644 --- a/client/src/modules/holidays/holidays.html +++ b/client/src/modules/holidays/holidays.html @@ -1,7 +1,7 @@
        -
      1. TREE.HUMANS_RESSOURCES
        2. +
      2. TREE.HUMAN_RESOURCES
      3. HOLIDAY.TITLE
      diff --git a/client/src/modules/holidays/modals/holiday.modal.html b/client/src/modules/holidays/modals/holiday.modal.html index f9ceffa2a1..1ab8661c0a 100644 --- a/client/src/modules/holidays/modals/holiday.modal.html +++ b/client/src/modules/holidays/modals/holiday.modal.html @@ -1,7 +1,7 @@
        -
      1. TREE.HUMANS_RESSOURCES
        2. +
      2. TREE.HUMAN_RESOURCES
      3. HOLIDAY.TITLE
      4. HOLIDAY.ADD_HOLIDAY diff --git a/client/src/modules/ipr_tax/configuration/iprTaxConfig.html b/client/src/modules/ipr_tax/configuration/iprTaxConfig.html index 8f6eddd26b..a55a7a5522 100644 --- a/client/src/modules/ipr_tax/configuration/iprTaxConfig.html +++ b/client/src/modules/ipr_tax/configuration/iprTaxConfig.html @@ -1,7 +1,7 @@
          -
        1. TREE.HUMANS_RESSOURCES
          2. +
        2. TREE.HUMAN_RESOURCES
        3. IPRTAX.CONFIG
        diff --git a/client/src/modules/ipr_tax/ipr_tax.html b/client/src/modules/ipr_tax/ipr_tax.html index e3782df486..e599abab0d 100644 --- a/client/src/modules/ipr_tax/ipr_tax.html +++ b/client/src/modules/ipr_tax/ipr_tax.html @@ -1,7 +1,7 @@
          -
        1. TREE.HUMANS_RESSOURCES
          2. +
        2. TREE.HUMAN_RESOURCES
        3. IPRTAX.TITLE
        diff --git a/client/src/modules/multiple_payroll/modals/config.modal.html b/client/src/modules/multiple_payroll/modals/config.modal.html index 6b2e7c414a..e1b7125666 100644 --- a/client/src/modules/multiple_payroll/modals/config.modal.html +++ b/client/src/modules/multiple_payroll/modals/config.modal.html @@ -1,7 +1,7 @@
          -
        1. TREE.HUMANS_RESSOURCES
          2. +
        2. TREE.HUMAN_RESOURCES
        3. TREE.MULTI_PAYROLL
          4. diff --git a/client/src/modules/multiple_payroll/modals/search.modal.html b/client/src/modules/multiple_payroll/modals/search.modal.html index d25e4c34f2..43b177db5e 100644 --- a/client/src/modules/multiple_payroll/modals/search.modal.html +++ b/client/src/modules/multiple_payroll/modals/search.modal.html @@ -1,7 +1,7 @@
            -
          1. TREE.HUMANS_RESSOURCES
            2. +
          2. TREE.HUMAN_RESOURCES
          3. TREE.MULTI_PAYROLL
          diff --git a/client/src/modules/multiple_payroll/modals/waitingListConfirmation.html b/client/src/modules/multiple_payroll/modals/waitingListConfirmation.html index db1f0ee1a8..2c411246b0 100644 --- a/client/src/modules/multiple_payroll/modals/waitingListConfirmation.html +++ b/client/src/modules/multiple_payroll/modals/waitingListConfirmation.html @@ -1,7 +1,7 @@
            -
          1. TREE.HUMANS_RESSOURCES
            2. +
          2. TREE.HUMAN_RESOURCES
          3. FORM.BUTTONS.PUT_ON_WAITING
          diff --git a/client/src/modules/multiple_payroll/multiple_payroll.html b/client/src/modules/multiple_payroll/multiple_payroll.html index d31292156a..a96d69ca1e 100644 --- a/client/src/modules/multiple_payroll/multiple_payroll.html +++ b/client/src/modules/multiple_payroll/multiple_payroll.html @@ -1,7 +1,7 @@
            -
          1. TREE.HUMANS_RESSOURCES
            2. +
          2. TREE.HUMAN_RESOURCES
          3. TREE.MULTI_PAYROLL
          diff --git a/client/src/modules/multiple_payroll_indice/modals/config.modal.html b/client/src/modules/multiple_payroll_indice/modals/config.modal.html index 28feda3609..09e36e08a5 100644 --- a/client/src/modules/multiple_payroll_indice/modals/config.modal.html +++ b/client/src/modules/multiple_payroll_indice/modals/config.modal.html @@ -1,7 +1,7 @@
            -
          1. TREE.HUMANS_RESSOURCES
            2. +
          2. TREE.HUMAN_RESOURCES
          3. TREE.INDEXES
          4. TREE.MULTI_PAYROLL
            5. diff --git a/client/src/modules/multiple_payroll_indice/modals/import.modal.html b/client/src/modules/multiple_payroll_indice/modals/import.modal.html index e8f7d68e2c..2afbedc5ec 100644 --- a/client/src/modules/multiple_payroll_indice/modals/import.modal.html +++ b/client/src/modules/multiple_payroll_indice/modals/import.modal.html @@ -1,7 +1,7 @@
              -
            1. TREE.HUMANS_RESSOURCES
              2. +
            2. TREE.HUMAN_RESOURCES
            3. TREE.INDEXES
            4. TREE.MULTI_PAYROLL_INDICE
            5. FORM.INFO.IMPORT_PAYROLL_CONFIGURATION
              6. diff --git a/client/src/modules/multiple_payroll_indice/modals/parameter.modal.html b/client/src/modules/multiple_payroll_indice/modals/parameter.modal.html index 170ea6faff..2d160afa8c 100644 --- a/client/src/modules/multiple_payroll_indice/modals/parameter.modal.html +++ b/client/src/modules/multiple_payroll_indice/modals/parameter.modal.html @@ -1,7 +1,7 @@
                -
              1. TREE.HUMANS_RESSOURCES
                2. +
              2. TREE.HUMAN_RESOURCES
              3. TREE.INDEXES
              4. FORM.LABELS.SETTINGS
              5. TREE.MULTI_PAYROLL_INDICE
                6. diff --git a/client/src/modules/multiple_payroll_indice/modals/search.modal.html b/client/src/modules/multiple_payroll_indice/modals/search.modal.html index ec255fda51..dac2b445cd 100644 --- a/client/src/modules/multiple_payroll_indice/modals/search.modal.html +++ b/client/src/modules/multiple_payroll_indice/modals/search.modal.html @@ -1,7 +1,7 @@
                  -
                1. TREE.HUMANS_RESSOURCES
                  2. +
                2. TREE.HUMAN_RESOURCES
                3. TREE.INDEXES
                4. TREE.MULTI_PAYROLL
                diff --git a/client/src/modules/multiple_payroll_indice/multiple_payroll_indice.html b/client/src/modules/multiple_payroll_indice/multiple_payroll_indice.html index fc5c623c14..aefdcc3467 100644 --- a/client/src/modules/multiple_payroll_indice/multiple_payroll_indice.html +++ b/client/src/modules/multiple_payroll_indice/multiple_payroll_indice.html @@ -1,7 +1,7 @@
                  -
                1. TREE.HUMANS_RESSOURCES
                  2. +
                2. TREE.HUMAN_RESOURCES
                3. TREE.INDEXES
                4. TREE.MULTI_PAYROLL_INDICE
                diff --git a/client/src/modules/offdays/offdays.html b/client/src/modules/offdays/offdays.html index 1883b9a6e6..70c2227e41 100644 --- a/client/src/modules/offdays/offdays.html +++ b/client/src/modules/offdays/offdays.html @@ -1,7 +1,7 @@
                  -
                1. TREE.HUMANS_RESSOURCES
                  2. +
                2. TREE.HUMAN_RESOURCES
                3. OFFDAY.TITLE
                diff --git a/client/src/modules/payroll/account_configuration/configuration.html b/client/src/modules/payroll/account_configuration/configuration.html index 3e313e4af2..0b9d67d58c 100644 --- a/client/src/modules/payroll/account_configuration/configuration.html +++ b/client/src/modules/payroll/account_configuration/configuration.html @@ -1,7 +1,7 @@
                  -
                1. TREE.HUMANS_RESSOURCES
                  2. +
                2. TREE.HUMAN_RESOURCES
                3. TREE.PAYROLL_ACCOUNT_CONFIGURATION
                diff --git a/client/src/modules/payroll/account_configuration/modals/account.modal.html b/client/src/modules/payroll/account_configuration/modals/account.modal.html index 2d088965fc..308bffb65e 100644 --- a/client/src/modules/payroll/account_configuration/modals/account.modal.html +++ b/client/src/modules/payroll/account_configuration/modals/account.modal.html @@ -1,7 +1,7 @@
                  -
                1. TREE.HUMANS_RESSOURCES
                  2. +
                2. TREE.HUMAN_RESOURCES
                3. TREE.PAYROLL_ACCOUNT_CONFIGURATION diff --git a/client/src/modules/payroll/employee_configuration/configuration.html b/client/src/modules/payroll/employee_configuration/configuration.html index f4eb0370ea..c58d5ca616 100644 --- a/client/src/modules/payroll/employee_configuration/configuration.html +++ b/client/src/modules/payroll/employee_configuration/configuration.html @@ -1,7 +1,7 @@
                    -
                  1. TREE.HUMANS_RESSOURCES
                    2. +
                  2. TREE.HUMAN_RESOURCES
                  3. TREE.PAYROLL_EMP_CONFIGURATION
                  diff --git a/client/src/modules/payroll/employee_configuration/modals/employee.modal.html b/client/src/modules/payroll/employee_configuration/modals/employee.modal.html index e04d1c1b66..baaea8b7b0 100644 --- a/client/src/modules/payroll/employee_configuration/modals/employee.modal.html +++ b/client/src/modules/payroll/employee_configuration/modals/employee.modal.html @@ -1,7 +1,7 @@
                    -
                  1. TREE.HUMANS_RESSOURCES
                    2. +
                  2. TREE.HUMAN_RESOURCES
                  3. TREE.PAYROLL_EMP_CONFIGURATION diff --git a/client/src/modules/payroll/modals/payroll.modal.html b/client/src/modules/payroll/modals/payroll.modal.html index 3cf86826ae..87c974693c 100644 --- a/client/src/modules/payroll/modals/payroll.modal.html +++ b/client/src/modules/payroll/modals/payroll.modal.html @@ -1,7 +1,7 @@
                      -
                    1. TREE.HUMANS_RESSOURCES
                      2. +
                    2. TREE.HUMAN_RESOURCES
                    3. TREE.PAYROLL_CONFIGURATION diff --git a/client/src/modules/payroll/payroll.html b/client/src/modules/payroll/payroll.html index ea605364fd..031983a004 100644 --- a/client/src/modules/payroll/payroll.html +++ b/client/src/modules/payroll/payroll.html @@ -1,7 +1,7 @@
                        -
                      1. TREE.HUMANS_RESSOURCES
                        2. +
                      2. TREE.HUMAN_RESOURCES
                      3. TREE.PAYROLL_CONFIGURATION
                      diff --git a/client/src/modules/payroll/rubric_configuration/configuration.html b/client/src/modules/payroll/rubric_configuration/configuration.html index d277e15f83..d432817be1 100644 --- a/client/src/modules/payroll/rubric_configuration/configuration.html +++ b/client/src/modules/payroll/rubric_configuration/configuration.html @@ -1,7 +1,7 @@
                        -
                      1. TREE.HUMANS_RESSOURCES
                        2. +
                      2. TREE.HUMAN_RESOURCES
                      3. PAYROLL_RUBRIC.CONFIGURATION
                      diff --git a/client/src/modules/payroll/rubric_configuration/configuration.js b/client/src/modules/payroll/rubric_configuration/configuration.js index 7b0a44261c..3730546e9d 100644 --- a/client/src/modules/payroll/rubric_configuration/configuration.js +++ b/client/src/modules/payroll/rubric_configuration/configuration.js @@ -2,18 +2,16 @@ angular.module('bhima.controllers') .controller('ConfigurationController', ConfigurationController); ConfigurationController.$inject = [ - 'ConfigurationService', 'ModalService', - 'NotifyService', 'uiGridConstants', '$state', 'SessionService', + 'ConfigurationService', 'ModalService', 'NotifyService', 'uiGridConstants', ]; /** - * Rubric Management Controller + * Rubric Configuration Controller * - * This controller is about the Rubric management module in the admin zone - * It's responsible for creating, editing and updating a Rubric + * This controller is about the rubric configuration module in the admin zone + * It is responsible for creating, updating, and deleting rubric configurations. */ -function ConfigurationController(Configs, ModalService, - Notify, uiGridConstants, $state, Session) { +function ConfigurationController(Configs, ModalService, Notify, uiGridConstants) { const vm = this; const gridColumn = [ @@ -31,7 +29,6 @@ function ConfigurationController(Configs, ModalService, // bind methods vm.deleteConfig = deleteConfig; vm.toggleFilter = toggleFilter; - vm.currencySymbol = Session.enterprise.currencySymbol; // global variables vm.gridApi = {}; @@ -72,11 +69,11 @@ function ConfigurationController(Configs, ModalService, } // switch to delete warning mode - function deleteConfig(title) { + function deleteConfig(rubric) { ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') .then((bool) => { if (!bool) { return 0; } - return Configs.delete(title.id); + return Configs.delete(rubric.id); }) .then(() => { Notify.success('FORM.INFO.DELETE_SUCCESS'); diff --git a/client/src/modules/payroll/rubric_configuration/modals/config.modal.html b/client/src/modules/payroll/rubric_configuration/modals/config.modal.html index 1919f1c533..d42d23ec4c 100644 --- a/client/src/modules/payroll/rubric_configuration/modals/config.modal.html +++ b/client/src/modules/payroll/rubric_configuration/modals/config.modal.html @@ -1,7 +1,7 @@
                        -
                      1. TREE.HUMANS_RESSOURCES
                        2. +
                      2. TREE.HUMAN_RESOURCES
                      3. PAYROLL_RUBRIC.CONFIGURATION diff --git a/client/src/modules/payroll/rubric_configuration/modals/rubric.modal.html b/client/src/modules/payroll/rubric_configuration/modals/rubric.modal.html index 0b02477f92..4148e3ffb5 100644 --- a/client/src/modules/payroll/rubric_configuration/modals/rubric.modal.html +++ b/client/src/modules/payroll/rubric_configuration/modals/rubric.modal.html @@ -1,7 +1,7 @@
                          -
                        1. TREE.HUMANS_RESSOURCES
                          2. +
                        2. TREE.HUMAN_RESOURCES
                        3. PAYROLL_RUBRIC.ADD_PAYROLL_RUBRIC_CONFIGURATION diff --git a/client/src/modules/payroll/rubrics/modals/rubric.modal.html b/client/src/modules/payroll/rubrics/modals/rubric.modal.html index 5b7cad7f14..015a700d33 100644 --- a/client/src/modules/payroll/rubrics/modals/rubric.modal.html +++ b/client/src/modules/payroll/rubrics/modals/rubric.modal.html @@ -1,7 +1,7 @@
                            -
                          1. TREE.HUMANS_RESSOURCES
                            2. +
                          2. TREE.HUMAN_RESOURCES
                          3. PAYROLL_RUBRIC.ADD_PAYROLL_RUBRIC diff --git a/client/src/modules/payroll/rubrics/rubrics.html b/client/src/modules/payroll/rubrics/rubrics.html index 747dcd4f17..1efa7cf80e 100644 --- a/client/src/modules/payroll/rubrics/rubrics.html +++ b/client/src/modules/payroll/rubrics/rubrics.html @@ -1,7 +1,7 @@
                              -
                            1. TREE.HUMANS_RESSOURCES
                              2. +
                            2. TREE.HUMAN_RESOURCES
                            3. PAYROLL_RUBRIC.TITLE
                            diff --git a/client/src/modules/payroll/settings/settings.html b/client/src/modules/payroll/settings/settings.html index 619660c5d0..3d6509b7a1 100644 --- a/client/src/modules/payroll/settings/settings.html +++ b/client/src/modules/payroll/settings/settings.html @@ -1,7 +1,7 @@
                              -
                            1. TREE.HUMANS_RESSOURCES
                              2. +
                            2. TREE.HUMAN_RESOURCES
                            3. TREE.PAYROLL_SETTINGS
                            diff --git a/client/src/modules/payroll/staffing_indice/modal/createUpdate.html b/client/src/modules/payroll/staffing_indice/modal/createUpdate.html index b7b5ffb5ab..3f3982074e 100644 --- a/client/src/modules/payroll/staffing_indice/modal/createUpdate.html +++ b/client/src/modules/payroll/staffing_indice/modal/createUpdate.html @@ -1,7 +1,7 @@
                              -
                            1. TREE.HUMANS_RESSOURCES
                              2. +
                            2. TREE.HUMAN_RESOURCES
                            3. TREE.INDEXES
                            4. TREE.STAFFING_INDICES_MANAGEMENT diff --git a/client/src/modules/payroll/staffing_indice/modal/funcitonIndiceModal.html b/client/src/modules/payroll/staffing_indice/modal/funcitonIndiceModal.html index 092b8b7c57..364433ae34 100644 --- a/client/src/modules/payroll/staffing_indice/modal/funcitonIndiceModal.html +++ b/client/src/modules/payroll/staffing_indice/modal/funcitonIndiceModal.html @@ -2,7 +2,7 @@
                              1. -
                              2. TREE.HUMANS_RESSOURCES
                                3. +
                              3. TREE.HUMAN_RESOURCES
                              4. TREE.INDEXES
                                5. TREE.STAFFING_INDICES_MANAGEMENT diff --git a/client/src/modules/payroll/staffing_indice/modal/gradeIndiceModal.html b/client/src/modules/payroll/staffing_indice/modal/gradeIndiceModal.html index fc12d5657b..0ae4b5ac72 100644 --- a/client/src/modules/payroll/staffing_indice/modal/gradeIndiceModal.html +++ b/client/src/modules/payroll/staffing_indice/modal/gradeIndiceModal.html @@ -2,7 +2,7 @@
                                1. -
                                2. TREE.HUMANS_RESSOURCES
                                  3. +
                                3. TREE.HUMAN_RESOURCES
                                4. TREE.INDEXES
                                  5. TREE.STAFFING_INDICES_MANAGEMENT diff --git a/client/src/modules/payroll/staffing_indice/modal/search.modal.html b/client/src/modules/payroll/staffing_indice/modal/search.modal.html index 945f59d896..a821e14c2d 100644 --- a/client/src/modules/payroll/staffing_indice/modal/search.modal.html +++ b/client/src/modules/payroll/staffing_indice/modal/search.modal.html @@ -6,7 +6,7 @@
                                    -
                                  1. TREE.HUMANS_RESSOURCES
                                    2. +
                                  2. TREE.HUMAN_RESOURCES
                                  3. TREE.INDEXES
                                  4. TREE.STAFFING_INDICES_MANAGEMENT
                                  5. FORM.INFO.SEARCH
                                    6. diff --git a/client/src/modules/payroll/staffing_indice/staffingIndice.html b/client/src/modules/payroll/staffing_indice/staffingIndice.html index 520a45f65f..94f1578333 100644 --- a/client/src/modules/payroll/staffing_indice/staffingIndice.html +++ b/client/src/modules/payroll/staffing_indice/staffingIndice.html @@ -1,7 +1,7 @@
                                      -
                                    1. TREE.HUMANS_RESSOURCES
                                      2. +
                                    2. TREE.HUMAN_RESOURCES
                                    3. TREE.INDEXES
                                    4. TREE.STAFFING_INDICES_MANAGEMENT
                                    diff --git a/client/src/modules/payroll/weekend_configuration/configuration.html b/client/src/modules/payroll/weekend_configuration/configuration.html index 8936b7387b..0b387cb91a 100644 --- a/client/src/modules/payroll/weekend_configuration/configuration.html +++ b/client/src/modules/payroll/weekend_configuration/configuration.html @@ -1,7 +1,7 @@
                                      -
                                    1. TREE.HUMANS_RESSOURCES
                                      2. +
                                    2. TREE.HUMAN_RESOURCES
                                    3. TREE.WEEKEND_CONFIGURATION
                                    diff --git a/client/src/modules/payroll/weekend_configuration/modals/weekEnd.modal.html b/client/src/modules/payroll/weekend_configuration/modals/weekEnd.modal.html index 2ec8c3d7a1..128dd6a2fe 100644 --- a/client/src/modules/payroll/weekend_configuration/modals/weekEnd.modal.html +++ b/client/src/modules/payroll/weekend_configuration/modals/weekEnd.modal.html @@ -1,7 +1,7 @@
                                      -
                                    1. TREE.HUMANS_RESSOURCES
                                      2. +
                                    2. TREE.HUMAN_RESOURCES
                                    3. TREE.WEEKEND_CONFIGURATION diff --git a/client/src/modules/titles/titles.html b/client/src/modules/titles/titles.html index 1a3c200c73..f4bd69c105 100644 --- a/client/src/modules/titles/titles.html +++ b/client/src/modules/titles/titles.html @@ -1,7 +1,7 @@
                                        -
                                      1. TREE.HUMANS_RESSOURCES
                                        2. +
                                      2. TREE.HUMAN_RESOURCES
                                      3. TREE.TITLE
                                      diff --git a/server/models/06-bhima.sql b/server/models/06-bhima.sql index a4b5850322..47db9594e1 100644 --- a/server/models/06-bhima.sql +++ b/server/models/06-bhima.sql @@ -31,7 +31,7 @@ INSERT INTO unit VALUES (26,'Location Manager','TREE.LOCATION','',1,'/locations'), (29,'Patient Group','TREE.PATIENT_GRP','',1,'/patients/groups'), (48,'Service Management','TREE.SERVICE','',1,'/services'), - (57,'Human Resources','TREE.HUMANS_RESSOURCES','',0,'/PAYROLL_FOLDER'), + (57,'Human Resources','TREE.HUMAN_RESOURCES','',0,'/PAYROLL_FOLDER'), (61,'Employee','TREE.EMPLOYEE','Employees Registration',57,'/employees/register'), (62,'Employee Registry','TREE.EMPLOYEE_REGISTRY','',57,'/employees'), (82,'Subsidies','TREE.SUBSIDY','Handles the subsidy situation',1,'/subsidies'), diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index 455f7c30c2..5526d191c3 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -21,3 +21,10 @@ INSERT INTO `account_reference_type` (`id`, `label`, `fixed`) VALUES (8, 'FORM.L * Change the name of the "hiring_date" column to "date_embauche" in the "employee" table */ ALTER TABLE `employee` CHANGE COLUMN date_embauche hiring_date DATETIME DEFAULT NULL; + +/* +* @author: jniles +* @date: 2024-12-28 +* Correct the spelling of the human resources +*/ +UPDATE unit SET `path` = 'TREE.HUMAN_RESOURCES' WHERE `path` = 'TREE.HUMANS_RESSOURCES';