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

Merge remote-tracking branch 'origin/3.9' into 4.0

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-14 00:35:59 +02:00
commit 9bd937a3bc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/company.lib.php
View File

@ -79,7 +79,9 @@ function societe_prepare_head(Societe $object)
if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
{ {
$head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id; $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"); $head[$h][1] = $langs->trans("ContactsAddresses");
if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
$head[$h][2] = 'contact'; $head[$h][2] = 'contact';
$h++; $h++;
} }

4
htdocs/core/lib/functions.lib.php
View File

@ -5257,7 +5257,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg)) if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
{ {
$substitutionarray=array(); $substitutionarray=array();
complete_substitutions_array($substitutionarray,$langs,$object); complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
$label=make_substitutions($reg[1], $substitutionarray); $label=make_substitutions($reg[1], $substitutionarray);
} }
else $label=$langs->trans($values[2]); else $label=$langs->trans($values[2]);
@ -5277,7 +5277,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg)) if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
{ {
$substitutionarray=array(); $substitutionarray=array();
complete_substitutions_array($substitutionarray,$langs,$object); complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
$label=make_substitutions($reg[1], $substitutionarray); $label=make_substitutions($reg[1], $substitutionarray);
} }
else $label=$langs->trans($values[2]); else $label=$langs->trans($values[2]);