diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 92bedc426a5..a7cf0850a27 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1964,7 +1964,7 @@ if ($id > 0 || ! empty($ref)) foreach($propal->linked_object as $object => $objectid) { - if($conf->$object->enabled) + if($conf->$object->enabled && $object != $propal->element) { $somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown); } diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php index b7ed2a484ce..9c755309ae6 100644 --- a/htdocs/comm/propal/propal.class.php +++ b/htdocs/comm/propal/propal.class.php @@ -1518,17 +1518,17 @@ class Propal extends CommonObject // Cas des factures liees directement if ($object == 'facture') { - $linkedInvoices[] = $object[$i]; + $linkedInvoices[] = $objectid[$i]; } // Cas des factures liees via la commande else { - $this->load_object_linked($object[$i],$object); + $this->load_object_linked($objectid[$i],$object,-1,-1); foreach($this->linked_object as $object => $objectid) { for ($j = 0; $jlinked_object as $object => $objectid) { - if($conf->$object->enabled) + if($conf->$object->enabled && $object != $commande->element) { $somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown); } diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index ed6e9767d57..7f843169924 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -558,7 +558,7 @@ if ($id > 0 || ! empty($ref)) foreach($commande->linked_object as $object => $objectid) { - if($conf->$object->enabled) + if($conf->$object->enabled && $object != $commande->element) { $somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown); } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6dbebb75265..3e091584227 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3505,11 +3505,11 @@ else /* * Linked object block */ - $fac->load_object_linked(-1,-1,$fac->id,$fac->element); + $fac->load_object_linked($fac->id,$fac->element); foreach($fac->linked_object as $object => $objectid) { - if($conf->$object->enabled) + if($conf->$object->enabled && $object != $fac->element) { $somethingshown=$fac->showLinkedObjectBlock($object,$objectid,$somethingshown); } diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index fbb03d4bd3e..1566b55908a 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -510,7 +510,7 @@ if ($id > 0 || ! empty($ref)) foreach($propal->linked_object as $object => $objectid) { - if($conf->$object->enabled) + if($conf->$object->enabled && $object != $propal->element) { $somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown); }