diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index 03f70955527622ef425d8e71bb0bebabadf6239e..53cacc2b10f7abefeca862fb28d2832d9c6f355c 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 '<br>'.$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 2e149dbc028b4ea4e3d3e1141cb1fd3d46e8fd9f..a0f9f09ff0b3085ef507fe59fce62dd2ef02d722 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?'':'<br>').$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 879a21d334cb8aedfe6a8da27c4a9e2fc5144d2e..77ede3291d403512cee9d8afeee1028b06f1963a 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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f8e728f31b645eac8c9c86f683182d2be3d4ed45..f43bd27505afffb430f156970a46ae21b5844149 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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 252fa872e6fff4124d08d5e2d22a5f5bd0e9d04c..eb1a78c87328a7fa0bf3061128e2b5eff4c88a6c 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?'':'<br>').$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 8eb77d307679a8025d3a5be711f9ffdfccc53ddc..4198640701ee772582a41502d7c09ab5010a9b7c 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1533,8 +1533,11 @@ else
print '<div class="fichecenter"><div class="fichehalfleft">';
print '<a name="builddoc"></a>'; // 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 '</div></div>';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 8415b6dfbad87211bbf1d19386c2e335ff881835..270bc6b1a06fa8fb1fb18145faed49c0d63abf07 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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f3dd64e6838c09efcdf40b35db63e116cb362525..52f476e857edf90d7ff160e7e9f087dd86f1470e 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 310c7e6bb695d7b9745b03bc1b23a056ab1d5a2e..c1990199f54271eb6188c6860f03f07a2e134b58 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5075,17 +5075,6 @@ class Form
<script type="text/javascript">
jQuery(document).ready(function () {
- $(".dropdown dt a").on(\'click\', function () {
- console.log($( this ).parent().parent().find(\'dd ul\'));
- $( this ).parent().parent().find(\'dd ul\').slideToggle(\'fast\');
- // $(".dropdown dd ul").slideToggle(\'fast\');
- });
-
- $(document).bind(\'click\', function (e) {
- var $clicked = $(e.target);
- if (!$clicked.parents().hasClass("dropdown")) $(".dropdown dd ul").hide();
- });
-
$(\'.multiselectcheckbox'.$htmlname.' input[type="checkbox"]\').on(\'click\', function () {
console.log("A new field was added/removed")
$("input:hidden[name=formfilteraction]").val(\'listafterchangingselectedfields\')
@@ -5154,10 +5143,11 @@ class Form
/**
* Show linked object block.
*
- * @param CommonObject $object Object we want to show links to
- * @return int <0 if KO, >0 if OK
+ * @param CommonObject $object Object we want to show links to
+ * @param string $morehtmlright More html to show on right of title
+ * @return int <0 if KO, >=0 if OK
*/
- function showLinkedObjectBlock($object)
+ function showLinkedObjectBlock($object, $morehtmlright='')
{
global $conf,$langs,$hookmanager;
global $bc;
@@ -5172,8 +5162,24 @@ class Form
if (empty($reshook))
{
$num = count($object->linkedObjects);
- $numoutput=0;
+ print '<br>';
+ print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '');
+
+ print '<table class="noborder allwidth">';
+
+ print '<tr class="liste_titre">';
+ print '<td>'.$langs->trans("Type").'</td>';
+ print '<td>'.$langs->trans("Ref").'</td>';
+ print '<td align="center"></td>';
+ print '<td align="center">'.$langs->trans("Date").'</td>';
+ print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';
+ print '<td align="right">'.$langs->trans("Status").'</td>';
+ print '<td></td>';
+ print '</tr>';
+
+ $numoutput=0;
+
foreach($object->linkedObjects as $objecttype => $objects)
{
$tplpath = $element = $subelement = $objecttype;
@@ -5227,39 +5233,26 @@ class Form
global $linkedObjectBlock;
$linkedObjectBlock = $objects;
- if (empty($numoutput))
- {
- $numoutput++;
-
- print '<br>';
- print load_fiche_titre($langs->trans('RelatedObjects'), '', '');
-
- print '<table class="noborder allwidth">';
-
- print '<tr class="liste_titre">';
- print '<td>'.$langs->trans("Type").'</td>';
- print '<td>'.$langs->trans("Ref").'</td>';
- print '<td align="center"></td>';
- print '<td align="center">'.$langs->trans("Date").'</td>';
- print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';
- print '<td align="right">'.$langs->trans("Status").'</td>';
- print '<td></td>';
- print '</tr>';
- }
// Output template part (modules that overwrite templates must declare this into descriptor)
$dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl'));
foreach($dirtpls as $reldir)
{
$res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
- if ($res) break;
+ if ($res)
+ {
+ $numoutput++;
+ break;
+ }
}
}
- if ($numoutput)
+ if (! $numoutput)
{
- print '</table>';
+ print '<tr><td class="opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
}
+
+ print '</table>';
return $num;
}
@@ -5293,6 +5286,7 @@ class Form
'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id)
);
+
foreach($possiblelinks as $key => $possiblelink)
{
$num = 0;
@@ -5346,26 +5340,38 @@ class Form
print '</div>';
if ($num > 0)
{
- print '
- <!-- Add js to show linkto box for '.$key.' ('.$num.' records) -->
- <script type="text/javascript" language="javascript">
- jQuery(document).ready(function() {
- jQuery("#linkto'.$key.'").click(function() {
- jQuery("#'.$key.'list").toggle();
- jQuery("#linkto'.$key.'").toggle();
- });
- });
- </script>
- ';
}
- $linktoelem.=($linktoelem?' ':'');
- if ($num > 0) $linktoelem.='<a href="#linkto'.$key.'" id="linkto'.$key.'">' . $langs->trans($possiblelink['label']) .' ('.$num.')</a>';
+ //$linktoelem.=($linktoelem?' ':'');
+ if ($num > 0) $linktoelem.='<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">' . $langs->trans($possiblelink['label']) .' ('.$num.')</a></li>';
//else $linktoelem.=$langs->trans($possiblelink['label']);
- else $linktoelem.='<a href="#linkto'.$key.'" class="disabled" id="linkto'.$key.'">' . $langs->trans($possiblelink['label']) . '</a>';
+ else $linktoelem.='<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';
}
}
+ $linktoelem='
+ <dl class="dropdown" id="linktoobjectname">
+ <dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>
+ <dd>
+ <div class="multiselectlinkto">
+ <ul class="ulselectedfields">'.$linktoelem.'
+ </ul>
+ </div>
+ </dd>
+ </dl>';
+
+ print '<!-- Add js to show linkto box -->
+ <script type="text/javascript" language="javascript">
+ jQuery(document).ready(function() {
+ jQuery(".linkto").click(function() {
+ console.log("We choose to show/hide link for rel="+jQuery(this).attr(\'rel\'));
+ jQuery("#"+jQuery(this).attr(\'rel\')+"list").toggle();
+ jQuery(this).toggle();
+ });
+ });
+ </script>
+ ';
+
return $linktoelem;
}
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 17e8b547487e16fea429dd4b615df403fb67d2de..bfcfd74811a78e4bede941a73e5310ac061d8126 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 87179b9840f823ec71d1150661769e3a142bcec3..0fd78495dddde0fb1d97f6a9f4d113617531b2fe 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?'':'<br>').$linktoelem;
+ //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+ $somethingshown = $form->showLinkedObjectBlock($object, '');
+
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 020478aa9188a7be2cd20c4ad0474ac363f5428e..23943fd5282e584ecc92552251bd6fa2584a0999 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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
}
+
llxFooter();
$db->close();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 79e0687c372d55c64085105ca75dd8dbcfeb88e8..a123ccd633aeeaef9c3b3132b08fc3197bfc2c28 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1677,12 +1677,10 @@ else if ($id > 0 || ! empty($ref))
//print "<br>\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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 430b9a6903f89c6065ebb93dfc80402def7215db..d800edd8b0d234a39b1af9e9da960f47ce46247c 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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cafb67b50f3b22f09b39a6ab0436a2f6bbe95808..0eada7d918f0004fc378134d6be8687ce0e3fb4d 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?'':'<br>').$linktoelem;
+
+ // Show links to link elements
+ $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice_supplier'));
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 666e29a276dbc561c44109193741270ca52b9efe..7b8e3dd222e12880f9e90d226212ea89c0102118 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 7b47c17f5c7c3462b43662edf0a3b11f0d7863f8..ff541f45d9388954de5f2bf9d84c413dfa332bc6 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 '<br>'.$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 1a02e7186c1f83dfba4300082a57cc5ea28cb6b3..d6d04c7b76bbdb75e094078912d78c389f53c692 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1929,7 +1929,46 @@ if (! function_exists("llxFooter"))
});
</script>' . "\n";
}
-
+
+ // Wrapper to manage dropdown
+ if ($conf->use_javascript_ajax)
+ {
+ print "\n<!-- JS CODE TO ENABLE dropdown -->\n";
+ print '<script type="text/javascript">
+ jQuery(document).ready(function () {
+ $(".dropdown dt a").on(\'click\', function () {
+ //console.log($(this).parent().parent().find(\'dd ul\'));
+ $(this).parent().parent().find(\'dd ul\').slideToggle(\'fast\');
+ // Note: Did not find a way to get exact height (value is update at exit) so i calculate a generic from nb of lines
+ heigthofcontent = 19 * $(this).parent().parent().find(\'dd div ul li\').length;
+ if (heigthofcontent > 300) heigthofcontent = 300; // limited by max-height on css .dropdown dd ul
+ posbottom = $(this).parent().parent().find(\'dd\').offset().top + heigthofcontent + 8;
+ //console.log(posbottom);
+ var scrollBottom = $(window).scrollTop() + $(window).height();
+ //console.log(scrollBottom);
+ diffoutsidebottom = (posbottom - scrollBottom);
+ console.log("diffoutsidebottom (positive = outside) = "+diffoutsidebottom);
+ if (diffoutsidebottom > 0)
+ {
+ pix = "-"+diffoutsidebottom+"px";
+ console.log(pix);
+ $(this).parent().parent().find(\'dd\').css("top", pix);
+ }
+ // $(".dropdown dd ul").slideToggle(\'fast\');
+ });
+ $(".dropdowncloseonclick").on(\'click\', function () {
+ console.log("Link has class dropdowncloseonclick, so we close/hide the popup ul");
+ $(this).parent().parent().hide();
+ });
+
+ $(document).bind(\'click\', function (e) {
+ var $clicked = $(e.target);
+ if (!$clicked.parents().hasClass("dropdown")) $(".dropdown dd ul").hide();
+ });
+ });
+ </script>';
+ }
+
// A div for the address popup
print "\n<!-- A div to allow dialog popup -->\n";
print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index d13460886925d3c4312d74efc7b77d8519699428..f0f54a4e133a0b2d3427b5c6bce6f09792f2a480 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -362,12 +362,6 @@ print '<tr><td class="fieldrequired">'.$langs->trans("Fieldimport_key").'</td><t
}
print '</div>'."\n";
-
- // Example 2 : Adding links to objects
- //$somethingshown=$form->showLinkedObjectBlock($object);
- //$linktoelem = $form->showLinkToObjectBlock($object);
- //if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e461d6d42ac8d72ffa23de6dfb1a2296aeb59d67..e53378e04232d59a5e08d713df60c372bb9442a5 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?'':'<br>').$linktoelem;
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright"><div class="ficheaddleft">';