Uniformize way to report error after "buildoc" action.

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)
-		if ($result <= 0) {
+		{
-			dol_print_error($db, $result);
+			setEventMessages($object->error, $object->errors, 'errors');
-			exit();
+	        $action='';
-		} else {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
-			exit();
 		}
 	}
 
@@ -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();
 			}

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)
-		if ($result <= 0) {
+		{
-			dol_print_error($db, $result);
+			setEventMessages($object->error, $object->errors, 'errors');
-			exit();
+	        $action='';
-		} else {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
-			exit();
 		}
 	}
 

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)
-		if ($result <= 0) {
+		{
-			dol_print_error($db, $result);
+			setEventMessages($object->error, $object->errors, 'errors');
-			exit();
+	        $action='';
 		}
 	}
 

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);
+			setEventMessages($object->error, $object->errors, 'errors');
-			exit();
+	        $action='';
 		}
 	}
 

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)
-	if ($result <= 0) {
+	{
-		dol_print_error($db, $result);
+		setEventMessages($object->error, $object->errors, 'errors');
-		exit();
+        $action='';
-	} else {
-		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
-		exit();
 	}
 }
 

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);
+			setEventMessages($object->error, $object->errors, 'errors');
-	        exit;
+	        $action='';
 	    }
 	}
 

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);
+		setEventMessages($object->error, $object->errors, 'errors');
-		exit;
+        $action='';
-	}
-	else
-	{
-		Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$depl->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
-		exit;
 	}
 }
 

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);
+			setEventMessages($object->error, $object->errors, 'errors');
-	        exit;
+	        $action='';
 	    }
 	}
 

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);
+			setEventMessages($object->error, $object->errors, 'errors');
-	        exit;
+    	    $action='';
 	    }
 	}
 	// Make calculation according to calculationrule

htdocs/livraison/card.php

@@ -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);
-	}
 	if ($result < 0)
 	{
-		dol_print_error($db,$result);
+		setEventMessages($object->error, $object->errors, 'errors');
-		exit;
+        $action='';
 	}
 }
 

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);
+	        setEventMessages($object->error, $object->errors, 'errors');
-	        exit;
+	        $action='';
 	    }
 	}
 

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);
+		setEventMessages($object->error, $object->errors, 'errors');
-		exit;
+        $action='';
 	}
 }