diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 1e3ea48ce6c..55e7d243f32 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -586,7 +586,7 @@ class Form $disabled=0; $ret='
'; - $ret.=''; // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks. $parameters=array(); diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 6f12bd4ca37..08ec66f8ea3 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -216,6 +216,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set. ErrorURLMustStartWithHttp=URL %s must start with http:// or https:// +ErrorNewRefIsAlreadyUsed=Error, the new reference is already used # Warnings WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. WarningMandatorySetupNotComplete=Click here to setup mandatory parameters diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 200cd1c7dd5..5d68dd5b495 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1095,7 +1095,8 @@ if (! function_exists("llxHeader")) // If theme MD and classic layer, we open the menulayer by default. if ($conf->theme == 'md' && ! in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { - $tmpcsstouse=$morecssonbody; + global $mainmenu; + if ($mainmenu != 'website') $tmpcsstouse=$morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default. } print '' . "\n"; diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index 266eac65ebc..6bbfb6ac472 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -532,7 +532,7 @@ class Website extends CommonObject // Check no site with ref exists if ($object->fetch(0, $newref) > 0) { - $this->error='NewRefIsAlreadyUsed'; + $this->error='ErrorNewRefIsAlreadyUsed'; return -1; }