ソースを参照

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

Mathieu Moulin 1 年間 前
コミット
b394ce69b7
2 ファイル変更2 行追加2 行削除
  1. 1 1
      htdocs/core/actions_sendmails.inc.php
  2. 1 1
      htdocs/custom/mmicrm

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

@@ -276,7 +276,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
 			} elseif ($fromtype === 'user') {
 				// MMI Hack : Email sender name
-				if (!empty($conf->global->MMICRM_USER_MAILFROM_NAME) && !empty($user->array_options['options_email_sender_name']))
+				if (!empty($conf->mmicrm->enabled) && !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.'>';

+ 1 - 1
htdocs/custom/mmicrm

@@ -1 +1 @@
-Subproject commit 565f006c84088516730fd0f2fe8e1f4b744102c5
+Subproject commit 30e756527801fe37956ae33e9b2fe90bd6126893