Browse Source

MMICRM : Add special field to specify email sender name for user

Mathieu Moulin 1 year ago
parent
commit
96dd221b60
2 changed files with 6 additions and 2 deletions
  1. 5 1
      htdocs/core/actions_sendmails.inc.php
  2. 1 1
      htdocs/custom/mmicrm

+ 5 - 1
htdocs/core/actions_sendmails.inc.php

@@ -275,7 +275,11 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			if ($fromtype === 'robot') {
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
 			} elseif ($fromtype === 'user') {
-				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
+				// MMI Hack : Email sender name
+				if (!empty($conf->global->MMICRM_USER_MAILFROM_NAME) && !empty($user->array_options['options_email_sender_name']))
+					$from = dol_string_nospecial($user->array_options['options_email_sender_name'], ' ', array(",")).' <'.$user->email.'>';
+				else
+					$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
 			} elseif ($fromtype === 'company') {
 				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
 			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {

+ 1 - 1
htdocs/custom/mmicrm

@@ -1 +1 @@
-Subproject commit 6ffd0577fa873b6b1732d859231bef3cfeed50ec
+Subproject commit 565f006c84088516730fd0f2fe8e1f4b744102c5