From 64b92d7a1bb51cfb97679b8b0d67065b80ee1c68 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Mar 2023 18:10:43 +0100 Subject: [PATCH] Debug v18 --- .../accountancy/bookkeeping/listbyaccount.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 17ebe24546a..419369fe9d3 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -951,6 +951,10 @@ while ($i < min($num, $limit)) { if (!empty($arrayfields['t.date_export']['checked'])) { $colspanend++; } if (!empty($arrayfields['t.date_validating']['checked'])) { $colspanend++; } if (!empty($arrayfields['t.lettering_code']['checked'])) { $colspanend++; } + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + $colspan++; + $colspanend--; + } // Is it a break ? if ($accountg != $displayed_account_number || !isset($displayed_account_number)) { @@ -990,7 +994,9 @@ while ($i < min($num, $limit)) { print ''; if ($type == 'sub') { if ($line->subledger_account != "" && $line->subledger_account != '-1') { - print $line->subledger_label . ' : ' . length_accounta($line->subledger_account); + print empty($line->subledger_label) ? ''.$langs->trans("Unknown").'' : $line->subledger_label; + print ' : '; + print length_accounta($line->subledger_account); } else { // Should not happen: subledger account must be null or a non empty value print '' . $langs->trans("Unknown"); @@ -1033,6 +1039,9 @@ while ($i < min($num, $limit)) { print ''; } print ''; + if (!$i) { + $totalarray['nbfield']++; + } } // Piece number if (!empty($arrayfields['t.piece_num']['checked'])) { @@ -1216,9 +1225,9 @@ while ($i < min($num, $limit)) { print ''; } print ''; - } - if (!$i) { - $totalarray['nbfield']++; + if (!$i) { + $totalarray['nbfield']++; + } } // Comptabilise le sous-total