diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php
index 14d00d43780..c49881ba542 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/comm/askpricesupplier/card.php
@@ -847,13 +847,10 @@ if (empty($reshook))
 		}
 		$ret = $object->fetch($id); // Reload to get new records
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-		if ($result <= 0) {
-			dol_print_error($db, $result);
-			exit();
-		} else {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
-			exit();
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 		}
 	}
 
@@ -1760,7 +1757,8 @@ if ($action == 'create')
 		// Build document if it not exists
 		if (! $file || ! is_readable($file)) {
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
+			if ($result <= 0)
+			{
 				dol_print_error($db, $result);
 				exit();
 			}
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 09c6087860c..5be006c0053 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1065,13 +1065,10 @@ if (empty($reshook))
 		}
 		$ret = $object->fetch($id); // Reload to get new records
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-		if ($result <= 0) {
-			dol_print_error($db, $result);
-			exit();
-		} else {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
-			exit();
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 		}
 	}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6ff12430000..4b7d0104ec9 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1091,10 +1091,10 @@ if (empty($reshook))
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-		if ($result <= 0) {
-			dol_print_error($db, $result);
-			exit();
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 		}
 	}
 
@@ -1316,7 +1316,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
 
 	dol_fiche_head('');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Reference
@@ -1548,7 +1548,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '</table>';
 
 	dol_fiche_end();
-	
+
 	// Button "Create Draft"
 	print '<div class="center"><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '"></div>';
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6621db1d241..88d6bb587e4 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1743,8 +1743,8 @@ if (empty($reshook))
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		if ($result <= 0)
 		{
-			dol_print_error($db, $result);
-			exit();
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 		}
 	}
 
@@ -1970,7 +1970,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
 
 	dol_fiche_head('');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Ref
@@ -2475,7 +2475,7 @@ if ($action == 'create')
 	print "</table>\n";
 
 	dol_fiche_end();
-	
+
 	// Button "Create Draft"
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '">';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index cc9a394d983..dd48b27684f 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -807,13 +807,10 @@ else if ($action == 'builddoc' && $user->rights->contrat->creer) {
 	}
 	$ret = $object->fetch($id); // Reload to get new records
 	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-	if ($result <= 0) {
-		dol_print_error($db, $result);
-		exit();
-	} else {
-		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
-		exit();
+	if ($result <= 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+        $action='';
 	}
 }
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index db8b236feaa..2475f420dd0 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -409,8 +409,8 @@ if (empty($reshook))
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	    if ($result <= 0)
 	    {
-	        dol_print_error($db,$result);
-	        exit;
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 	    }
 	}
 
@@ -611,7 +611,7 @@ if ($action == 'create')
 			$liste = ModelePdfExpedition::liste_modeles($db);
 			print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
             print "</td></tr>\n";
-            
+
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a9ccf2471db..2d9bcbceead 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1030,13 +1030,8 @@ if ($action == 'builddoc')	// GET or POST
 	$result=expensereport_pdf_create($db, $depl, '', $depl->modelpdf, $outputlangs);
 	if ($result <= 0)
 	{
-		dol_print_error($db,$result);
-		exit;
-	}
-	else
-	{
-		Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$depl->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
-		exit;
+		setEventMessages($object->error, $object->errors, 'errors');
+        $action='';
 	}
 }
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 6511bb569e0..35165b33298 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -815,8 +815,8 @@ if (empty($reshook))
 	    $result= $object->generateDocument($object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
 	    if ($result	<= 0)
 	    {
-	        dol_print_error($db,$result);
-	        exit;
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 	    }
 	}
 
@@ -1479,7 +1479,7 @@ if ($action=='create')
 	print '<input type="hidden" name="originid" value="' . $originid . '">';
 
 	dol_fiche_head('');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Ref
@@ -1603,7 +1603,7 @@ if ($action=='create')
     print "</table>\n";
 
     dol_fiche_end();
-    
+
 	print '<div class="center"><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'"></div>';
 
 	print "</form>\n";
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 78119bdbf26..bf310d92f8d 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1083,8 +1083,8 @@ if (empty($reshook))
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	    if ($result	<= 0)
 	    {
-	        dol_print_error($db,$result);
-	        exit;
+			setEventMessages($object->error, $object->errors, 'errors');
+    	    $action='';
 	    }
 	}
 	// Make calculation according to calculationrule
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index f4f46e263c2..fb087e71800 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -82,7 +82,7 @@ if ($action == 'add')
 	$object->note             = $_POST["note"];
 	$object->commande_id      = $_POST["commande_id"];
 	$object->fk_incoterms = GETPOST('incoterm_id', 'int');
-	
+
 	if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
 	{
 		$expedition->entrepot_id     = $_POST["entrepot_id"];
@@ -199,15 +199,12 @@ if ($action == 'builddoc')	// En get ou en post
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	{
-	    $ret=$object->fetch($id);    // Reload to get new records
-		$result= $object->generateDocument($object->modelpdf, $outputlangs);
-	}
+    $ret=$object->fetch($id);    // Reload to get new records
+	$result= $object->generateDocument($object->modelpdf, $outputlangs);
 	if ($result < 0)
 	{
-		dol_print_error($db,$result);
-		exit;
+		setEventMessages($object->error, $object->errors, 'errors');
+        $action='';
 	}
 }
 
@@ -589,7 +586,7 @@ else
 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
-			{			
+			{
 				print '<tr><td>';
 		        print '<table width="100%" class="nobordernopadding"><tr><td>';
 		        print $langs->trans('IncotermLabel');
@@ -603,7 +600,7 @@ else
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
 				}
-				else 
+				else
 				{
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index de45b8a6dab..60384a29da0 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -274,8 +274,8 @@ if (empty($reshook))
 	    $result= $object->generateDocument($object->modelpdf, $outputlangs);
 	    if ($result <= 0)
 	    {
-	        dol_print_error($db,$result);
-	        exit;
+	        setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 	    }
 	}
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 8dd7bac68d8..5d8085efcdd 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -162,8 +162,8 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 	$result= $object->generateDocument($object->modelpdf, $outputlangs);
 	if ($result <= 0)
 	{
-		dol_print_error($db,$result);
-		exit;
+		setEventMessages($object->error, $object->errors, 'errors');
+        $action='';
 	}
 }