From 7782ae4fd0e9c735ef9af09af0965de17f22a3cc Mon Sep 17 00:00:00 2001 From: Eric Seigne Date: Thu, 30 Nov 2023 19:12:26 +0100 Subject: [PATCH 1/3] fix #26862 but on 14.0 where that bug was present --- htdocs/compta/facture/class/facture.class.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 2af2b35240d..f004dcff3ac 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -5159,8 +5159,21 @@ class Facture extends CommonInvoice $errors_to = $conf->global->MAIN_MAIL_ERRORS_TO; $trackid = 'inv'.$tmpinvoice->id; + + //join file is asked + $joinFile = []; + $joinFileName = []; + $joinFileMime = []; + if ($arraymessage->joinfiles == 1) { + $joinFile[] = DOL_DATA_ROOT.$tmpinvoice->last_main_doc; + $joinFileName[] = basename($tmpinvoice->last_main_doc); + $joinFileMime[] = dol_mimetype(DOL_DATA_ROOT.$tmpinvoice->last_main_doc); + } + + // print_r($joinFile);exit; + // Mail Creation - $cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', $trackid, '', '', ''); + $cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, $joinFile, $joinFileMime, $joinFileName, '', "", 0, 1, $errors_to, '', $trackid, '', '', ''); // Sending Mail if ($cMailFile->sendfile()) { From 951afdcb68b44f939e81a41168a2e1f0976e78ae Mon Sep 17 00:00:00 2001 From: Eric Seigne Date: Thu, 30 Nov 2023 19:15:56 +0100 Subject: [PATCH 2/3] cleanup --- htdocs/compta/facture/class/facture.class.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index f004dcff3ac..e5fbd645ffa 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -5170,8 +5170,6 @@ class Facture extends CommonInvoice $joinFileMime[] = dol_mimetype(DOL_DATA_ROOT.$tmpinvoice->last_main_doc); } - // print_r($joinFile);exit; - // Mail Creation $cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, $joinFile, $joinFileMime, $joinFileName, '', "", 0, 1, $errors_to, '', $trackid, '', '', ''); From d6c97bd75e1583e5a69b94b6dd75776b719fee12 Mon Sep 17 00:00:00 2001 From: Eric Seigne Date: Thu, 30 Nov 2023 19:17:14 +0100 Subject: [PATCH 3/3] check if last_main_doc is not empty --- htdocs/compta/facture/class/facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index e5fbd645ffa..dab895c9e75 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -5164,7 +5164,7 @@ class Facture extends CommonInvoice $joinFile = []; $joinFileName = []; $joinFileMime = []; - if ($arraymessage->joinfiles == 1) { + if ($arraymessage->joinfiles == 1 && !empty($tmpinvoice->last_main_doc)) { $joinFile[] = DOL_DATA_ROOT.$tmpinvoice->last_main_doc; $joinFileName[] = basename($tmpinvoice->last_main_doc); $joinFileMime[] = dol_mimetype(DOL_DATA_ROOT.$tmpinvoice->last_main_doc);