diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php index ac7e7169fd15e01af8209347d62b99f238cd2310..b122e9a86c7a5e8e5617b3754ab8ffe5862850ed 100644 --- a/dev/skeletons/skeleton_card.php +++ b/dev/skeletons/skeleton_card.php @@ -322,7 +322,7 @@ if ($id && (empty($action) || $action == 'view' || $action == 'delete')) // Example 2 : Adding links to objects - //$somethingshown=Form::showLinkedObjectBlock($object); + //$somethingshown=$form->showLinkedObjectBlock($object); //$linktoelem = $form->showLinkToObjectBlock($object); //if ($linktoelem) print '<br>'.$linktoelem; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 234eeaf149c879e3ad96d869779393f2b49329c9..129a2f2dfbd4a9e3889351a4ded06ceac5a3e8d0 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2350,7 +2350,7 @@ if ($action == 'create') $somethingshown = $formfile->show_documents('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 53625d0e5fd8b7665c6495ad2f3f1dea227fd6d1..43821645ac9823e202c4cbe2c351639b0bbf8de6 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2584,7 +2584,7 @@ if ($action == 'create' && $user->rights->commande->creer) $somethingshown = $formfile->show_documents('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e803ca5174652850cbb7f04944ebfdbd58866ea2..20abcd4c1af141713a68510d495a39c1af24f051 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -4046,7 +4046,7 @@ else if ($id > 0 || ! empty($ref)) $somethingshown = $formfile->numoffiles; // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object,array('order')); diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 9d1b88887b0928cafc78835a45ccb7acff4dee14..81844fbbaa9508a9a9c73dff7b57e427d3ee9d4e 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -983,7 +983,7 @@ else print '<a name="builddoc"></a>'; // ancre // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); print '</div></div>'; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 3170a6b0b56be6e5ba946836f550bd94af222887..20171da0cd996136a7746d058381292fdfe119c4 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -2015,7 +2015,7 @@ else $somethingshown = $formfile->show_documents('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index d44230d3eb6ed88cc85cb966d9a5d2f3f59da228..a65573a794728af53304e911a92eee0215650752 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3115,13 +3115,13 @@ abstract class CommonObject * Show linked object block. * * @return int <0 if KO, >0 if OK - * @deprecated 3.8 Use instead Form::showLinkedObjectBlock($object) + * @deprecated 3.8 Use instead $form->showLinkedObjectBlock($object) * @see Form::showLinkedObjectBlock */ function showLinkedObjectBlock() { global $form; - return Form::showLinkedObjectBlock($this); + return $form->showLinkedObjectBlock($this); } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 667f76bf7315bf353a57c1c3aa8c155a6d0f36bd..188620264610a97687190a6fb832f4bb427070ae 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5063,7 +5063,7 @@ class Form * @param CommonObject $object Object we want to show links to * @return int <0 if KO, >0 if OK */ - function showLinkedObjectBlock($object) + function showLinkedObjectBlock(CommonObject $object) { global $conf,$langs,$hookmanager; global $bc; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index c69a037613fec74eb2df548cb84ac943c37afa68..e1f4d49319efbcfb5dbc033f5f2e8b00c730a995 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1802,7 +1802,7 @@ else if ($id || $ref) $somethingshown=$formfile->show_documents('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index e4a01267ab083c125cdc83067cfb43ac892d0021..8660336a4cd33f539ba863edc851381551b733b8 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2107,7 +2107,7 @@ if ($action != 'create' && $action != 'edit' && ($id || $ref)) $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter')); } // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements $linktoelements=array(); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 0e8f1810258a03dce5ffb14fde23c01b446ca29f..a45f3e90ef091640656ca7cf7ed815fc90d085f0 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1783,7 +1783,7 @@ else if ($id > 0 || ! empty($ref)) $somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 8f59c743d187c158dfd92e457c7e5a8597537b95..326b0eba07e037f6afd4c5e7709e6d617a2e3670 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2954,7 +2954,7 @@ elseif (! empty($object->id)) $somethingshown=$formfile->numoffiles; // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 0ce28c7e427422b1364f2fc03105eeca871ca8ea..9c2e6699fed284f1ce80a7b2b3fcce50cf60567b 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2371,7 +2371,7 @@ else $somethingshown=$formfile->numoffiles; // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object,array('supplier_order')); diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 6383bdfd5e59bb82751a5c4248b4d92b6558437a..f3cc1084fa27ec976189a665d25c9405f282397d 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -887,7 +887,7 @@ else $shipment->fetch($object->origin_id); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($shipment); + $somethingshown = $form->showLinkedObjectBlock($shipment); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($shipment); diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 3dfa958dd3f72bf8a6b65cfe7a18408ea494e563..332d1c7a0d39c2719263a2367f35815491304b4e 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1832,7 +1832,7 @@ if ($action == 'create') $somethingshown = $formfile->show_documents('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block - $somethingshown = Form::showLinkedObjectBlock($object); + $somethingshown = $form->showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object);