Index: modules/com_vtiger_workflow/resources/emailtaskscript.js =================================================================== --- modules/com_vtiger_workflow/resources/emailtaskscript.js (revision 13811) +++ modules/com_vtiger_workflow/resources/emailtaskscript.js (working copy) @@ -217,7 +217,29 @@ var value = '$'+jQuery(this).attr('value'); textarea.insertHtml(value); }); - + + /** ADDED BY SWARNAT START FROM-EMAIL **/ + fillSelectBox('task-emailfieldsfrom', modules, moduleName, + function(e){return e['type']['name']=='email';}); + $('#task-emailfieldsname-busyicon').hide(); + $('#task-emailfieldsname').show(); + $('#task-emailfieldsname').change(function(){ + var input = $($('#save_from_name').get()); + var value = '$'+$(this).attr('value'); + input.attr("value", input.attr("value")+','+value); + }); + + fillSelectBox('task-emailfieldsname', modules, moduleName, + function(e){ return e['name'].indexOf("name") != -1}); + $('#task-emailfieldsfrom-busyicon').hide(); + $('#task-emailfieldsfrom').show(); + $('#task-emailfieldsfrom').change(function(){ + var input = $($('#save_from_mail').get()); + var value = '$'+$(this).attr('value'); + input.attr("value", input.attr("value")+','+value); + }); + /** ADDED BY SWARNAT ENDE FROM-EMAIL **/ + fillSelectBox('task-emailfields', modules, moduleName, function(e){return e['type']['name']=='email';}); $('#task-emailfields-busyicon').hide(); Index: modules/com_vtiger_workflow/tasks/VTEmailTask.inc =================================================================== --- modules/com_vtiger_workflow/tasks/VTEmailTask.inc (revision 13811) +++ modules/com_vtiger_workflow/tasks/VTEmailTask.inc (working copy) @@ -16,21 +16,35 @@ public $executeImmediately = false; public function getFieldNames(){ - return array("subject", "content", "recepient", 'emailcc', 'emailbcc'); + return array("subject", "content", "recepient", 'emailcc', 'emailbcc', 'from_mail', 'from_name'); } public function doTask($entity){ global $adb, $current_user; $util = new VTWorkflowUtils(); - $result = $adb->query("select user_name, email1, email2 from vtiger_users where id=1"); - $from_email = $adb->query_result($result,0,'email1'); - $from_name = $adb->query_result($result,0,'user_name'); +// $result = $adb->query("select user_name, email1, email2 from vtiger_users where id=1"); +// $from_email = $adb->query_result($result,0,'email1'); +// $from_name = $adb->query_result($result,0,'user_name'); $admin = $util->adminUser(); $module = $entity->getModuleName(); $entityCache = new VTEntityCache($admin); + + if(!empty($this->from_mail)) { + $et = new VTEmailRecipientsTemplate($this->from_mail); + $from_email = trim($et->render($entityCache, $entity->getId()), ","); + + $et = new VTEmailRecipientsTemplate($this->from_name); + $from_name = trim($et->render($entityCache, $entity->getId()), ","); + + } else { + $result = $adb->query("select user_name, email1, email2 from vtiger_users where id=1"); + $from_email = $adb->query_result($result,0,'email1'); + $from_name = $adb->query_result($result,0,'user_name'); + } + $et = new VTEmailRecipientsTemplate($this->recepient); $to_email = $et->render($entityCache, $entity->getId()); $ecct = new VTEmailRecipientsTemplate($this->emailcc); Index: Smarty/templates/com_vtiger_workflow/taskforms/VTEmailTask.tpl =================================================================== --- Smarty/templates/com_vtiger_workflow/taskforms/VTEmailTask.tpl (revision 13811) +++ Smarty/templates/com_vtiger_workflow/taskforms/VTEmailTask.tpl (working copy) @@ -6,6 +6,16 @@
* From Name | ++ | +
* From Mail | ++ | +
* {'LBL_EMAIL_RECIPIENT'|@getTranslatedString:$MODULE} | {$MOD.LBL_LOADING} |