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

Fix error message

Browse Source
This commit is contained in:
Laurent Destailleur 2019-04-03 16:16:51 +02:00
parent 76bf412f95
commit eb6bd20132
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@ -586,7 +586,7 @@ class Form
$disabled=0;
$ret='<div class="centpercent center">';
$ret.='<select class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
$ret.='<select class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect valignmiddle" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
// 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();

1
htdocs/langs/en_US/errors.lang
View File

@ -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

3
htdocs/main.inc.php
View File

@ -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 '<body id="mainbody" class="'.$tmpcsstouse.'">' . "\n";

2
htdocs/website/class/website.class.php
View File

@ -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;
}