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

Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
This commit is contained in:
Laurent Destailleur
2019-08-22 12:45:23 +02:00
9 changed files with 48 additions and 33 deletions

View File

@@ -1230,7 +1230,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
}
if ($popuptab) $outmore.='</div>';
if ($displaytab > $limittoshow)
if ($popuptab) // If there is some tabs not shown
{
$left=($langs->trans("DIRECTION") == 'rtl'?'right':'left');
$right=($langs->trans("DIRECTION") == 'rtl'?'left':'right');