This commit is contained in:
Laurent Destailleur 2021-12-10 13:56:51 +01:00
parent 4d1e247a5c
commit b2611e4cdb
7 changed files with 9 additions and 5 deletions

View File

@ -217,6 +217,7 @@ if ($action == 'delete_action') {
/*
* View
*/
$parameters = array(
'socid' => $socid,
'status' => $status,

View File

@ -2080,7 +2080,7 @@ class Form
if ($num) {
// Enhance with select2
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$out .= ajax_combobox($htmlname);
$out = ajax_combobox($htmlname).$out;
}
} else {
dol_print_error($this->db);

View File

@ -84,7 +84,7 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
$title = $langs->trans("Menu");
// URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
$head = '<!-- Menu -->'."\n";
$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page
$arrayofjs = array();
$arrayofcss = array();
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

View File

@ -73,11 +73,11 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '<div class="divsearchfield">';
// Type
print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
$multiselect = 0;
if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) { // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
}
print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');
print '</div>';

View File

@ -81,7 +81,7 @@ if (GETPOST('acction', 'aZ') == 'switchentity') {
$title = $langs->trans("Multicompanies");
// URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests
$head = '<!-- Multicompany access -->'."\n";
$head = '<!-- Multicompany access -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page
$arrayofjs = array();
$arrayofcss = array();
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

View File

@ -58,7 +58,7 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
$title = $langs->trans("Search");
// URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
$head = '<!-- Quick access -->'."\n";
$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page
$arrayofjs = array();
$arrayofcss = array();
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

View File

@ -1058,6 +1058,9 @@ body[class*="colorblind-"] .text-success{
font-size: 1.5em; vertical-align: text-bottom;
}
.fawidth30 {
width: 20px;
}
.floatnone {
float: none !important;
}