This commit is contained in:
Laurent Destailleur 2022-10-24 10:56:25 +02:00
parent a53a3fb9bf
commit 774f57910f

View File

@ -1473,39 +1473,38 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Categories // Categories
if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) { if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
print '<td colspan="3">'; print '<td>';
print $form->showCategories($object->id, Categorie::TYPE_CONTACT, 1); print $form->showCategories($object->id, Categorie::TYPE_CONTACT, 1);
print '</td></tr>'; print '</td></tr>';
} }
if (!empty($object->socid)) { if (!empty($object->socid)) {
print '<tr><td class="titlefield">'.$langs->trans("ContactByDefaultFor").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("ContactByDefaultFor").'</td>';
print '<td colspan="3">'; print '<td>';
print $formcompany->showRoles("roles", $object, 'view', $object->roles); print $formcompany->showRoles("roles", $object, 'view', $object->roles);
print '</td></tr>'; print '</td></tr>';
} }
// Other attributes // Other attributes
$cols = 3;
$parameters = array('socid'=>$socid); $parameters = array('socid'=>$socid);
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
$object->load_ref_elements(); $object->load_ref_elements();
if (isModEnabled("propal")) { if (isModEnabled("propal")) {
print '<tr><td class="titlefield">'.$langs->trans("ContactForProposals").'</td><td colspan="3">'; print '<tr><td class="titlefield tdoverflow">'.$langs->trans("ContactForProposals").'</td><td>';
print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal"); print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
print '</td></tr>'; print '</td></tr>';
} }
if (isModEnabled('commande') || isModEnabled("expedition")) { if (isModEnabled('commande') || isModEnabled("expedition")) {
print '<tr><td>'; print '<tr><td class="titlefield tdoverflow">';
if (isModEnabled("expedition")) { if (isModEnabled("expedition")) {
print $langs->trans("ContactForOrdersOrShipments"); print $langs->trans("ContactForOrdersOrShipments");
} else { } else {
print $langs->trans("ContactForOrders"); print $langs->trans("ContactForOrders");
} }
print '</td><td colspan="3">'; print '</td><td>';
$none = $langs->trans("NoContactForAnyOrder"); $none = $langs->trans("NoContactForAnyOrder");
if (isModEnabled("expedition")) { if (isModEnabled("expedition")) {
$none = $langs->trans("NoContactForAnyOrderOrShipments"); $none = $langs->trans("NoContactForAnyOrderOrShipments");
@ -1515,18 +1514,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
if (isModEnabled('contrat')) { if (isModEnabled('contrat')) {
print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">'; print '<tr><td class="tdoverflow">'.$langs->trans("ContactForContracts").'</td><td>';
print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract"); print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
print '</td></tr>'; print '</td></tr>';
} }
if (isModEnabled('facture')) { if (isModEnabled('facture')) {
print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">'; print '<tr><td class="tdoverflow">'.$langs->trans("ContactForInvoices").'</td><td>';
print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice"); print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
print '</td></tr>'; print '</td></tr>';
} }
print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td>';
if ($object->user_id) { if ($object->user_id) {
$dolibarr_user = new User($db); $dolibarr_user = new User($db);
$result = $dolibarr_user->fetch($object->user_id); $result = $dolibarr_user->fetch($object->user_id);