joebordes

joebordes

diff --git a/Smarty/templates/DetailViewUI.tpl b/Smarty/templates/DetailViewUI.tpl
index 5169434..c659348 100644
--- a/Smarty/templates/DetailViewUI.tpl
+++ b/Smarty/templates/DetailViewUI.tpl
@@ -27,8 +27,8 @@
 				{/if}
                 <div id="editarea_{$keyfldname}" style="display:none;">
                 	<input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$keyfldname}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                    <br><input name="button_{$keyfldname}" type="button" class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$keyfldname}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');event.stopPropagation();"/> {$APP.LBL_OR}
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$keyfldname}','editarea_{$keyfldname}','{$keyfldname}');event.stopPropagation();" class="link">{$APP.LBL_CAN

joebordes

diff --git a/Smarty/templates/Header.tpl b/Smarty/templates/Header.tpl
index 058d4e5..db22ded 100644
--- a/Smarty/templates/Header.tpl
+++ b/Smarty/templates/Header.tpl
@@ -48,6 +48,7 @@ var gVTUserID = '{$CURRENT_USER_ID}';
 	<a name="top"></a>
 	<!-- header -->
 	<!-- header-vtiger crm name & RSS -->
+	<script language="JavaScript" type="text/javascript" src="include/js/promise.min.js"></script>
 	<script language="JavaScript" type="text/javascript" src="include/js/meld.js"></script>

joebordes

diff --git a/modules/Reports/ReportRun.php b/modules/Reports/ReportRun.php
index ecea02e..a0c4220 100755
--- a/modules/Reports/ReportRun.php
+++ b/modules/Reports/ReportRun.php
@@ -845,7 +845,11 @@ class ReportRun extends CRMEntity {
 								$tableColumnSql = "CAST((CONCAT(due_date,' ',time_end)) AS DATETIME)";
 							}
 						} else {
-							$tableColumnSql = $selectedfields[0].".".$selectedfields[1];
+							if ($moduleName==$this->primarymodule) {