Merge pull request #6540 from laudeco/fix/mailMassAction

fix the from e-mail on mass action
Dolibarr · Mar 18, 2017 · 4d6b20b · 4d6b20b
2 parents 1e3c287 + 8c65c47
commit 4d6b20b
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
@@ -209,7 +209,26 @@
             if (count($listofqualifiedinvoice) > 0)
             {
                 $langs->load("commercial");
-                $from = $user->getFullName($langs) . ' <' . $user->email .'>';
+
+                $fromtype = GETPOST('fromtype');
+                if ($fromtype === 'user') {
+                    $from = $user->getFullName($langs) .' <'.$user->email.'>';
+                }
+                elseif ($fromtype === 'company') {
+                    $from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+                }
+                elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+                    $tmp=explode(',', $user->email_aliases);
+                    $from = trim($tmp[($reg[1] - 1)]);
+                }
+                elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+                    $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+                    $from = trim($tmp[($reg[1] - 1)]);
+                }
+                else {
+                    $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+                }
+
                 $replyto = $from;
                 $subject = GETPOST('subject');
                 $message = GETPOST('message');