diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index 5ff544a1f6c..18797312ad8 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -87,7 +87,6 @@ if ($action == 'set') { dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity); - dolibarr_set_const($db, "COMM_ACTION_MAIL_DESCRIPTION", GETPOST("COMM_ACTION_MAIL_DESCRIPTION", 'int'), 'chaine', 0, '', $conf->entity); $defaultValues = new DefaultValues($db); $result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete', 't.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity)); @@ -399,14 +398,6 @@ print ''."\n"; $formactions->form_select_status_action('agenda', getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'), 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100'); print ''."\n"; -//comm action show in description the mail information -print ''."\n"; -print ''.$langs->trans("COMM_ACTION_MAIL_DESCRIPTION").''."\n"; -print ' '."\n"; -print ''."\n"; -print $form->selectyesno('COMM_ACTION_MAIL_DESCRIPTION', getDolGlobalString('COMM_ACTION_MAIL_DESCRIPTION'), 1); -print ''; - print ''; print $form->buttonsSaveCancel("Save", ''); diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index b5a62c7480e..69cd535f82f 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -2404,7 +2404,7 @@ if ($id > 0) { } //mail information - if (!empty($object->email_msgid) && $conf->global->COMM_ACTION_MAIL_DESCRIPTION) { + if (!empty($object->email_msgid)) { print ''.$langs->trans('MailTopic').''; print ''.dol_escape_htmltag($object->email_subject).''; print ''.$langs->trans('MailFrom').''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 1a72704a2af..2ef2a996f3b 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -313,7 +313,6 @@ MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos) MAIN_SMS_SENDMODE=Method to use to send SMS MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email) -COMM_ACTION_MAIL_DESCRIPTION=Show the email information (sender, receivers, etc) in the event description (if defined) UserEmail=User email CompanyEmail=Company Email FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.