diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php index f87854fbab625c16481636a9e9f1ffce6d01394b..3882d2ebca328186501210d54a74d9344437aff2 100644 --- a/htdocs/contact/agenda.php +++ b/htdocs/contact/agenda.php @@ -212,7 +212,19 @@ else $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>'; - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + $morehtmlref='<div class="refidno">'; + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $objsoc=new Societe($db); + $objsoc->fetch($object->socid); + // Thirdparty + $morehtmlref.=$langs->trans('ThirdParty') . ' : '; + if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1); + else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany"); + } + $morehtmlref.='</div>'; + + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '<div class="fichecenter">'; diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 15b8a5e4462adf6e778cb4ba10976c9667e836bb..e6429fdc6d75397f9afb0413bfcaa36d6e09482a 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1049,7 +1049,18 @@ else $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>'; - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + $morehtmlref='<div class="refidno">'; + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $objsoc->fetch($object->socid); + // Thirdparty + $morehtmlref.=$langs->trans('ThirdParty') . ' : '; + if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1); + else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany"); + } + $morehtmlref.='</div>'; + + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '<div class="fichecenter">'; @@ -1058,24 +1069,6 @@ else print '<div class="underbanner clearboth"></div>'; print '<table class="border tableforfield" width="100%">'; - // Company - if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) - { - print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td>'; - if ($object->socid > 0) - { - $objsoc->fetch($object->socid); - print $objsoc->getNomUrl(1); - } - else - { - print $langs->trans("ContactNotLinkedToCompany"); - } - print '</td>'; - } - - print '</tr>'; - // Civility print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>'; print $object->getCivilityLabel(); diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 825c1e8dab5f0145df2cf0e929415f2b66cb775c..8d003e14cf507f89c342f70340fa27aca7ea50e3 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -109,7 +109,19 @@ if ($object->id) $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>'; - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + $morehtmlref='<div class="refidno">'; + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $objsoc=new Societe($db); + $objsoc->fetch($object->socid); + // Thirdparty + $morehtmlref.=$langs->trans('ThirdParty') . ' : '; + if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1); + else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany"); + } + $morehtmlref.='</div>'; + + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '<div class="fichecenter">'; @@ -117,6 +129,7 @@ if ($object->id) print '<table class="border centpercent">'; // Company + /* if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { if ($object->socid > 0) @@ -133,7 +146,7 @@ if ($object->id) print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } - } + }*/ // Civility print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">'; diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index b205603225b771e8a545d44146222675522a7b12..eed044cdadf454baaec2bba487c157ccff78d8a4 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -76,7 +76,20 @@ if ($id > 0) dol_fiche_head($head, 'note', $title,0,'contact'); $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>'; - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + + $morehtmlref='<div class="refidno">'; + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $objsoc=new Societe($db); + $objsoc->fetch($object->socid); + // Thirdparty + $morehtmlref.=$langs->trans('ThirdParty') . ' : '; + if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1); + else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany"); + } + $morehtmlref.='</div>'; + + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); $cssclass='titlefield'; //if ($action == 'editnote_public') $cssclass='titlefieldcreate'; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 03e6252392287a43a7860c6ee4ee6fd0485ac063..bc4443dd8bf3c296f433b130f90e942077f4e6b3 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -233,7 +233,20 @@ else $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>'; - dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + $morehtmlref='<div class="refidno">'; + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $objsoc=new Societe($db); + $objsoc->fetch($object->socid); + // Thirdparty + $morehtmlref.=$langs->trans('ThirdParty') . ' : '; + if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1); + else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany"); + } + $morehtmlref.='</div>'; + + + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '<div class="fichecenter">'; @@ -242,6 +255,7 @@ else print '<table class="border centpercent">'; // Company + /* if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { if ($object->socid > 0) @@ -258,7 +272,7 @@ else print $langs->trans("ContactNotLinkedToCompany"); print '</td></tr>'; } - } + }*/ // Civility print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';