From 6b31c69c8b872ef8f5e554bb59ae200ec1febc2e Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Thu, 16 Jan 2025 18:22:46 +0100 Subject: [PATCH] Debug v21 --- htdocs/user/bank.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index edd8ff48472..61fadf541b6 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -629,12 +629,22 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac if ($action == 'editaccountancycodeusergeneral' && $user->hasRight('user', 'user', 'creer')) { print $formaccounting->formAccountingAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->accountancy_code_user_general, 'accountancycodeusergeneral', 0, 1, '', 1); } else { - $accountingaccount = new AccountingAccount($db); - $accountingaccount->fetch(0, $object->accountancy_code_user_general, 1); - print $accountingaccount->getNomUrl(0, 1, 1, '', 1); + if (!empty($object->accountancy_code_user_general) && $object->accountancy_code_user_general != '-1') { + $accountingaccount = new AccountingAccount($db); + $accountingaccount->fetch(0, $object->accountancy_code_user_general, 1); + print $accountingaccount->getNomUrl(0, 1, 1, '', 1); + } } - $accountingAccountByDefault = " (" . $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')) . ")"; + print ''; + if (!empty($object->accountancy_code_user_general) && $object->accountancy_code_user_general != '-1') { + print ' ('; + } + $accountingAccountByDefault = $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')); print (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') ? $accountingAccountByDefault : ''); + if (!empty($object->accountancy_code_user_general) && $object->accountancy_code_user_general != '-1') { + print ')'; + } + print ''; print ''; // Accountancy code