vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Look and feel v22

Browse source
This commit is contained in:
ldestailleur 2025-02-22 14:51:06 +01:00
parent e8df374b6b
commit 31cfd4c04d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
htdocs/accountancy/bookkeeping/listbyaccount.php
View file

@ -670,7 +670,7 @@ if (!empty($socid)) {
print '</div>';
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 '<br>';
}
$moreforfilter = '';
@ -1221,7 +1222,7 @@ while ($i < min($num, $limit)) {
}
// Show the break account
print '<tr class="trforbreak">';
print '<tr class="trforbreaknobg">';
print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : count($arrayfields) + 1).'" class="tdforbreak">';
if ($type == 'sub') {
if ($line->subledger_account != "" && $line->subledger_account != '-1') {
@ -1500,6 +1501,7 @@ if ($num > 0 && $colspan > 0) {
print '<td colspan="'.$colspanend.'"></td>';
}
print '</tr>';
// Show balance of last shown account
$balance = $sous_total_debit - $sous_total_credit;
print '<tr class="liste_total">';
@ -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

5
htdocs/core/tpl/list_print_total.tpl.php
View file

@ -22,6 +22,9 @@
* @var DoliDB $db
* @var Form $form
* @var Translate $langs
*
* @var int $trforbreaknobg
* @var array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray
*/
'
@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray
@ -78,7 +81,7 @@ if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable']))
// Show total line
if (isset($totalarray['pos'])) {
//print '<tfoot>';
print '<tr class="liste_total">';
print '<tr class="liste_total'.(empty($trforbreaknobg) ? '' : ' trforbreaknobg').'">';
$i = 0;
while ($i < $totalarray['nbfield']) {
$i++;