Revert change that break compatiblity with 100% of modules
This commit is contained in:
parent
26de415b77
commit
8ecfca5a9e
@ -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;
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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'));
|
||||
|
||||
@ -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>';
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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'));
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user