From 70d73571282b61d47124ea4840afaabd93ff71ef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 21 Jan 2026 11:35:36 +0100 Subject: [PATCH] Debug v23 --- htdocs/compta/paiement/cheque/card.php | 55 ++++++++++++++++---------- htdocs/langs/en_US/compta.lang | 2 +- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 64f8d2758f1..2ab516f57b3 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -450,7 +450,7 @@ if ($action == 'new') { } print ''; print ''; - print '
'; + print '

'; print '
'; $sql = "SELECT ba.rowid as bid, ba.label,"; @@ -528,11 +528,20 @@ if ($action == 'new') { print ''; print ''; + print_fiche_titre($account_label, '', ''); + $moreforfilter = ''; print '
'; print ''."\n"; print ''; + if ($conf->main_checkbox_left_column) { + print ''; + } print '\n"; print '\n"; print '\n"; - print ''; } - print ''; print "\n"; if (count($lines[$bid])) { foreach ($lines[$bid] as $lid => $value) { print ''; + if ($conf->main_checkbox_left_column) { + print ''; + } print ''; - print '\n"; - print '\n"; - print '\n"; - print ''; + print '\n"; + print '\n"; + print '\n"; + print ''; // Link to payment - print ''; // Link to bank transaction - print ''; - - print ''; + if (empty($conf->main_checkbox_left_column)) { + print ''; + } print ''; } } @@ -595,9 +608,9 @@ if ($action == 'new') { print '
'; if ($user->hasRight('banque', 'cheque')) { - print ''; + print ''; } else { - print ''.$langs->trans('NewCheckDepositOn', $account_label).''; + print ''.$langs->trans('NewCheckDepositOn').''; } print '

'; print ''; diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 8a79602d8e7..c6785cf3e69 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -145,7 +145,7 @@ LastCheckReceiptShort=Latest %s deposit slips LastPaymentForDepositShort=Latest %s %s deposit slips NewCheckReceipt=New discount NewCheckDeposit=New deposit slip -NewCheckDepositOn=Create receipt for deposit on account: %s +NewCheckDepositOn=Create cheque deposit slip NoWaitingChecks=No checks awaiting deposit. NoWaitingPaymentForDeposit=No %s payment awaiting deposit. DateChequeReceived=Check receiving date
'.$langs->trans("Select")."
"; + if ($conf->use_javascript_ajax) { + print ''.$langs->trans("All").' / '.$langs->trans("None").''; + } + print '
'; if ($type == 'CHQ') { print $langs->trans("DateChequeReceived"); @@ -546,47 +555,51 @@ if ($action == 'new') { print ''.$langs->trans("Amount")."'.$langs->trans("Payment")."'.$langs->trans("LineRecord")."'.$langs->trans("Select")."
"; - if ($conf->use_javascript_ajax) { - print ''.$langs->trans("All").' / '.$langs->trans("None").''; + if (empty($conf->main_checkbox_left_column)) { + print '
'.$langs->trans("Select")."
"; + if ($conf->use_javascript_ajax) { + print ''.$langs->trans("All").' / '.$langs->trans("None").''; + } + print '
'; + print ''; + print ''.dol_print_date($value["paymentdate"], 'day').''.$value["numero"]."'.$value["emetteur"]."'.$value["banque"]."'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).''.dolPrintHTML($value["numero"])."'.dolPrintHTML($value["emetteur"])."'.dolPrintHTML($value["banque"])."'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).''; + print ''; $paymentstatic->id = $value["paymentid"]; $paymentstatic->ref = $value["paymentref"]; $paymentstatic->date = $value["paymentdate"]; if ($paymentstatic->id) { print $paymentstatic->getNomUrl(1); - } else { - print ' '; } print ''; + print ''; $accountlinestatic->id = $value["id"]; $accountlinestatic->ref = $value["ref"]; if ($accountlinestatic->id > 0) { print $accountlinestatic->getNomUrl(1); - } else { - print ' '; } print ''; - print ''; - print ''; + print ''; + print '