Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2023-05-02 04:46:37 +02:00
commit a577f33f1e

View File

@ -261,9 +261,16 @@ class pdf_einstein extends ModelePDFCommandes
$dir = $conf->commande->multidir_output[$conf->entity];
$file = $dir."/SPECIMEN.pdf";
} else {
// Possibility to use suffix for proforma
$suffix = '';
if (!empty($conf->global->PROFORMA_PDF_WITH_SUFFIX)) {
$suffix = (GETPOST('model', 2)=='proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : '';
$suffix = dol_sanitizeFileName($suffix);
}
$objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
$file = $dir."/".$objectref.".pdf";
$file = $dir."/".$objectref.$suffix.".pdf";
}
if (!file_exists($dir)) {