From 61e90e0d9df7eb3e8dfbccfee609524bce443e52 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 2 Mar 2012 10:26:03 +0100 Subject: [PATCH] Fix: add $hookmanager parameter --- htdocs/core/modules/commande/doc/pdf_edison.modules.php | 9 +++++---- .../core/modules/commande/doc/pdf_einstein.modules.php | 9 +++++---- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 9 +++++---- htdocs/core/modules/facture/doc/pdf_oursin.modules.php | 9 +++++---- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 9 +++++---- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php index 788c67450037f..d1f8ad9f22ef6 100644 --- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php @@ -173,7 +173,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 1, $outputlangs); + $this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -249,7 +249,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 0, $outputlangs); + $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -520,9 +520,10 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output + * @param object $hookmanager Hookmanager object * @return void */ - function _pagehead(&$pdf, $object, $showaddress, $outputlangs) + function _pagehead(&$pdf, $object, $showaddress, $outputlangs ,$hookmanager) { global $conf,$langs,$mysoc; $langs->load("orders"); @@ -651,7 +652,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) $posy+=1; // Add list of linked objects - $linkedobjects = pdf_getLinkedObjects($object,$outputlangs); + $linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); if (! empty($linkedobjects)) { foreach($linkedobjects as $linkedobject) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 33b746ee98daf..156455dc0e88c 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -219,7 +219,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 1, $outputlangs); + $this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -365,7 +365,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 0, $outputlangs); + $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -854,9 +854,10 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output + * @param object $hookmanager Hookmanager object * @return void */ - function _pagehead(&$pdf, $object, $showaddress, $outputlangs) + function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager) { global $conf,$langs; @@ -929,7 +930,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) $posy+=2; // Add list of linked objects - $linkedobjects = pdf_getLinkedObjects($object,$outputlangs); + $linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); if (! empty($linkedobjects)) { foreach($linkedobjects as $linkedobject) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index fe5a8645d4639..8d5b9944f2290 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -219,7 +219,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 1, $outputlangs); + $this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -369,7 +369,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 0, $outputlangs); + $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -999,9 +999,10 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output + * @param object $hookmanager Hookmanager object * @return void */ - function _pagehead(&$pdf, $object, $showaddress, $outputlangs) + function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager) { global $conf,$langs; @@ -1125,7 +1126,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) $posy+=2; // Add list of linked objects - $linkedobjects = pdf_getLinkedObjects($object,$outputlangs); + $linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); if (! empty($linkedobjects)) { foreach($linkedobjects as $linkedobject) diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index 667f3c69b2435..aaa65b27e59d4 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -199,7 +199,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 1, $outputlangs); + $this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -269,7 +269,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 0, $outputlangs); + $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -802,9 +802,10 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $object, $outputlangs) * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output + * @param object $hookmanager Hookmanager object * @return void */ - function _pagehead(&$pdf, $object, $showaddress, $outputlangs) + function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager) { global $langs,$conf; $langs->load("main"); @@ -1002,7 +1003,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) $posy+=1; // Add list of linked objects - $linkedobjects = pdf_getLinkedObjects($object,$outputlangs); + $linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); if (! empty($linkedobjects)) { foreach($linkedobjects as $linkedobject) diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index de95e1d6acf29..d75f28fbabc63 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -204,7 +204,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 1, $outputlangs); + $this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 4, ''); // Set interline to 4 $pdf->SetTextColor(0,0,0); @@ -350,7 +350,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $pdf->AddPage(); if (! empty($tplidx)) $pdf->useTemplate($tplidx); $pagenb++; - $this->_pagehead($pdf, $object, 0, $outputlangs); + $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager); $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(0, 3, ''); // Set interline to 3 $pdf->SetTextColor(0,0,0); @@ -874,9 +874,10 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output + * @param object $hookmanager Hookmanager object * @return void */ - function _pagehead(&$pdf, $object, $showaddress, $outputlangs) + function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager) { global $conf,$langs; $default_font_size = pdf_getPDFFontSize($outputlangs); @@ -970,7 +971,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) $posy+=2; // Add list of linked objects - $linkedobjects = pdf_getLinkedObjects($object,$outputlangs); + $linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager); if (! empty($linkedobjects)) { foreach($linkedobjects as $linkedobject)