diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 27d57d3e48a..aa392489987 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -201,18 +201,12 @@ if ($permission) {
if ($tab[$i]['source']=='internal')
{
- $userstatic->id=$tab[$i]['id'];
- $userstatic->lastname=$tab[$i]['lastname'];
- $userstatic->firstname=$tab[$i]['firstname'];
- $userstatic->photo=$tab[$i]['photo'];
- $userstatic->login=$tab[$i]['login'];
+ $userstatic->fetch($tab[$i]['id']);
echo $userstatic->getNomUrl(-1);
}
if ($tab[$i]['source']=='external')
{
- $contactstatic->id=$tab[$i]['id'];
- $contactstatic->lastname=$tab[$i]['lastname'];
- $contactstatic->firstname=$tab[$i]['firstname'];
+ $contactstatic->fetch($tab[$i]['id']);
echo $contactstatic->getNomUrl(1);
}
?>
@@ -223,16 +217,10 @@ if ($permission) {
id=$tab[$i]['id'];
- $userstatic->lastname=$tab[$i]['lastname'];
- $userstatic->firstname=$tab[$i]['firstname'];
echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
}
if ($tab[$i]['source']=='external')
{
- $contactstatic->id=$tab[$i]['id'];
- $contactstatic->lastname=$tab[$i]['lastname'];
- $contactstatic->firstname=$tab[$i]['firstname'];
echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
}
?>
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index afc33f110cf..9a43c5b3cfa 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1919,7 +1919,7 @@ class Societe extends CommonObject
if (! empty($this->code_fournisseur) && $this->fournisseur)
$label.= '
' . $langs->trans('SupplierCode') . ': '. $this->code_fournisseur;
if (! empty($conf->accounting->enabled) && $this->client)
- $label.= '
' . $langs->trans('CustomerAccountancyCode') . ': '. $this->code_compta_client;
+ $label.= '
' . $langs->trans('CustomerAccountancyCode') . ': '. $this->code_compta;
if (! empty($conf->accounting->enabled) && $this->fournisseur)
$label.= '
' . $langs->trans('SupplierAccountancyCode') . ': '. $this->code_compta_fournisseur;