diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 5f8fe76e320..77d3e6cf271 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -1046,7 +1046,7 @@ class FormOther if (boxorder==\'A:A-B:B\' && closing == 1) // There is no more boxes on screen, and we are after a delete of a box so we must hide title { jQuery.ajax({ - url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=\'+closing+\'&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.', + url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=0&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.', async: false }); // We force reload to be sure to get all boxes into list @@ -1086,7 +1086,7 @@ class FormOther containment: \'.fiche\', connectWith: \'.connectedSortable\', stop: function(event, ui) { - updateBoxOrder(0); + updateBoxOrder(1); /* 1 to avoid message after a move */ } }); @@ -1096,7 +1096,7 @@ class FormOther var label=jQuery(\'#boxlabelentry\'+boxid).val(); jQuery(\'#boxto_\'+boxid).remove(); if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid)); - updateBoxOrder(1); + updateBoxOrder(1); /* 1 to avoid message after a remove */ }); });'."\n"; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index b0e2bf58d79..63700629fd8 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -355,7 +355,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire { print ''.$langs->trans("None").''; } - print '
'; + print ''; } else dol_print_error($db); } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 832b13dedf9..90aebd7d908 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2348,10 +2348,10 @@ table.liste, table.noborder, table.formdoc, div.noborder { margin: 0px 0px 5px 0px; } -div.ficheaddleft table.noborder:last-child { +div.tabBar div.ficheaddleft table.noborder:last-of-type { border-bottom: 1px solid #aaa; } -div.ficheaddleft table.noborder { +div.tabBar div.ficheaddleft table.noborder { border-bottom: none; }