From dc51eb0b756b89ee25c7b1062d563dc0e7ac5179 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2016 22:21:18 +0200 Subject: [PATCH 1/2] Fix missing badge --- htdocs/core/lib/company.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index fc544a51d93..e0db044c10d 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -79,7 +79,9 @@ function societe_prepare_head(Societe $object) 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++; } From 10e7fa51fc334c87f04569d9a819d36fab04cbfd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jul 2016 23:06:41 +0200 Subject: [PATCH 2/2] Fix missing parameters to provide all information required for substitution hooks --- htdocs/core/lib/functions.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 066f97c142d..1f2a9d1d8d9 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5079,7 +5079,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode= if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg)) { $substitutionarray=array(); - complete_substitutions_array($substitutionarray,$langs,$object); + complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2])); $label=make_substitutions($reg[1], $substitutionarray); } else $label=$langs->trans($values[2]); @@ -5099,7 +5099,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode= if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg)) { $substitutionarray=array(); - complete_substitutions_array($substitutionarray,$langs,$object); + complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2])); $label=make_substitutions($reg[1], $substitutionarray); } else $label=$langs->trans($values[2]);