MMIDocuments fix rename pdf

htdocs/core/class/commonobject.class.php

@@ -10110,36 +10110,6 @@ abstract class CommonObject
 		return $mt;
 	}
 
-	/**
-	 * Get filename for PDF
-	 * @author MMI Mathieu Moulin iProspective
-	 *
-	 * @return string
-	 */
-	public function pdf_filename()
-	{
-		global $conf;
-		
-		if (empty($conf->global->MMIDOCUMENT_PDF_RENAME))
-			return;
-		
-		$thirdparty = $this->thirdparty;
-		$file_e = [];
-		$file_e[] = dol_sanitizeFileName($this->ref);
-		if (!empty($conf->global->MMIDOCUMENT_PDF_RENAME_MYSOC)) {
-			global $mysoc;
-			$file_e[] = $mysoc->name;
-		}
-		if (!empty($conf->global->MMIDOCUMENT_PDF_RENAME_THIRDPARTY)) {
-			$file_e[] = $thirdparty->name;
-		}
-		if (!empty($conf->global->MMIDOCUMENT_PDF_RENAME_REF_CUSTOMER) && !empty($this->ref_customer)) {
-			$file_e[] = $this->ref_customer;
-		}
-		$filename = preg_replace('/[^A-Za-z0-9\-]/', '', str_replace(' ', '-', iconv('UTF-8','ASCII//TRANSLIT', implode('-', $file_e))));
-		return !empty($conf->global->MMIDOCUMENT_PDF_RENAME_UPPERCASE) ?strtoupper($filename) :$filename;
-	}
-
 	/**
 	 * Get total amount already paid
 	 * @author MMI Mathieu Moulin iProspective

htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php

@@ -308,13 +308,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
-				// MMIDocument PDF rename
-				if (!empty($conf->global->MMIDOCUMENT_PDF_RENAME)) {
-					$filename = $object->pdf_filename();
-					$file = $dir."/".$filename.".pdf";
-				}
-				else
-					$file = $dir."/".$objectref.".pdf";
+				$file = $dir."/".$objectref.".pdf";
 			}
 
 			if (!file_exists($dir)) {

htdocs/core/modules/facture/doc/pdf_sponge.modules.php

@@ -316,13 +316,7 @@ class pdf_sponge extends ModelePDFFactures
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->facture->multidir_output[$object->entity]."/".$objectref;
-				// MMIDocument PDF rename
-				if (!empty($conf->global->MMIDOCUMENT_PDF_RENAME)) {
-					$filename = $object->pdf_filename();
-					$file = $dir."/".$filename.".pdf";
-				}
-				else
-					$file = $dir."/".$objectref.".pdf";
+				$file = $dir."/".$objectref.".pdf";
 			}
 			if (!file_exists($dir)) {
 				if (dol_mkdir($dir) < 0) {

htdocs/core/modules/propale/doc/pdf_cyan.modules.php

@@ -306,13 +306,7 @@ class pdf_cyan extends ModelePDFPropales
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
-				// MMIDocument PDF rename
-				if (!empty($conf->global->MMIDOCUMENT_PDF_RENAME)) {
-					$filename = $object->pdf_filename();
-					$file = $dir."/".$filename.".pdf";
-				}
-				else
-					$file = $dir."/".$objectref.".pdf";
+				$file = $dir."/".$objectref.".pdf";
 			}
 
 			if (!file_exists($dir)) {

htdocs/core/tpl/card_presend.tpl.php

@@ -50,8 +50,7 @@ if ($action == 'presend') {
 		if ($object->element == 'invoice_supplier') {
 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 		} else {
-			$filename = (!empty($conf->global->MMIDOCUMENT_PDF_RENAME)) ?$object->pdf_filename() :$ref;
-			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($filename, '/').'[^\-]+');
+			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		}
 
 		$file = $fileparams['fullname'];
@@ -99,8 +98,7 @@ if ($action == 'presend') {
 			if ($object->element == 'invoice_supplier') {
 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 			} else {
-				$filename = (!empty($conf->global->MMIDOCUMENT_PDF_RENAME)) ?$object->pdf_filename() :$ref;
-				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($filename, '/').'[^\-]+');
+				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			}
 
 			$file = $fileparams['fullname'];

htdocs/custom/mmidocuments

@@ -1 +1 @@
-Subproject commit 5307027be4313e6a5648ccbb0750d79d2c3c4d22
+Subproject commit 8f816be3d3ff1514e57b13122fa5db5f26ef5cc8

htdocs/document.php

@@ -288,7 +288,7 @@ if (!is_object($hookmanager)) {
 $hookmanager->initHooks(array('document'));
 $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
 	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,
-	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
+	'filename' => &$filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
 $reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
 if ($reshook < 0) {
 	$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join($separator, $hookmanager->errors) : '');