diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2999833e81e..b5e036a708c 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -50,26 +50,38 @@ function societe_prepare_head(Societe $object)
$head[$h][2] = 'card';
$h++;
- if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
- {
- //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
- $nbContact = 0; // TODO
-
- $sql = "SELECT COUNT(p.rowid) as nb";
- $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
- $sql .= " WHERE p.fk_soc = ".$object->id;
- $resql = $db->query($sql);
- if ($resql)
+ if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
+ {
+ if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- $obj = $db->fetch_object($resql);
- if ($obj) $nbContact = $obj->nb;
- }
+ //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+ $nbContact = 0; // TODO
- $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
- $head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= ' '.$nbContact.'';
- $head[$h][2] = 'contact';
- $h++;
+ $sql = "SELECT COUNT(p.rowid) as nb";
+ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
+ $sql .= " WHERE p.fk_soc = ".$object->id;
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $obj = $db->fetch_object($resql);
+ if ($obj) $nbContact = $obj->nb;
+ }
+
+ $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
+ $head[$h][1] = $langs->trans('ContactsAddresses');
+ if ($nbContact > 0) $head[$h][1].= ' '.$nbContact.'';
+ $head[$h][2] = 'contact';
+ $h++;
+ }
+ }
+ else
+ {
+ $head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
+ $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+ $head[$h][1] = $langs->trans("ContactsAddresses");
+ if ($nbContact > 0) $head[$h][1].= ' '.$nbContact.'';
+ $head[$h][2] = 'contact';
+ $h++;
}
if ($object->client==1 || $object->client==2 || $object->client==3)
@@ -100,16 +112,6 @@ function societe_prepare_head(Societe $object)
$h++;
}
- if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
- {
- $head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
- $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
- $head[$h][1] = $langs->trans("ContactsAddresses");
- if ($nbContact > 0) $head[$h][1].= ' '.$nbContact.'';
- $head[$h][2] = 'contact';
- $h++;
- }
-
if (! empty($conf->projet->enabled) && (!empty($user->rights->projet->lire) ))
{
$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 714f155120d..0aab07bb398 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6940,6 +6940,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
foreach($head as $key => $val)
{
$condition = (! empty($values[3]) ? verifCond($values[3]) : 1);
+ //var_dump($key.' - '.$tabname.' - '.$head[$key][2].' - '.$condition);
if ($head[$key][2]==$tabname && $condition)
{
unset($head[$key]);