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

Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param

Browse Source 
FIX dom and missing param
This commit is contained in:
Laurent Destailleur 2020-01-22 13:45:06 +01:00 committed by GitHub
commit e96ef17737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/commonobject.class.php
View File

@ -5932,7 +5932,8 @@ abstract class CommonObject
{ {
$param_list=array_keys($param['options']); // $param_list='ObjectName:classPath' $param_list=array_keys($param['options']); // $param_list='ObjectName:classPath'
$showempty=(($required && $default != '')?0:1); $showempty=(($required && $default != '')?0:1);
$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty); $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam);
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
{ {
list($class,$classfile)=explode(':', $param_list[0]); list($class,$classfile)=explode(':', $param_list[0]);

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

@ -5044,11 +5044,11 @@ class Form
{ {
if ($societe_vendeuse->id == $mysoc->id) if ($societe_vendeuse->id == $mysoc->id)
{ {
$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>'; $return.= '<span class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</span>';
} }
else else
{ {
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>'; $return.= '<span class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</span>';
} }
return $return; return $return;
} }