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

FIX #10036

Browse Source
This commit is contained in:
Laurent Destailleur 2018-11-19 18:02:29 +01:00
parent 2d09008610
commit 4bedeabc5b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3393,7 +3393,7 @@ class Form
{ {
$unitLabel = $langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label; $unitLabel = $langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label;
} }
if ($selected == $res->rowid) if ($selected == $res->rowid)
{ {
$return.='<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>'; $return.='<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
@ -6531,6 +6531,7 @@ class Form
} }
else if ($object->element == 'member') else if ($object->element == 'member')
{ {
$ret.=$object->ref.'<br>';
$fullname=$object->getFullName($langs); $fullname=$object->getFullName($langs);
if ($object->morphy == 'mor' && $object->societe) { if ($object->morphy == 'mor' && $object->societe) {
$ret.= dol_htmlentities($object->societe) . ((! empty($fullname) && $object->societe != $fullname)?' ('.dol_htmlentities($fullname).')':''); $ret.= dol_htmlentities($object->societe) . ((! empty($fullname) && $object->societe != $fullname)?' ('.dol_htmlentities($fullname).')':'');