From ffb3d810def9e2988a941f43bd58aabf9fc477a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 31 Aug 2020 16:21:59 +0200 Subject: [PATCH 1/6] Complete fix for #14580 for v10 (backport of change of develop) --- htdocs/core/class/html.formmail.class.php | 2 +- htdocs/langs/en_US/other.lang | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 98c55c71232..347ce29df1c 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1208,7 +1208,7 @@ class FormMail extends Form elseif ($type_template=='fichinter_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template=='thirdparty') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template=='user') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); } - elseif (!empty($type_template)) { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); } + elseif (!empty($type_template)) { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentGeneric"); } $ret->label = 'default'; $ret->lang = $outputlangs->defaultlang; diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 5dd7422539a..83db92bd9e2 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -97,6 +97,7 @@ PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNA PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n +PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available. ChooseYourDemoProfil=Choose the demo profile that best suits your needs... ChooseYourDemoProfilMore=...or build your own profile
(manual module selection) From 134a47a93f2b97356627a6f332f43ee2c1f8229a Mon Sep 17 00:00:00 2001 From: Florian Mortgat Date: Tue, 1 Sep 2020 15:36:35 +0200 Subject: [PATCH 2/6] FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename --- htdocs/core/class/CMailFile.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 853f2f98b05..7c12f4f9d5b 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -463,6 +463,9 @@ class CMailFile { //$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i])); $attachment = Swift_Attachment::fromPath($filename_list[$i], $mimetype_list[$i]); + if (!empty($mimefilename_list[$i])) { + $attachment->setFilename($mimefilename_list[$i]); + } $this->message->attach($attachment); } } From bb92e64e433f068beb28a6c3758a726928e4e23d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 3 Sep 2020 12:43:38 +0200 Subject: [PATCH 3/6] FIX: #14474 Error when deleting --- htdocs/comm/propal/class/propal.class.php | 10 ++++- htdocs/commande/class/commande.class.php | 7 ++- htdocs/compta/facture/class/facture.class.php | 8 +++- htdocs/core/class/commonobject.class.php | 45 ++++++++++++++++++- htdocs/expedition/class/expedition.class.php | 8 +++- htdocs/fichinter/class/fichinter.class.php | 8 +++- .../class/fournisseur.commande.class.php | 8 +++- .../fourn/class/fournisseur.facture.class.php | 8 +++- .../class/supplier_proposal.class.php | 8 +++- 9 files changed, 100 insertions(+), 10 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index a2d1e934d35..325a0894302 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2008 Raphael Bertrand - * Copyright (C) 2010-2019 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2010-2017 Philippe Grand * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2012 Cedric Salvador @@ -1063,7 +1063,7 @@ class Propal extends CommonObject $ret = $this->add_object_linked(); if (! $ret) dol_print_error($this->db); } - + /* * Insertion du detail des produits dans la base * Insert products detail in database @@ -2900,6 +2900,12 @@ class Propal extends CommonObject if (! $error) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // We remove directory $ref = dol_sanitizeFileName($this->ref); if ($conf->propal->multidir_output[$this->entity] && !empty($this->ref)) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 7d8e2680977..47ffec60592 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2016 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2011 Jean Heimburger * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2012 Cedric Salvador @@ -3327,6 +3327,11 @@ class Commande extends CommonOrder if (! $error) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } // Remove directory with files $comref = dol_sanitizeFileName($this->ref); if ($conf->commande->dir_output && !empty($this->ref)) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 12d60b067fa..21f68e1c329 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -7,7 +7,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2007 Franky Van Liedekerke - * Copyright (C) 2010-2016 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012 Cédric Salvador @@ -2019,6 +2019,12 @@ class Facture extends CommonInvoice $resql=$this->db->query($sql); if ($resql) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // On efface le repertoire de pdf provisoire $ref = dol_sanitizeFileName($this->ref); if ($conf->facture->dir_output && !empty($this->ref)) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 157fc718700..ccbcb9d6789 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2013 Regis Houssin - * Copyright (C) 2010-2015 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2011-2019 Philippe Grand * Copyright (C) 2012-2015 Marcos García @@ -7734,4 +7734,47 @@ abstract class CommonObject } } } + + /** + * Delete related files of object in database + * + * @return bool + */ + public function delete_ecmfiles(){ + global $conf; + $this->db->begin(); + + switch ($this->element){ + case 'propal': + $element = 'propale'; + break; + case 'product': + $element = 'produit'; + break; + case 'order_supplier': + $element ='fournisseur/commande'; + break; + case 'invoice_supplier': + $element = 'fournisseur/facture/' . get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier'); + break; + case 'shipping': + $element = 'expedition/sending'; + break; + default: + $element = $this->element; + } + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files"; + $sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'"; + $sql.= " AND filepath = '".$element."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; + + if (!$this->db->query($sql)) { + $this->error = $this->db->lasterror(); + $this->db->rollback(); + return false; + } + + $this->db->commit(); + return true; + } } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 8417ddb9bfb..b3584327f3c 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2006-2012 Laurent Destailleur - * Copyright (C) 2011-2017 Juanjo Menent + * Copyright (C) 2011-2020 Juanjo Menent * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2014-2015 Marcos García @@ -1310,6 +1310,12 @@ class Expedition extends CommonObject { $this->db->commit(); + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // We delete PDFs $ref = dol_sanitizeFileName($this->ref); if (! empty($conf->expedition->dir_output)) diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 4ce2aa954b2..a9ec1ba588e 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -2,7 +2,7 @@ /* Copyright (C) 2002-2003 Rodolphe Quiedeville * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2013 Juanjo Menent + * Copyright (C) 2011-2020 Juanjo Menent * Copyright (C) 2015 Marcos García * Copyright (C) 2015 Charlie Benke * Copyright (C) 2018 Nicolas ZABOURI @@ -1003,6 +1003,12 @@ class Fichinter extends CommonObject if (! $error) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // Remove directory with files $fichinterref = dol_sanitizeFileName($this->ref); if ($conf->ficheinter->dir_output) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index ef8d4b4d93f..6d73ee59f4d 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2017 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke - * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2010-2018 Philippe Grand * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2013 Florian Henry @@ -1979,6 +1979,12 @@ class CommandeFournisseur extends CommonOrder if (! $error) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // We remove directory $ref = dol_sanitizeFileName($this->ref); if ($conf->fournisseur->commande->dir_output) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index e20a3f9e7de..f1bd120f082 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2010-2017 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2013-2019 Philippe Grand * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2016 Marcos García @@ -1157,6 +1157,12 @@ class FactureFournisseur extends CommonInvoice if (! $error) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // We remove directory if ($conf->fournisseur->facture->dir_output) { diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 2e6c0f45397..4279925054d 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2008 Raphael Bertrand - * Copyright (C) 2010-2015 Juanjo Menent + * Copyright (C) 2010-2020 Juanjo Menent * Copyright (C) 2010-2018 Philippe Grand * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2013 Florian Henry @@ -2065,6 +2065,12 @@ class SupplierProposal extends CommonObject if (! $error) { + // On delete ecm_files database info + if (!$this->delete_ecmfiles()) { + $this->db->rollback(); + return 0; + } + // We remove directory $ref = dol_sanitizeFileName($this->ref); if ($conf->supplier_proposal->dir_output && !empty($this->ref)) From 9bd5ed627f195f6cc927ce372d75d697ab0230de Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 4 Sep 2020 09:55:02 +0200 Subject: [PATCH 4/6] Fix travis issues --- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/commande/class/commande.class.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/core/class/commonobject.class.php | 3 ++- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/fichinter/class/fichinter.class.php | 2 +- htdocs/fourn/class/fournisseur.commande.class.php | 2 +- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 325a0894302..3000fb8b2e3 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2901,7 +2901,7 @@ class Propal extends CommonObject if (! $error) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 47ffec60592..d56329c93d9 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3328,7 +3328,7 @@ class Commande extends CommonOrder if (! $error) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 21f68e1c329..5ea423fa942 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2020,7 +2020,7 @@ class Facture extends CommonInvoice if ($resql) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index ccbcb9d6789..103d704a546 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -7740,7 +7740,8 @@ abstract class CommonObject * * @return bool */ - public function delete_ecmfiles(){ + public function deleteEcmFiles() + { global $conf; $this->db->begin(); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index b3584327f3c..fd764aca981 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1311,7 +1311,7 @@ class Expedition extends CommonObject $this->db->commit(); // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index a9ec1ba588e..8e7d23a8cd8 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1004,7 +1004,7 @@ class Fichinter extends CommonObject if (! $error) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 6d73ee59f4d..663d72b26b1 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1980,7 +1980,7 @@ class CommandeFournisseur extends CommonOrder if (! $error) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index f1bd120f082..b5339d913c5 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1158,7 +1158,7 @@ class FactureFournisseur extends CommonInvoice if (! $error) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 4279925054d..0014db887a1 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -2066,7 +2066,7 @@ class SupplierProposal extends CommonObject if (! $error) { // On delete ecm_files database info - if (!$this->delete_ecmfiles()) { + if (!$this->deleteEcmFiles()) { $this->db->rollback(); return 0; } From 7944c21fe549edb84ba2b8234b5bca538fb88f3f Mon Sep 17 00:00:00 2001 From: ATM-Nicolas Date: Thu, 10 Sep 2020 12:32:12 +0200 Subject: [PATCH 5/6] FIX : Wrong redirection --- htdocs/projet/tasks/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 36c06cd97f2..c7b651cb93d 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -381,7 +381,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && { $obj = $db->fetch_object($resql); $id = $obj->id; - header("Location: ".DOL_URL_ROOT.'/projet/tasks/task.php?id='.$id.'&withprojet=1'); + header("Location: ".DOL_URL_ROOT.'/projet/tasks/task.php?id='.$id.'&withproject=1'); exit; } From 8fc9b78b4762e2cf4d957d9c6bd592de57a27b6e Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 11 Sep 2020 06:55:03 +0200 Subject: [PATCH 6/6] FIX Problems on FEC format --- .../accountancy/class/accountancyexport.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index bfb08746c16..b3a4430db36 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -689,8 +689,8 @@ class AccountancyExport foreach ($objectLines as $line) { $date_creation = dol_print_date($line->date_creation, '%Y%m%d'); - $date_doc = dol_print_date($line->doc_date, '%Y%m%d'); - $date_valid = dol_print_date($line->date_validated, '%Y%m%d'); + $date_document = dol_print_date($line->doc_date, '%Y%m%d'); + $date_validation = dol_print_date($line->date_validated, '%Y%m%d'); // FEC:JournalCode print $line->code_journal . $separator; @@ -702,25 +702,25 @@ class AccountancyExport print $line->piece_num . $separator; // FEC:EcritureDate - print $date_creation . $separator; + print $date_document . $separator; // FEC:CompteNum print $line->numero_compte . $separator; // FEC:CompteLib - print $line->label_compte . $separator; + print dol_string_unaccent($line->label_compte) . $separator; // FEC:CompAuxNum print $line->subledger_account . $separator; // FEC:CompAuxLib - print $line->subledger_label . $separator; + print dol_string_unaccent($line->subledger_label) . $separator; // FEC:PieceRef print $line->doc_ref . $separator; // FEC:PieceDate - print $date_doc . $separator; + print dol_string_unaccent($date_creation) . $separator; // FEC:EcritureLib print $line->label_operation . $separator; @@ -738,7 +738,7 @@ class AccountancyExport print $line->date_lettering . $separator; // FEC:ValidDate - print $date_valid . $separator; + print $date_validation . $separator; // FEC:Montantdevise print $line->multicurrency_amount . $separator;