From 881a328ea681937dd2957eb89dfe9a963869b3a6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 13 May 2011 09:57:46 +0000 Subject: [PATCH] Fix: linked object block : mutualize code, more simple --- htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php | 4 ++-- htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index 6adce5b8d05..294ed84feea 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -420,7 +420,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder // Add origin linked objects // TODO extend to other objects - $object->getObjectLinked('','',$object->id,'delivery'); + $object->fetchObjectLinked('','',$object->id,'delivery'); if (! empty($object->linkedObjects)) { @@ -428,7 +428,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder foreach($object->linkedObjects as $elementtype => $objects) { - $object->getObjectLinked('','',$objects[0]->id,$objects[0]->element); + $object->fetchObjectLinked('','',$objects[0]->id,$objects[0]->element); foreach($object->linkedObjects as $elementtype => $objects) { diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index a38b7ae2bb7..ffc9b867005 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -549,7 +549,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder // Add origin linked objects // TODO extend to other objects - $object->getObjectLinked('','',$object->id,'delivery'); + $object->fetchObjectLinked('','',$object->id,'delivery'); if (! empty($object->linkedObjects)) { @@ -557,7 +557,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder foreach($object->linkedObjects as $elementtype => $objects) { - $object->getObjectLinked('','',$objects[0]->id,$objects[0]->element); + $object->fetchObjectLinked('','',$objects[0]->id,$objects[0]->element); foreach($object->linkedObjects as $elementtype => $objects) {