diff --git a/workflow/engine/templates/bpmn/ProcessOptions.js b/workflow/engine/templates/bpmn/ProcessOptions.js
index f2725d358..e11f82b18 100755
--- a/workflow/engine/templates/bpmn/ProcessOptions.js
+++ b/workflow/engine/templates/bpmn/ProcessOptions.js
@@ -2839,7 +2839,7 @@ ProcessOptions.prototype.addReportTable= function(_5625)
 
   var reportColumns = new Ext.grid.ColumnModel({
             columns: [
-                expander,
+                new Ext.grid.RowNumberer(),
                 {
                     id: 'REP_TAB_TITLE',
                     header: _('ID_TITLE'),
@@ -2874,8 +2874,7 @@ ProcessOptions.prototype.addReportTable= function(_5625)
             store: reportStore,
             displayInfo: true,
             displayMsg: 'Displaying Report Tables {0} - {1} of {2}',
-            emptyMsg: "No Report Tables to display",
-            items:[]
+            emptyMsg: "No Report Tables to display"
         }),
         viewConfig: {forceFit: true}
    });
@@ -3084,7 +3083,7 @@ var reportForm =new Ext.FormPanel({
                     else
                          {
                 Ext.Ajax.request({
-                  url   : '../reportTables/reportTables_Edit.php',
+                  url   : '../reportTables/reportTables_Save.php',
                   method: 'POST',
                   params:{
                       PRO_UID         :pro_uid,
@@ -3093,10 +3092,8 @@ var reportForm =new Ext.FormPanel({
                       REP_TAB_NAME    :Name,
                       REP_TAB_TYPE    :Type ,
                       REP_TAB_GRID    :Grid,
-                      FIELDS          :Fields,
-                      //REP_VAR_NAME    : VariableName,
-                      //REP_VAR_TYPE    : VariableType,
-                      REP_TAB_CONNECTION: Connection
+                      FIELDS          :Fields
+                      //REP_TAB_CONNECTION: Connection
                   },
                   success: function(response) {
                       PMExt.notify( _('ID_STATUS') , _('ID_REPORT_EDITED') );
diff --git a/workflow/engine/templates/bpmn/TaskContext.js b/workflow/engine/templates/bpmn/TaskContext.js
index f208200c4..8f3128262 100755
--- a/workflow/engine/templates/bpmn/TaskContext.js
+++ b/workflow/engine/templates/bpmn/TaskContext.js
@@ -1236,7 +1236,7 @@ TaskContext.prototype.editTaskProperties= function()
                 xtype: 'checkbox',
                 boxLabel: _('ID_NOTIFY_USERS_AFTER_ASSIGN'),
                 labelWidth: 100,
-                name:   'TAS_DEF_MESSAGE_CHECKBOX',
+                name:   'SEND_EMAIL',
                 checked:   'TAS_DEF_MESSAGE_CHECKBOX',
                 listeners: {
                   /**Listeners for showing "TAS_DEF_MESSAGE" textarea field
@@ -1266,13 +1266,12 @@ TaskContext.prototype.editTaskProperties= function()
                   height : 180
                 }]
               }]
-              
             }
             ]
         }]
     });
 
-    workflow.taskPropertiesTabs = taskPropertiesTabs;
+  workflow.taskPropertiesTabs = taskPropertiesTabs;
     
     
   //Loading Task Details into the form
@@ -1384,12 +1383,40 @@ TaskContext.prototype.saveTaskProperties= function()
 {
                  var saveTaskform = workflow.taskPropertiesTabs.getForm().getValues();
                  var taskId = workflow.currentSelection.id;
+                 var tas_start = saveTaskform['TAS_START'];
+                 var tas_type = saveTaskform['TAS_TYPE'];
+                 var tas_transfer_fly = saveTaskform['TAS_TRANSFER_FLY'];
+                 var send_email = saveTaskform['SEND_EMAIL'];
                  saveTaskform['TAS_UID'] = taskId;
+
+                 //Checking checkbox fields
+                 if(typeof tas_start != 'undefined' && tas_start != ''){
+                     if(tas_start == 'on')
+                         saveTaskform['TAS_START'] = 'TRUE';
+                     else
+                         saveTaskform['TAS_START'] = 'FALSE';
+                 }
+                 if(typeof tas_transfer_fly != 'undefined' && tas_transfer_fly != ''){
+                     if(tas_transfer_fly == 'on')
+                         saveTaskform['TAS_TRANSFER_FLY'] = 'TRUE';
+                     else
+                         saveTaskform['TAS_TRANSFER_FLY'] = 'FALSE';
+                 }
+                 if(typeof send_email != 'undefined' && send_email != ''){
+                     if(send_email == 'on')
+                         saveTaskform['SEND_EMAIL'] = 'TRUE';
+                     else
+                         send_email['SEND_EMAIL'] = 'FALSE';
+                 }
+                 if(typeof tas_type != 'undefined' && tas_type != ''){
+                     if(tas_type == 'on')
+                         saveTaskform['TAS_TYPE'] = 'ADHOC';
+                     else
+                         saveTaskform['TAS_TYPE'] = 'NORMAL';
+                 }
+
                  var object_data = Ext.util.JSON.encode(saveTaskform);
 
-
-
-
                  Ext.Ajax.request({
                         url: '../tasks/tasks_Ajax.php' ,
                     success: function (response) {      // When saving data success
@@ -1733,7 +1760,6 @@ TaskContext.prototype.stepTriggers = function()
                   PMExt.notify( _('ID_STATUS') , _('ID_TRIGGER_ASSIGN') );
                   tree.getLoader().dataUrl = 'get-triggers-tree.php?tid='+taskId;
                   tree.getLoader().load(tree.root);
-                  tree.reload();
               }
             });