diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index 03f70955527..53cacc2b10f 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -322,9 +322,9 @@ if ($id && (empty($action) || $action == 'view' || $action == 'delete'))
// Example 2 : Adding links to objects
- //$somethingshown=$form->showLinkedObjectBlock($object);
- //$linktoelem = $form->showLinkToObjectBlock($object);
- //if ($linktoelem) print '
'.$linktoelem;
+ // Show links to link elements
+ //$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
+ //$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
}
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index 2e149dbc028..a0f9f09ff0b 100644
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -419,14 +419,16 @@ if ($rowid && $action != 'edit')
print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
$somethingshown = $formfile->numoffiles;
*/
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($object);
+ // Show links to link elements
+ //$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
+ $somethingshown = $form->showLinkedObjectBlock($object, '');
// Show links to link elements
/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
// Link for paypal payment
+ /*
if (! empty($conf->paypal->enabled) && $object->statut != 0) {
include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
print showPaypalPaymentUrl('invoice', $object->ref);
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 879a21d334c..77ede3291d4 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2320,12 +2320,9 @@ 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);
-
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '
';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f8e728f31b6..f43bd27505a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2585,12 +2585,10 @@ if ($action == 'create' && $user->rights->commande->creer)
$delallowed = $user->rights->commande->supprimer;
$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);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '
';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 252fa872e6f..eb1a78c8732 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -4018,12 +4018,9 @@ else if ($id > 0 || ! empty($ref))
print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
$somethingshown = $formfile->numoffiles;
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($object);
-
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
// Link for paypal payment
if (! empty($conf->paypal->enabled) && $object->statut != 0) {
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 8eb77d30767..4198640701e 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1533,8 +1533,11 @@ else
print '
';
print '
'; // ancre
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($object);
+
+ // Show links to link elements
+ //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+ $somethingshown = $form->showLinkedObjectBlock($object, '');
+
print '
';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 8415b6dfbad..270bc6b1a06 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1992,12 +1992,10 @@ 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);
-
+
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '
';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f3dd64e6838..52f476e857e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3196,20 +3196,6 @@ abstract class CommonObject
// TODO: All functions here must be redesigned and moved as they are not business functions but output functions
// --------------------
- /**
- * Show linked object block.
- *
- * @return int <0 if KO, >0 if OK
- * @deprecated 3.8 Use instead $form->showLinkedObjectBlock($object)
- * @see Form::showLinkedObjectBlock
- */
- function showLinkedObjectBlock()
- {
- global $form;
- return $form->showLinkedObjectBlock($this);
- }
-
-
/* This is to show add lines */
/**
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 310c7e6bb69..c1990199f54 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5075,17 +5075,6 @@ class Form
- ';
}
- $linktoelem.=($linktoelem?' ':'');
- if ($num > 0) $linktoelem.='
' . $langs->trans($possiblelink['label']) .' ('.$num.')';
+ //$linktoelem.=($linktoelem?' ':'');
+ if ($num > 0) $linktoelem.='
' . $langs->trans($possiblelink['label']) .' ('.$num.')';
//else $linktoelem.=$langs->trans($possiblelink['label']);
- else $linktoelem.='
' . $langs->trans($possiblelink['label']) . '';
+ else $linktoelem.='
' . $langs->trans($possiblelink['label']) . ' (0)';
}
}
+ $linktoelem='
+
+ - '.$langs->trans("LinkTo").'...
+ -
+
+
+
';
+
+ print '
+
+ ';
+
return $linktoelem;
}
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 17e8b547487..bfcfd74811a 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -948,6 +948,7 @@ function copyToClipboard(text,text2)
return false;
}
+
/*
* Function show document preview
*
@@ -1128,3 +1129,5 @@ function price2numjs(amount) {
return res;
}
+
+
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 87179b9840f..0fd78495ddd 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1831,12 +1831,11 @@ 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);
-
+
// Show links to link elements
- //$linktoelem = $form->showLinkToObjectBlock($object);
- //if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+ $somethingshown = $form->showLinkedObjectBlock($object, '');
+
print '
';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 020478aa918..23943fd5282 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2069,15 +2069,15 @@ if ($action != 'create' && $action != 'edit' && ($id || $ref))
$object->fetch_thirdparty();
$result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
}
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($object);
-
+
// Show links to link elements
$linktoelements=array();
if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION)) $linktoelements[]='fichinter';
$linktoelem = $form->showLinkToObjectBlock($object, $linktoelements, array('expensereport'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
}
+
llxFooter();
$db->close();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 79e0687c372..a123ccd633a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1677,12 +1677,10 @@ else if ($id > 0 || ! empty($ref))
//print "
\n";
$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);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('fichinter'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '
';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 430b9a6903f..d800edd8b0d 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2831,12 +2831,10 @@ elseif (! empty($object->id))
print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$object->thirdparty->default_lang);
$somethingshown=$formfile->numoffiles;
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('order_supplier'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '
';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cafb67b50f3..0eada7d918f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2236,12 +2236,10 @@ else
print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang);
$somethingshown=$formfile->numoffiles;
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($object);
-
- // Show links to link elements
- $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice_supplier'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+
+ // Show links to link elements
+ $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice_supplier'));
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '
';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 666e29a276d..7b8e3dd222e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -644,6 +644,7 @@ NewAttribute=New attribute
AttributeCode=Attribute code
URLPhoto=URL of photo/logo
SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
LinkToProposal=Link to proposal
LinkToOrder=Link to order
LinkToInvoice=Link to invoice
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 7b47c17f5c7..ff541f45d93 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -680,12 +680,9 @@ else
$shipment = new Expedition($db);
$shipment->fetch($object->origin_id);
- // Linked object block
- $somethingshown = $form->showLinkedObjectBlock($shipment);
-
- // Show links to link elements
- //$linktoelem = $form->showLinkToObjectBlock($shipment);
- //if ($linktoelem) print '
'.$linktoelem;
+ // Show links to link elements
+ //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+ $somethingshown = $form->showLinkedObjectBlock($object, '');
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1a02e7186c1..d6d04c7b76b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1929,7 +1929,46 @@ if (! function_exists("llxFooter"))
});
' . "\n";
}
-
+
+ // Wrapper to manage dropdown
+ if ($conf->use_javascript_ajax)
+ {
+ print "\n\n";
+ print '';
+ }
+
// A div for the address popup
print "\n\n";
print ''."\n";
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index d1346088692..f0f54a4e133 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -362,12 +362,6 @@ print '
| '.$langs->trans("Fieldimport_key").' | '."\n";
-
- // Example 2 : Adding links to objects
- //$somethingshown=$form->showLinkedObjectBlock($object);
- //$linktoelem = $form->showLinkToObjectBlock($object);
- //if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
-
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e461d6d42ac..e53378e0423 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1805,12 +1805,10 @@ 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);
-
+
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_proposal'));
- if ($linktoelem) print ($somethingshown?'':'
').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '