From 279fc0c57ebb68c23fec76d4a5091b95b6ebbbbf Mon Sep 17 00:00:00 2001 From: iouston <4319513+iouston@users.noreply.github.com> Date: Tue, 5 Apr 2022 14:24:36 +0200 Subject: [PATCH 1/4] Add PROFORMA_PDF_WITH_SUFFIX option Use a suffix for proforma for the pdf name for example : C210200136_proforma.pdf --- .../core/modules/commande/doc/pdf_einstein.modules.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index db961962ba6..9aa5822804b 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -256,10 +256,16 @@ class pdf_einstein extends ModelePDFCommandes $dir = $conf->commande->multidir_output[$conf->entity]; $file = $dir."/SPECIMEN.pdf"; } else { + + // Possibility to use suffix for proforma + if(!empty($conf->global->PROFORMA_PDF_WITH_SUFFIX)){ + $suffix = (GETPOST('model',2)=='proforma') ? $conf->global->PROFORMA_PDF_WITH_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)) { if (dol_mkdir($dir) < 0) { From 48f0c863cccf17fdcb1d4386e3b2f2de0b04ccd9 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 5 Apr 2022 12:30:10 +0000 Subject: [PATCH 2/4] Fixing style errors. --- .../core/modules/commande/doc/pdf_einstein.modules.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 9aa5822804b..3bc5575189f 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -256,16 +256,15 @@ class pdf_einstein extends ModelePDFCommandes $dir = $conf->commande->multidir_output[$conf->entity]; $file = $dir."/SPECIMEN.pdf"; } else { - // Possibility to use suffix for proforma - if(!empty($conf->global->PROFORMA_PDF_WITH_SUFFIX)){ - $suffix = (GETPOST('model',2)=='proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : ''; + if (!empty($conf->global->PROFORMA_PDF_WITH_SUFFIX)) { + $suffix = (GETPOST('model', 2)=='proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : ''; } - + $objectref = dol_sanitizeFileName($object->ref); $dir = $conf->commande->multidir_output[$object->entity]."/".$objectref; $file = $dir . "/" .$objectref.$suffix.".pdf"; - } + } if (!file_exists($dir)) { if (dol_mkdir($dir) < 0) { From 0d9d2f75043472ff976e51aa8d762e321c697523 Mon Sep 17 00:00:00 2001 From: iouston <4319513+iouston@users.noreply.github.com> Date: Tue, 5 Apr 2022 15:59:38 +0200 Subject: [PATCH 3/4] fix from your comments --- htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 3bc5575189f..1182972f0bd 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -257,11 +257,13 @@ class pdf_einstein extends ModelePDFCommandes $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 : ''; } $objectref = dol_sanitizeFileName($object->ref); + $suffix = dol_sanitizeFileName($suffix); $dir = $conf->commande->multidir_output[$object->entity]."/".$objectref; $file = $dir . "/" .$objectref.$suffix.".pdf"; } From cfb2d4e8c091a47bcc9264da18103aa975661a07 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 May 2023 04:26:09 +0200 Subject: [PATCH 4/4] Update pdf_einstein.modules.php --- htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 1182972f0bd..73688894db1 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -260,12 +260,12 @@ class pdf_einstein extends ModelePDFCommandes $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); - $suffix = dol_sanitizeFileName($suffix); $dir = $conf->commande->multidir_output[$object->entity]."/".$objectref; - $file = $dir . "/" .$objectref.$suffix.".pdf"; + $file = $dir."/".$objectref.$suffix.".pdf"; } if (!file_exists($dir)) {