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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/langs/en_US/website.lang
This commit is contained in:
Laurent Destailleur
2018-02-15 15:34:17 +01:00
parent 9965a25eaa 47713e0264
commit 6b74c79798
119 changed files with 818 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3811,7 +3811,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
{
if ($totalnboflines) // If we know total nb of lines
{
$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1); // page nb before and after selected page + ... + first or last
// Define nb of extra page links before and after selected page + ... + first or last
$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1);
if ($limit > 0) $nbpages=ceil($totalnboflines/$limit);
else $nbpages=1;