lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not show free text for thirdparty email send form

Browse Source
This commit is contained in:
Laurent Destailleur 2013-09-23 14:35:22 +02:00
parent 9189bdfa01
commit 6b2966794a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.formmail.class.php
View File

@ -46,8 +46,8 @@ class FormMail
var $withsubstit; // Show substitution array var $withsubstit; // Show substitution array
var $withfrom; var $withfrom;
var $withto; var $withto; // Show recipient emails
var $withtofree; var $withtofree; // Show free text for recipient emails
var $withtocc; var $withtocc;
var $withtoccc; var $withtoccc;
var $withtopic; var $withtopic;

4
htdocs/societe/soc.php
View File

@ -450,10 +450,13 @@ if (empty($reshook))
$result = $object->set_parent(GETPOST('editparentcompany','int')); $result = $object->set_parent(GETPOST('editparentcompany','int'));
} }
// Actions to send emails
$id=$socid; $id=$socid;
$actiontypecode='AC_OTH_AUTO'; $actiontypecode='AC_OTH_AUTO';
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
/* /*
* Generate document * Generate document
*/ */
@ -1824,6 +1827,7 @@ else
$liste=array(); $liste=array();
foreach ($object->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value; foreach ($object->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value;
$formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$liste; $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$liste;
$formmail->withtofree=0;
$formmail->withtocc=$liste; $formmail->withtocc=$liste;
$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
$formmail->withfile=2; $formmail->withfile=2;