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

NEW view company name if different of fullname in dol_banner

Browse Source
This commit is contained in:
Regis Houssin 2017-10-09 15:35:08 +02:00
parent ecd55c67e3
commit 16b766182c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3581,7 +3581,7 @@ class Form
} }
else if ($input['type'] == 'password') else if ($input['type'] == 'password')
{ {
$more.='<tr><td>'.$input['label'].'</td><td colspan="2" align="left"><input type="password" class="flat'.$css.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n"; $more.='<tr><td>'.$input['label'].'</td><td colspan="2" align="left"><input type="password" class="flat'.$css.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$m.' /></td></tr>'."\n";
} }
else if ($input['type'] == 'select') else if ($input['type'] == 'select')
{ {
@ -6017,7 +6017,16 @@ class Form
{ {
$ret.=dol_htmlentities($object->name); $ret.=dol_htmlentities($object->name);
} }
else if (in_array($object->element, array('contact', 'user', 'usergroup', 'member'))) else if ($object->element == 'member')
{
$fullname=$object->getFullName($langs);
if ($object->morphy == 'mor') {
$ret.= dol_htmlentities($object->societe) . (($object->societe != $fullname)?' ('.dol_htmlentities($fullname).')':'');
} else {
$ret.= dol_htmlentities($fullname) . (($object->societe != $fullname)?' ('.dol_htmlentities($object->societe).')':'');
}
}
else if (in_array($object->element, array('contact', 'user', 'usergroup')))
{ {
$ret.=dol_htmlentities($object->getFullName($langs)); $ret.=dol_htmlentities($object->getFullName($langs));
} }