From 610dc8cd0ccf152def10264cecbc94b9f862963a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 16 Sep 2014 20:38:28 +0200 Subject: [PATCH] Removed deprecated usage of expedition_pdf_create --- htdocs/expedition/fiche.php | 6 +++--- test/phpunit/BuildDocTest.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 15b0a16a13e..b618ac59a80 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -261,7 +261,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret=$object->fetch($id); // Reload to get new records - $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs); + $result = $object->generateDocument($object->modelpdf, $outputlangs); } if ($result < 0) { @@ -362,7 +362,7 @@ else if ($action == 'builddoc') // En get ou en post $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs); + $result = $object->generateDocument($object->modelpdf, $outputlangs); if ($result <= 0) { dol_print_error($db,$result); @@ -1598,7 +1598,7 @@ else if ($id || $ref) // Build document if it not exists if (! $file || ! is_readable($file)) { - $result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref)); if ($result <= 0) { dol_print_error($db,$result); diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 01bfdc73fa8..3f2e9d39b37 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -409,14 +409,14 @@ class BuildDocTest extends PHPUnit_Framework_TestCase // Merou $localobject->modelpdf='merou'; - $result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result= $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n"; // Rouget $localobject->modelpdf='rouget'; - $result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs); + $result= $localobject->generateDocument($localobject->modelpdf, $langs); $this->assertLessThan($result, 0); print __METHOD__." result=".$result."\n";