diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4cf0e54b289..f78adf88881 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8467,6 +8467,8 @@ class Form
if ($tmpfieldstoshow) {
$fieldstoshow = $tmpfieldstoshow;
}
+ } elseif ($objecttmp->element === 'category') {
+ $fieldstoshow = 't.label';
} else {
// For backward compatibility
$objecttmp->fields['ref'] = array('type' => 'varchar(30)', 'label' => 'Ref', 'showoncombobox' => 1);
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9fe58555f2f..77c1182fed8 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -266,7 +266,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
//var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element);
print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element);
- print ''; // it's needed when to get parent value when extra-field list depend on parent extra-field list
+ print ''; // it's needed when to get parent value when extra-field list depend on parent extra-field list
}
print '';
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 778711f9a86..e72b3be82a5 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -86,6 +86,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object);
}
@@ -96,7 +97,6 @@ $permissiontoadd = $user->hasRight('eventorganization', 'write'); // Used by the
$permissiontodelete = $user->hasRight('eventorganization', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
$permissionnote = $user->hasRight('eventorganization', 'write'); // Used by the include of actions_setnotes.inc.php
$permissiondellink = $user->hasRight('eventorganization', 'write'); // Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
// Security check
if ($user->socid > 0) {
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index eee65213689..c98e4a7a751 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1458,13 +1458,13 @@ if ($reshook == 0) { //add buttons
$menus[$r++] = $butmenu;
}
}
- } elseif ($reshook == 1) {
- $r = 0; //replace buttons
- if (is_array($hookmanager->resArray)) {
- foreach ($hookmanager->resArray as $resArray) {
- foreach ($resArray as $butmenu) {
- $menus[$r++] = $butmenu;
- }
+ }
+} elseif ($reshook == 1) {
+ $r = 0; //replace buttons
+ if (is_array($hookmanager->resArray) ) {
+ foreach ($hookmanager->resArray as $resArray) {
+ foreach ($resArray as $butmenu) {
+ $menus[$r++] = $butmenu;
}
}
}