diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index fe705fa99b8..da8fadb6bb0 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -2096,16 +2096,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $somethingshown = $formfile->numoffiles; // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('subscription'), 1); //$somethingshown = $form->showLinkedObjectBlock($object, ''); - // Show links to link elements - /*$linktoelem = $form->showLinkToObjectBlock($object,array('order')); - if ($linktoelem) { - print ($somethingshown?'':'
').$linktoelem; - } - */ - // Show online payment link // The list can be complete by the hook 'doValidatePayment' executed inside getValidOnlinePaymentMethods() include_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index 17e8b2f75c3..014dc3439fd 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -395,13 +395,9 @@ if ($rowid && $action != 'edit') { $somethingshown = $formfile->numoffiles; */ // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('subscription'), 1); $somethingshown = $form->showLinkedObjectBlock($object, ''); - // Show links to link elements - /*$linktoelem = $form->showLinkToObjectBlock($object,array('order')); - if ($linktoelem) print ($somethingshown?'':'
').$linktoelem; - */ print '
'; diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 2be78c16820..c9e42b09ca3 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -407,7 +407,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('asset')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('asset'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index ee23d88b81c..ff00bf61fd1 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -806,7 +806,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('bom')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('bom'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php index 512fd618c44..c548901716b 100644 --- a/htdocs/bookcal/availabilities_card.php +++ b/htdocs/bookcal/availabilities_card.php @@ -589,7 +589,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('availabilities')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('availabilities'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php index 30e3bf7b8e4..37bb9d64e8e 100644 --- a/htdocs/bookcal/calendar_card.php +++ b/htdocs/bookcal/calendar_card.php @@ -531,7 +531,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('calendar')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('calendar'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index d021180efe3..0483f722a1b 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -3240,7 +3240,10 @@ if ($action == 'create') { print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('propal')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('propal'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; $compatibleImportElementsList = false; if ($user->hasRight('propal', 'creer') && $object->statut == Propal::STATUS_DRAFT) { diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 1ad68e6a87a..f3fb59cbbc1 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -3161,7 +3161,10 @@ if ($action == 'create' && $usercancreate) { // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('order')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('order'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; $compatibleImportElementsList = false; if ($usercancreate diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index feb18b17e44..1f212f85e74 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -1704,7 +1704,10 @@ if ($action == 'create') { // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('invoice'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index d3542ca22b9..796562a1f19 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -6098,7 +6098,10 @@ if ($action == 'create') { $somethingshown = $formfile->numoffiles; // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('invoice')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('invoice'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; $compatibleImportElementsList = false; if ($usercancreate diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index faa4c2e26d6..1abd800de50 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -861,7 +861,7 @@ if ($id > 0) { } // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('myobject'), 1); //$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 03ac361fead..b3636f64cdb 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -849,7 +849,7 @@ if ($id > 0) { } // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('myobject'), 1); //$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 103572c664b..6c14667af5e 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -2344,7 +2344,11 @@ if ($action == 'create') { // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('contrat')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('contrat'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show online signature link diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 48ab53f7ee6..36b6df7d05a 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -9686,12 +9686,12 @@ class Form $htmltoenteralink .= '
'."\n"; $htmltoenteralink .= ''."\n"; $htmltoenteralink .= '
'; - $htmltoenteralink .= ''; - $htmltoenteralink .= ''; $htmltoenteralink .= ''; + $htmltoenteralink .= ''; + $htmltoenteralink .= ''; $htmltoenteralink .= ''; $htmltoenteralink .= ''; - $htmltoenteralink .= ''; + $htmltoenteralink .= ''; //print ''; $htmltoenteralink .= '
' . $langs->trans("Ref") . ' '; $htmltoenteralink .= ' '; @@ -9710,11 +9710,13 @@ class Form if ($num > 0) { // Section for free predefined list - $htmltoenteralink .= '
'; + if (getDolGlobalString('MAIN_HIDE_LINK_BY_REF_IN_LINKTO')) { + $htmltoenteralink .= '
'; + } $htmltoenteralink .= ''."\n"; $htmltoenteralink .= ''; - $htmltoenteralink .= ''; $htmltoenteralink .= ''; + $htmltoenteralink .= ''; $htmltoenteralink .= ''; $htmltoenteralink .= ''; $htmltoenteralink .= ''; diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php index 93c64a85267..650f23738a3 100644 --- a/htdocs/delivery/card.php +++ b/htdocs/delivery/card.php @@ -689,7 +689,7 @@ if ($action == 'create') { $shipment->fetch($object->origin_id); // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('order'), 1); $somethingshown = $form->showLinkedObjectBlock($object, ''); } diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 581ff2235f3..bbea9dfa1c4 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -955,7 +955,11 @@ if (!empty($id) && $action != 'edit') { print $formfile->showdocuments('donation', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('don')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('don'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show online payment link diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php index d2f6b8178a3..5b3a04c2ead 100644 --- a/htdocs/eventorganization/conferenceorbooth_card.php +++ b/htdocs/eventorganization/conferenceorbooth_card.php @@ -642,7 +642,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('conferenceorbooth')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('conferenceorbooth'), 1); //$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); $object->fetchObjectLinked(); diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php index 90a0c3d2fe1..5e67d20b245 100644 --- a/htdocs/eventorganization/conferenceorboothattendee_card.php +++ b/htdocs/eventorganization/conferenceorboothattendee_card.php @@ -646,7 +646,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('conferenceorboothattendee')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('conferenceorboothattendee'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 8e3e73a76e1..99daf410cb2 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2802,7 +2802,11 @@ if ($action == 'create') { // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('shipping')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('shipping'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show online signature link diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 8d483d20575..fbae72d390f 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2918,7 +2918,11 @@ if ($action != 'presend') { /* if ($action != 'create' && $action != 'edit' && ($id || $ref)) { - $linktoelem = $form->showLinkToObjectBlock($object, null, array('expensereport')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('expensereport'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); } */ diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index af9afcc555b..af6603d7b8d 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1862,7 +1862,11 @@ if ($action == 'create') { print $formfile->showdocuments('ficheinter', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('fichinter')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('fichinter'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show direct download link diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 1dd3dbd636c..77acc5ce909 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2677,7 +2677,11 @@ if ($action == 'create') { $somethingshown = $formfile->numoffiles; // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('supplier_order', 'order_supplier')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('supplier_order', 'order_supplier'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
'; diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php index 46a6cd42067..93a19a4a6f6 100644 --- a/htdocs/fourn/facture/card-rec.php +++ b/htdocs/fourn/facture/card-rec.php @@ -1591,7 +1591,10 @@ if ($action == 'create') { print ''; // ancre // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('invoice'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 9f3106deff3..6fe27abd9d9 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -4165,7 +4165,11 @@ if ($action == 'create') { $somethingshown = $formfile->numoffiles; // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('invoice_supplier')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('invoice_supplier'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
'; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index e16e0911bf0..6c8ec8c294d 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -1654,7 +1654,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') { } // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('myobject'), 1); //$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php index 14daf73f211..992c330178f 100644 --- a/htdocs/hrm/evaluation_card.php +++ b/htdocs/hrm/evaluation_card.php @@ -699,7 +699,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('evaluation')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('evaluation'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php index 2a436cbc17c..5acebfefecc 100644 --- a/htdocs/hrm/job_card.php +++ b/htdocs/hrm/job_card.php @@ -511,9 +511,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('job')); - $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('job'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
'; diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php index 26e30632889..c0d00ce4297 100644 --- a/htdocs/hrm/position_card.php +++ b/htdocs/hrm/position_card.php @@ -384,9 +384,12 @@ if ($action !== 'edit' && $action !== 'create') { print '
'; // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('position')); - $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('position'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
'; diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php index 036f52e55ba..cc939f442d3 100644 --- a/htdocs/hrm/skill_card.php +++ b/htdocs/hrm/skill_card.php @@ -890,7 +890,11 @@ if ($action != "create" && $action != "edit") { print '
'; // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('skill')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('skill'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
'; diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php index 4c978061a26..6507d235cce 100644 --- a/htdocs/intracommreport/card.php +++ b/htdocs/intracommreport/card.php @@ -568,9 +568,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('intracommreport')); - $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('intracommreport'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
'; diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php index 2ec414ecbb5..bfc0c128608 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_card.php +++ b/htdocs/knowledgemanagement/knowledgerecord_card.php @@ -545,7 +545,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('knowledgerecord')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('knowledgerecord'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 9ec0e0d7652..04a43ece6dd 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -618,7 +618,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('myobject')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('myobject'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php index b2bb5860eb5..a3925f85970 100644 --- a/htdocs/mrp/mo_card.php +++ b/htdocs/mrp/mo_card.php @@ -858,7 +858,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('mo')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('mo'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false); diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php index b4b75732c66..641a0ecc116 100644 --- a/htdocs/partnership/partnership_card.php +++ b/htdocs/partnership/partnership_card.php @@ -654,7 +654,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('partnership')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('partnership'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index a56f734d006..bc71bc8828e 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -473,7 +473,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('inventory')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('inventory'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php index 51909829285..3ad11aee2df 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php @@ -1112,7 +1112,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('stocktransfer')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('stocktransfer'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index fb8ab168043..cf11682a4a2 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -760,7 +760,10 @@ if ($id > 0 || !empty($ref)) { print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('project_task')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('project_task'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; $compatibleImportElementsList = false; $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList); diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index cb2e7fea3f8..4f7a5d1ef01 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -2243,7 +2243,7 @@ if ($action == 'create') { print $formfile->showdocuments('reception', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang); // Show links to link elements - //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order')); + //$tmparray = $form->showLinkToObjectBlock($object, null, array('order'), 1); $somethingshown = $form->showLinkedObjectBlock($object, ''); print '
'; diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php index 7025b1758dd..9be8841e044 100644 --- a/htdocs/recruitment/recruitmentcandidature_card.php +++ b/htdocs/recruitment/recruitmentcandidature_card.php @@ -636,7 +636,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('recruitmentcandidature')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('recruitmentcanidature'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php index b7030f3aad1..1290641d2ff 100644 --- a/htdocs/recruitment/recruitmentjobposition_card.php +++ b/htdocs/recruitment/recruitmentjobposition_card.php @@ -481,7 +481,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('recruitmentjobposition')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('recruitmentjobposition'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show link to public job page diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 8357653f038..9fd577354da 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -1180,7 +1180,11 @@ if ($id > 0) { // Show links to link elements /* - $linktoelem = $form->showLinkToObjectBlock($object, null, array('salaries')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('salaries'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); */ diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 80f0a3393d9..1147801f3dd 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -2043,8 +2043,13 @@ if ($action == 'create') { // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array('supplier_proposal')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('supplier_proposal'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); + $MAXEVENT = 10; print '
'; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index faeccef61a2..b33e0eefe22 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -1636,7 +1636,11 @@ if ($action == 'create' || $action == 'presend') { print $formfile->showdocuments('ticket', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $codelang); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, array('ticket')); + $tmparray = $form->showLinkToObjectBlock($object, array(), array('ticket'), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show direct link to public interface diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 8c775b2bffc..c2f7e154775 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2978,7 +2978,11 @@ if ($action == 'create' || $action == 'adduserldap') { $somethingshown = $formfile->numoffiles; // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, array(), array()); + $tmparray = $form->showLinkToObjectBlock($object, array(), array(), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); $MAXEVENT = 10; diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index f9a800fd495..2ee2ac56f2f 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -480,7 +480,11 @@ if ($action == 'create') { $somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $mysoc->default_lang); // Show links to link elements - $linktoelem = $form->showLinkToObjectBlock($object, null, null); + $tmparray = $form->showLinkToObjectBlock($object, array(), array(), 1); + $linktoelem = $tmparray['linktoelem']; + $htmltoenteralink = $tmparray['htmltoenteralink']; + print $htmltoenteralink; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); print '
';