From 31cfd4c04dff08ed9ff21b73fa463b7853ba3bf8 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Sat, 22 Feb 2025 14:51:06 +0100 Subject: [PATCH] Look and feel v22 --- htdocs/accountancy/bookkeeping/listbyaccount.php | 7 +++++-- htdocs/core/tpl/list_print_total.tpl.php | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 2ac1ec58814..79b99395695 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -670,7 +670,7 @@ if (!empty($socid)) { print ''; print dol_get_fiche_end(); - print info_admin($langs->trans("WarningThisPageContainsOnlyEntriesTransferredInAccounting")); + print info_admin($langs->trans("WarningThisPageContainsOnlyEntriesTransferredInAccounting")).''; // Choice of mode (customer / supplier) if (!empty($conf->dol_use_jmobile)) { @@ -855,6 +855,7 @@ if (preg_match('/^asc/i', $sortorder)) { // Warning to explain why the list of record is not consistent with the other list view (missing a lot of lines) if ($type == 'sub' && !$socid) { print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded")); + print '
'; } $moreforfilter = ''; @@ -1221,7 +1222,7 @@ while ($i < min($num, $limit)) { } // Show the break account - print ''; + print ''; print ''; if ($type == 'sub') { if ($line->subledger_account != "" && $line->subledger_account != '-1') { @@ -1500,6 +1501,7 @@ if ($num > 0 && $colspan > 0) { print ''; } print ''; + // Show balance of last shown account $balance = $sous_total_debit - $sous_total_credit; print ''; @@ -1534,6 +1536,7 @@ if (!empty($totalarray['val']['totalbalance'])) { } // Show total line +$trforbreaknobg = 1; // used in list_print_total.tpl.php include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php'; // If no record found diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php index 397328e146a..587a59ed68c 100644 --- a/htdocs/core/tpl/list_print_total.tpl.php +++ b/htdocs/core/tpl/list_print_total.tpl.php @@ -22,6 +22,9 @@ * @var DoliDB $db * @var Form $form * @var Translate $langs + * + * @var int $trforbreaknobg + * @var array{nbfield:int,type?:array,pos?:array,val?:array} $totalarray */ ' @phan-var-force array{nbfield:int,type?:array,pos?:array,val?:array} $totalarray @@ -78,7 +81,7 @@ if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) // Show total line if (isset($totalarray['pos'])) { //print ''; - print ''; + print ''; $i = 0; while ($i < $totalarray['nbfield']) { $i++;