diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 995ee525d7a..1adb078dc36 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6660,6 +6660,14 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			}
 		}
 	}
+	if (!empty($conf->global->ODT_ENABLE_ALL_TAGS_IN_SUBSTITUTIONS)) {
+		// to list all tags in odt template
+		$tags = '';
+		foreach ($substitutionarray as $key => $value) {
+			$tags .= '{' . $key . '} => ' . $value ."\n";
+		}
+		$substitutionarray = array_merge($substitutionarray, array('__ALL_TAGS__' => $tags));
+	}
 }
 
 /**
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index cfa8c75ec11..6d2f2772610 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -322,11 +322,6 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				$tmparray = array_merge($array_member, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
-				$tags = '';
-				foreach ($tmparray as $key => $value) {
-					$tags .= '{' . $key . '} => ' . $value ."\n";
-				}
-				$tmparray = array_merge($tmparray, array('__ALL_TAGS__' => $tags));
 				// Call the ODTSubstitution hook
 				$parameters = array(
 					'file'=>$file,
@@ -352,12 +347,10 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key=>$value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}