diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 4e2165d6f38..c813e8af4a0 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -102,12 +102,12 @@ if ($action == 'builddoc' && $permissiontoadd) {
if (empty($donotredirect)) { // This is set when include is done by bulk action "Bill Orders"
setEventMessages($langs->trans("FileGenerated"), null);
- $urltoredirect = $_SERVER['REQUEST_URI'];
+ /*$urltoredirect = $_SERVER['REQUEST_URI'];
$urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
$urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
header('Location: '.$urltoredirect.'#builddoc');
- exit;
+ exit;*/
}
}
}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 3f75ee30d02..7183605ae10 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -220,6 +220,7 @@ abstract class CommonDocGenerator
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Define array with couple substitution key => substitution value
+ * For example {company_name}, {company_name_alias}
*
* @param Societe $object Object
* @param Translate $outputlangs Language object for output
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 5ec3a4cfbc0..ee91d67b9ce 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -624,14 +624,15 @@ class Conf
if (!empty($this->global->MAILING_EMAIL_FROM)) {
$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
}
- if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) {
- $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
- }
if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
}
+ if (!isset($this->global->MAIN_FIX_FOR_BUGGED_MTA)) {
+ $this->global->MAIN_FIX_FOR_BUGGED_MTA = 1;
+ }
+
// Format for date (used by default when not found or not searched in lang)
$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 415570102f2..5e0a464fa6e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7975,7 +7975,7 @@ class Form
}
if (!$nboftypesoutput) {
- print '| '.$langs->trans("None").' |
';
+ print '| '.$langs->trans("None").' |
';
}
print '';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index d558571d5b8..0d1d838aad4 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -393,6 +393,38 @@ class FormFile
global $langs, $conf, $user, $hookmanager;
global $form;
+ $reshook = 0;
+ if (is_object($hookmanager)) {
+ $parameters = array(
+ 'modulepart'=>&$modulepart,
+ 'modulesubdir'=>&$modulesubdir,
+ 'filedir'=>&$filedir,
+ 'urlsource'=>&$urlsource,
+ 'genallowed'=>&$genallowed,
+ 'delallowed'=>&$delallowed,
+ 'modelselected'=>&$modelselected,
+ 'allowgenifempty'=>&$allowgenifempty,
+ 'forcenomultilang'=>&$forcenomultilang,
+ 'noform'=>&$noform,
+ 'param'=>&$param,
+ 'title'=>&$title,
+ 'buttonlabel'=>&$buttonlabel,
+ 'codelang'=>&$codelang,
+ 'morepicto'=>&$morepicto,
+ 'hideifempty'=>&$hideifempty,
+ 'removeaction'=>&$removeaction
+ );
+ $reshook = $hookmanager->executeHooks('showDocuments', $parameters, $object); // Note that parameters may have been updated by hook
+ // May report error
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
+ }
+ // Remode default action if $reskook > 0
+ if ($reshook > 0) {
+ return $hookmanager->resPrint;
+ }
+
if (!is_object($form)) {
$form = new Form($this->db);
}
@@ -702,9 +734,10 @@ class FormFile
$urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation
}
if (empty($noform)) {
- $out .= '