diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 322635354bf..664a44e644a 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -129,7 +129,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=delivery_order_pdf_create($db, $object,$_REQUEST['model'],$outputlangs);
+	    $result= $object->generateDocument($_REQUEST['model'],$outputlangs);
 	}
    	if ($result < 0)
    	{
@@ -202,7 +202,7 @@ if ($action == 'builddoc')	// En get ou en post
 	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	{
 	    $ret=$object->fetch($id);    // Reload to get new records
-    	$result=delivery_order_pdf_create($db, $object, $object->modelpdf, $outputlangs);
+		$result= $object->generateDocument($object->modelpdf, $outputlangs);
 	}
 	if ($result < 0)
 	{
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index b87a89181c5..09b85f38cbe 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -276,7 +276,7 @@ if (empty($reshook))
 	        $outputlangs = new Translate("",$conf);
 	        $outputlangs->setDefaultLang(GETPOST('lang_id'));
 	    }
-	    $result=project_pdf_create($db, $object, $object->modelpdf, $outputlangs);
+	    $result= $object->generateDocument($object->modelpdf, $outputlangs);
 	    if ($result <= 0)
 	    {
 	        dol_print_error($db,$result);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 7337c152f4e..c9539c424b1 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -159,7 +159,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang(GETPOST('lang_id'));
 	}
-	$result=task_pdf_create($db, $object, $object->modelpdf, $outputlangs);
+	$result= $object->generateDocument($object->modelpdf, $outputlangs);
 	if ($result <= 0)
 	{
 		dol_print_error($db,$result);
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index b2ea825f514..e78a6602f6a 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -355,7 +355,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Baleine
         $localobject->modelpdf='baleine';
-        $result=project_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";