lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix closing boxes

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-15 11:58:13 +01:00
parent e6d8b3c4db
commit 4c0ff38020
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.formother.class.php
View File

@ -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 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({ 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 async: false
}); });
// We force reload to be sure to get all boxes into list // We force reload to be sure to get all boxes into list
@ -1086,7 +1086,7 @@ class FormOther
containment: \'.fiche\', containment: \'.fiche\',
connectWith: \'.connectedSortable\', connectWith: \'.connectedSortable\',
stop: function(event, ui) { 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(); var label=jQuery(\'#boxlabelentry\'+boxid).val();
jQuery(\'#boxto_\'+boxid).remove(); jQuery(\'#boxto_\'+boxid).remove();
if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid)); if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid));
updateBoxOrder(1); updateBoxOrder(1); /* 1 to avoid message after a remove */
}); });
});'."\n"; });'."\n";

2
htdocs/hrm/index.php
View File

@ -355,7 +355,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
{ {
print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
print '</table><br>'; print '</table>';
} }
else dol_print_error($db); else dol_print_error($db);
} }

4
htdocs/theme/eldy/style.css.php
View File

@ -2348,10 +2348,10 @@ table.liste, table.noborder, table.formdoc, div.noborder {
margin: 0px 0px 5px 0px; 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; border-bottom: 1px solid #aaa;
} }
div.ficheaddleft table.noborder { div.tabBar div.ficheaddleft table.noborder {
border-bottom: none; border-bottom: none;
} }