FIX scrutinizer

This commit is contained in:
Regis Houssin 2018-12-03 11:21:49 +01:00
parent 7c46ace042
commit 2d8494050f
2 changed files with 3 additions and 3 deletions

View File

@ -2033,8 +2033,8 @@ class Adherent extends CommonObject
$label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
if (! empty($this->firstname) || ! empty($this->lastname))
$label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
if (! empty($this->societe))
$label.= '<br><b>' . $langs->trans('Company') . ':</b> ' . $this->societe;
if (! empty($this->company))
$label.= '<br><b>' . $langs->trans('Company') . ':</b> ' . $this->company;
$label.='</div>';
$url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;

View File

@ -375,7 +375,7 @@ if ($resql)
$staticmember->lastname=$obj->lastname;
$staticmember->firstname=$obj->firstname;
if (! empty($obj->fk_soc)) {
$staticmember->socid = $obj->fk_soc;
$staticmember->fk_soc = $obj->fk_soc;
$staticmember->fetch_thirdparty();
$staticmember->name=$staticmember->thirdparty->name;
} else {