diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 55598c196ee..233d2601871 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -826,6 +826,7 @@ if ($rowid > 0) } else { $value = $object->array_options["options_" . $key]; } + print ''.$label.''; print $extrafields->showInputField($key, $value); print "\n"; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index f68864fcc3d..ee90a0638fb 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; // Load translation files required by the page $langs->loadLangs(array("errors","admin","main","companies","resource","holiday","accountancy","hrm","orders","contracts","projects","propal","bills","interventions")); @@ -1782,7 +1782,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') $formadmin = new FormAdmin($db); $formcompany = new FormCompany($db); - if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db); + $formaccounting = new FormAccounting($db); $withentity=''; @@ -1890,6 +1890,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') elseif (in_array($fieldlist[$field], array('libelle_facture'))) { print ''; $transfound=0; + $transkey=''; // Special case for labels if ($tabname == MAIN_DB_PREFIX.'c_payment_term') { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 1d76989cb60..6817039e7a1 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1101,6 +1101,8 @@ body.sidebar-collapse .login_block { } .menuhider { display: block !important; } +.dropdown-user-image { display: none; } +.user-header { height: auto !important; color: rgb(); } #id-container { width: 100%; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index bbf5e4e1b54..3b8e1fc7329 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -192,7 +192,7 @@ $colortext=join(',', colorStringToArray($colortext)); $colortextlink=join(',', colorStringToArray($colortextlink)); $nbtopmenuentries=$menumanager->showmenu('topnb'); -if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 7); +if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10); $minwidthtmenu=66; /* minimum width for one top menu entry */ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 543ad7fbbdc..d46fe752cb7 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -195,7 +195,7 @@ $colortext=join(',', colorStringToArray($colortext)); $colortextlink=join(',', colorStringToArray($colortextlink)); $nbtopmenuentries=$menumanager->showmenu('topnb'); -if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 7); +if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10); print '/*'."\n"; print 'colorbackbody='.$colorbackbody."\n";