From 8925a8041af889baf3144e82ad260b0edd1ef9b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Dec 2021 23:16:46 +0100 Subject: [PATCH] Fix trforbreak --- htdocs/accountancy/bookkeeping/balance.php | 2 +- htdocs/accountancy/bookkeeping/listbyaccount.php | 4 ++-- htdocs/accountancy/bookkeeping/listbysubaccount.php | 4 ++-- htdocs/compta/resultat/clientfourn.php | 12 +++++++----- htdocs/theme/eldy/global.inc.php | 3 --- htdocs/theme/md/style.css.php | 5 ----- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 24d9d74a645..0b67327b11c 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -417,7 +417,7 @@ if ($action != 'export_csv') { // Show first line of a break print ''; - print ''.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').''; + print ''.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').''; print ''; $displayed_account = $root_account_number; diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index a9276c10578..d73f4228f97 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -711,8 +711,8 @@ while ($i < min($num, $limit)) { } // Show the break account - print ""; - print ''; + print ''; + print ''; if ($line->numero_compte != "" && $line->numero_compte != '-1') { print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte); } else { diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php index 97cddacfefc..e529126d8ce 100644 --- a/htdocs/accountancy/bookkeeping/listbysubaccount.php +++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php @@ -713,8 +713,8 @@ while ($i < min($num, $limit)) { } // Show the break account - print ""; - print ''; + print ''; + print ''; if ($line->subledger_account != "" && $line->subledger_account != '-1') { print $line->subledger_label.' : '.length_accounta($line->subledger_account); } else { diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 013c2fdb3e6..3d05a17611c 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -312,26 +312,28 @@ if ($modecompta == 'BOOKKEEPING') { if ($showaccountdetail == 'no') { if ($objp->pcg_type != $oldpcgtype) { - print ''.$objp->pcg_type.''; + print ''.$objp->pcg_type.''; $oldpcgtype = $objp->pcg_type; } } - print ''; if ($showaccountdetail == 'no') { + print ''; print ''; print ''; print $objp->pcg_type; print ($objp->name ? ' ('.$objp->name.')' : ' ('.$langs->trans("Unknown").')'); print "\n"; print ''.price($objp->amount)."\n"; + print "\n"; } else { - print ''; + print ''; + print ''; print $objp->pcg_type; print "\n"; - print ''.price($objp->amount)."\n"; + print ''.price($objp->amount)."\n"; + print "\n"; } - print "\n"; $total_ht += (isset($objp->amount) ? $objp->amount : 0); $total_ttc += (isset($objp->amount) ? $objp->amount : 0); diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 918fe88a62c..4ab0817e959 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -140,9 +140,6 @@ th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decora tr.liste_titre th.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre td.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titre:not(.maxwidthsearch) { opacity: 0.8; } /* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */ -th.groupby, td.groupby { - font-weight:bold; border-bottom: 1pt solid black !important; -} input { font-size: unset; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 2d64e3f26e5..dd76af765db 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -4022,11 +4022,6 @@ input.liste_titre { white-space: normal; } -th.groupby, td.groupby { - font-weight:bold; border-bottom: 1pt solid black !important; -} - - tr.liste_sub_total, tr.liste_sub_total td { border-bottom: 2px solid #aaa; }