diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index b30a09e3af5..3945b5a4f8b 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -123,7 +123,6 @@ AmountOfTicketsByMonthHT AmountOfinterventions AmountOfinterventionsByMonthHT AnObjectWithThisClassNameAlreadyExists -Anciennete AnnualByAccountDueDebtMode AnnualByAccountInputOutputMode Anonymous diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index acc8803a7f1..31c98fef78c 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -1,17 +1,17 @@ - * Copyright (C) 2004-2022 Laurent Destailleur - * Copyright (C) 2005-2015 Regis Houssin - * Copyright (C) 2015-2020 Juanjo Menent - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2015 Raphaël Doursenaud - * Copyright (C) 2016 Marcos García - * Copyright (C) 2019 Nicolas ZABOURI - * Copyright (C) 2020 Tobias Sekan - * Copyright (C) 2020 Josep Lluís Amador - * Copyright (C) 2021-2025 Frédéric France - * Copyright (C) 2024 Rafael San José - * Copyright (C) 2024 MDW +/* Copyright (C) 2001-2005 Rodolphe Quiedeville + * Copyright (C) 2004-2022 Laurent Destailleur + * Copyright (C) 2005-2015 Regis Houssin + * Copyright (C) 2015-2020 Juanjo Menent + * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Raphaël Doursenaud + * Copyright (C) 2016 Marcos García + * Copyright (C) 2019 Nicolas ZABOURI + * Copyright (C) 2020 Tobias Sekan + * Copyright (C) 2020 Josep Lluís Amador + * Copyright (C) 2021-2025 Frédéric France + * Copyright (C) 2024 Rafael San José + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php index 3a06e903ab2..30f1a09c664 100644 --- a/htdocs/hrm/compare.php +++ b/htdocs/hrm/compare.php @@ -4,7 +4,7 @@ * Copyright (C) 2021 Greg Rastklan * Copyright (C) 2021 Jean-Pascal BOUDET * Copyright (C) 2021 Grégory BLEMAND - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024-2025 MDW * Copyright (C) 2024 Alexandre Spangaro * @@ -491,7 +491,7 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list } if (!empty($user->array_options['options_DDA'])) { - $desc .= '
' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA'])); + $desc .= '
' . $langs->trans('Seniority') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA'])); } $out .= '
  • diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 55669d08b4f..283cec1e7ee 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -81,6 +81,7 @@ TypeHowToBe=How to be TypeKnowledge=Knowledge AbandonmentComment=Abandonment comment DateLastEval=Date last evaluation +Seniority=Seniority NoEval=No evaluation done for this employee HowManyUserWithThisMaxNote=Number of users with this rank HighestRank=Highest rank