From 3a8784a6de87ee3097237e851ce026a21900d3c9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 7 Sep 2013 19:08:08 +0200 Subject: [PATCH] Qual: Mutualize code --- .../expedition/doc/pdf_merou.modules.php | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 492c01be2da..614ccbcc0c1 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -493,31 +493,11 @@ class pdf_merou extends ModelePdfExpedition $pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefSending").': '.$outputlangs->convToOutputCharset($object->ref), '', 'R'); //$this->Code39($Xoff+43, $Yoff+1, $object->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); - // Add list of linked elements - // TODO possibility to use with other elements (business module,...) - //$object->load_object_linked(); - $origin = $object->origin; $origin_id = $object->origin_id; - // TODO move to external function - if ($conf->$origin->enabled) - { - $outputlangs->load('orders'); - - $classname = ucfirst($origin); - $linkedobject = new $classname($this->db); - $result=$linkedobject->fetch($origin_id); - if ($result >= 0) - { - $Yoff = $Yoff+4; - $pdf->SetXY($Xoff,$Yoff); - $pdf->SetFont('','', $default_font_size - 2); - $text=$linkedobject->ref; - if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')'; - $pdf->MultiCell(0, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); - } - } + // Add list of linked elements + $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager); //$this->Code39($Xoff+43, $Yoff+1, $object->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); //Definition Emplacement du bloc Societe