Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #4311 from FHenry/develop

Browse Source 
NEW : if nb total of lines provided in print barre_liste, display beside title
This commit is contained in:
Juanjo Menent
2016-01-09 17:52:05 +01:00
parent 8cabb87a2b 7414e4c07c
commit c7ae943e57
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@@ -2985,7 +2985,11 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
// Left
if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, '', $pictoisfullpath).'</td>';
print '<td class="nobordernopadding"><div class="titre">'.$titre.'</div></td>';
print '<td class="nobordernopadding"><div class="titre">'.$titre;
if (!empty($totalnboflines) && !empty($titre)) {
print ' ('.$totalnboflines.')';
}
print '</div></td>';
// Center
if ($center)

2
htdocs/core/lib/report.lib.php
View File

@@ -48,8 +48,6 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
if(! empty($varlink)) $varlink = '?'.$varlink;
if(! empty($varlink)) $varlink = '?'.$varlink;
$h=0;
$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
$head[$h][1] = $langs->trans("Report");