diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index d83e6e3c8e7..e496c032d2c 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -616,7 +616,6 @@ PaymentCondition PaymentConditionShort PaymentDonation PaymentHigherThanReminderToPaySupplier -PaymentSalary PaymentSendToStripeTerminal PaymentType PaymentTypeShort diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index 7d939b5ad31..bb4040214d2 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -7,7 +7,7 @@ * Copyright (C) 2015-2017 Alexandre Spangaro * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2016 Marcos García - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2021 Gauthier VERDOL * Copyright (C) 2024 MDW * @@ -457,13 +457,13 @@ if ($result) { print ''; } elseif ($links[$key]['type'] == 'payment_salary') { print ''; - print img_object($langs->trans('PaymentSalary'), 'payment').' '; + print img_object($langs->trans('SalaryPayment'), 'payment').' '; print $langs->trans("SalaryPayment"); print ''; } elseif ($links[$key]['type'] == 'payment_loan') { print ''; print img_object($langs->trans('LoanPayment'), 'payment').' '; - print $langs->trans("PaymentLoan"); + print $langs->trans("LoanPayment"); print ''; } elseif ($links[$key]['type'] == 'loan') { print ''; diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 98cd034ada6..8d35da4fc61 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -5,6 +5,7 @@ HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service Establishments=Establishments Establishment=Establishment NewEstablishment=New establishment +NoActiveEstablishmentDefined=No active establishment defined DeleteEstablishment=Delete establishment ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment? OpenEtablishment=Open establishment