lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: view linked object block

Browse Source
This commit is contained in:
Regis Houssin 2010-04-17 09:55:10 +00:00
parent 846ed3688e
commit f6175c2213
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -1964,7 +1964,7 @@ if ($id > 0 || ! empty($ref))
foreach($propal->linked_object as $object => $objectid) foreach($propal->linked_object as $object => $objectid)
{ {
if($conf->$object->enabled) if($conf->$object->enabled && $object != $propal->element)
{ {
$somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown); $somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown);
} }

6
htdocs/comm/propal/propal.class.php
View File

@ -1518,17 +1518,17 @@ class Propal extends CommonObject
// Cas des factures liees directement // Cas des factures liees directement
if ($object == 'facture') if ($object == 'facture')
{ {
$linkedInvoices[] = $object[$i]; $linkedInvoices[] = $objectid[$i];
} }
// Cas des factures liees via la commande // Cas des factures liees via la commande
else else
{ {
$this->load_object_linked($object[$i],$object); $this->load_object_linked($objectid[$i],$object,-1,-1);
foreach($this->linked_object as $object => $objectid) foreach($this->linked_object as $object => $objectid)
{ {
for ($j = 0; $j<sizeof($objectid);$j++) for ($j = 0; $j<sizeof($objectid);$j++)
{ {
$linkedInvoices[] = $object[$j]; $linkedInvoices[] = $objectid[$j];
} }
} }
} }

2
htdocs/commande/fiche.php
View File

@ -2223,7 +2223,7 @@ else
foreach($commande->linked_object as $object => $objectid) foreach($commande->linked_object as $object => $objectid)
{ {
if($conf->$object->enabled) if($conf->$object->enabled && $object != $commande->element)
{ {
$somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown); $somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown);
} }

2
htdocs/compta/commande/fiche.php
View File

@ -558,7 +558,7 @@ if ($id > 0 || ! empty($ref))
foreach($commande->linked_object as $object => $objectid) foreach($commande->linked_object as $object => $objectid)
{ {
if($conf->$object->enabled) if($conf->$object->enabled && $object != $commande->element)
{ {
$somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown); $somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown);
} }

4
htdocs/compta/facture.php
View File

@ -3505,11 +3505,11 @@ else
/* /*
* Linked object block * 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) foreach($fac->linked_object as $object => $objectid)
{ {
if($conf->$object->enabled) if($conf->$object->enabled && $object != $fac->element)
{ {
$somethingshown=$fac->showLinkedObjectBlock($object,$objectid,$somethingshown); $somethingshown=$fac->showLinkedObjectBlock($object,$objectid,$somethingshown);
} }

2
htdocs/compta/propal.php
View File

@ -510,7 +510,7 @@ if ($id > 0 || ! empty($ref))
foreach($propal->linked_object as $object => $objectid) foreach($propal->linked_object as $object => $objectid)
{ {
if($conf->$object->enabled) if($conf->$object->enabled && $object != $propal->element)
{ {
$somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown); $somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown);
} }