Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-28 04:11:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed expense report document generation. Cleaned error messages.

Browse Source
This commit is contained in:
William Mead
2025-12-17 13:41:41 +01:00
parent 0c2b34be80
commit c8b4ad24bd
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/api/class/api_documents.class.php
View File

@@ -268,7 +268,7 @@ class Documents extends DolibarrApi
$result = $tmpobject->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) {
throw new RestException(500, 'Error generating document missing doctemplate parameter');
throw new RestException(500, 'Error generating document');
}
} elseif ($modulepart == 'expedition' || $modulepart == 'shipment') {
require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
@@ -284,7 +284,7 @@ class Documents extends DolibarrApi
$result = $tmpobject->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) {
throw new RestException(500, 'Error generating document missing doctemplate parameter');
throw new RestException(500, 'Error generating document');
}
} elseif ($modulepart == 'mrp') {
require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
@@ -300,7 +300,7 @@ class Documents extends DolibarrApi
$result = $tmpobject->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) {
throw new RestException(500, 'Error generating document missing doctemplate parameter');
throw new RestException(500, 'Error generating document');
}
} elseif ($modulepart == 'expensereport') {
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
@@ -309,7 +309,14 @@ class Documents extends DolibarrApi
$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
if (!$result) {
throw new RestException(404, 'Exepnse report not found');
throw new RestException(404, 'Expense report not found');
}
$templateused = $doctemplate ? $doctemplate : $tmpobject->model_pdf;
$result = $tmpobject->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) {
throw new RestException(500, 'Error generating document');
}
} elseif ($modulepart == 'product') {
require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -325,7 +332,7 @@ class Documents extends DolibarrApi
$result = $tmpobject->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) {
throw new RestException(500, 'Error generating document missing doctemplate parameter');
throw new RestException(500, 'Error generating document');
}
} elseif ($modulepart == 'stock' || $modulepart == 'entrepot') {
require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';
@@ -341,7 +348,7 @@ class Documents extends DolibarrApi
$result = $tmpobject->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result <= 0) {
throw new RestException(500, 'Error generating document missing doctemplate parameter');
throw new RestException(500, 'Error generating document');
}
} else {
throw new RestException(403, 'Generation not available for this modulepart');