lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trforbreak

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-18 23:16:46 +01:00
parent 80a7b83956
commit 8925a8041a
6 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/bookkeeping/balance.php
View File

@ -417,7 +417,7 @@ if ($action != 'export_csv') {
// Show first line of a break // Show first line of a break
print '<tr class="trforbreak">'; print '<tr class="trforbreak">';
print '<td colspan="'.($colspan+1).'" class="groupby">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>'; print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
print '</tr>'; print '</tr>';
$displayed_account = $root_account_number; $displayed_account = $root_account_number;

4
htdocs/accountancy/bookkeeping/listbyaccount.php
View File

@ -711,8 +711,8 @@ while ($i < min($num, $limit)) {
} }
// Show the break account // Show the break account
print "<tr>"; print '<tr class="trforbreak">';
print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" class="groupby">'; print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" class="tdforbreak">';
if ($line->numero_compte != "" && $line->numero_compte != '-1') { if ($line->numero_compte != "" && $line->numero_compte != '-1') {
print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte); print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
} else { } else {

4
htdocs/accountancy/bookkeeping/listbysubaccount.php
View File

@ -713,8 +713,8 @@ while ($i < min($num, $limit)) {
} }
// Show the break account // Show the break account
print "<tr>"; print '<tr class="trforbreak">';
print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" class="groupby">'; print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" class="tdforbreak">';
if ($line->subledger_account != "" && $line->subledger_account != '-1') { if ($line->subledger_account != "" && $line->subledger_account != '-1') {
print $line->subledger_label.' : '.length_accounta($line->subledger_account); print $line->subledger_label.' : '.length_accounta($line->subledger_account);
} else { } else {

12
htdocs/compta/resultat/clientfourn.php
View File

@ -312,26 +312,28 @@ if ($modecompta == 'BOOKKEEPING') {
if ($showaccountdetail == 'no') { if ($showaccountdetail == 'no') {
if ($objp->pcg_type != $oldpcgtype) { if ($objp->pcg_type != $oldpcgtype) {
print '<tr><td colspan="3" class="groupby">'.$objp->pcg_type.'</td></tr>'; print '<tr class="trforbreak"><td colspan="3" class="tdforbreak">'.$objp->pcg_type.'</td></tr>';
$oldpcgtype = $objp->pcg_type; $oldpcgtype = $objp->pcg_type;
} }
} }
print '<tr class="oddeven">';
if ($showaccountdetail == 'no') { if ($showaccountdetail == 'no') {
print '<tr class="oddeven">';
print '<td></td>'; print '<td></td>';
print '<td>'; print '<td>';
print $objp->pcg_type; print $objp->pcg_type;
print ($objp->name ? ' ('.$objp->name.')' : ' ('.$langs->trans("Unknown").')'); print ($objp->name ? ' ('.$objp->name.')' : ' ('.$langs->trans("Unknown").')');
print "</td>\n"; print "</td>\n";
print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>\n"; print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>\n";
print "</tr>\n";
} else { } else {
print '<td colspan="2" class="groupby">'; print '<tr class="oddeven trforbreak">';
print '<td colspan="2" class="tdforbreak">';
print $objp->pcg_type; print $objp->pcg_type;
print "</td>\n"; print "</td>\n";
print '<td class="right groupby"><span class="amount">'.price($objp->amount)."</span></td>\n"; print '<td class="right tdforbreak"><span class="amount">'.price($objp->amount)."</span></td>\n";
print "</tr>\n";
} }
print "</tr>\n";
$total_ht += (isset($objp->amount) ? $objp->amount : 0); $total_ht += (isset($objp->amount) ? $objp->amount : 0);
$total_ttc += (isset($objp->amount) ? $objp->amount : 0); $total_ttc += (isset($objp->amount) ? $objp->amount : 0);

3
htdocs/theme/eldy/global.inc.php
View File

@ -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_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; } 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.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 { input {
font-size: unset; font-size: unset;

5
htdocs/theme/md/style.css.php
View File

@ -4022,11 +4022,6 @@ input.liste_titre {
white-space: normal; 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 { tr.liste_sub_total, tr.liste_sub_total td {
border-bottom: 2px solid #aaa; border-bottom: 2px solid #aaa;
} }