[Vtigercrm-commits] [vtiger-commits] r11085 - in /vtigercrm/branches/5.0.3: Smarty/templates/ListView.tpl include/utils/ListViewUtils.php include/utils/SearchUtils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon May 28 06:41:13 2007
New Revision: 11085

Log:
Recurring type search issue fixed

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/SearchUtils.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl Mon May 28 06:41:13 2007
@@ -18,6 +18,7 @@
 <script language="JavaScript" type="text/javascript" src="include/js/search.js"></script>
 <script language="javascript" type="text/javascript">
 var typeofdata = new Array();
+typeofdata['E'] = ['is','isn','bwt','ewt','cts','dcts'];
 typeofdata['V'] = ['is','isn','bwt','ewt','cts','dcts'];
 typeofdata['N'] = ['is','isn','lst','grt','lsteq','grteq'];
 typeofdata['T'] = ['is','isn','lst','grt','lsteq','grteq'];

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon May 28 06:41:13 2007
@@ -1225,11 +1225,11 @@
 	}
 	elseif($uitype == 15 || $uitype == 111 ||  $uitype == 16)
 	{
-		if($current_module_strings[$temp_val] != '')
+		if($current_module_strings[$temp_val] != '' && $module !="Calendar")
 		{
 			$value = $current_module_strings[$temp_val];
 		}
-		elseif($app_strings[$temp_val] != '')
+		elseif($app_strings[$temp_val] != '' && $module !="Calendar")
 		{
 			$value = $app_strings[$temp_val];
 		}

Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Mon May 28 06:41:13 2007
@@ -496,7 +496,7 @@
 		$fieldtype = $adb->query_result($result,$i,"typeofdata");
 		$fieldtype = explode("~",$fieldtype);
 		$fieldtypeofdata = $fieldtype[0];
-		if($fieldcolname == 'account_id' || $fieldcolname == 'accountid' || $fieldcolname == 'product_id' || $fieldcolname == 'vendor_id' || $fieldcolname == 'contact_id' || $fieldcolname == 'contactid' || $fieldcolname == 'vendorid' || $fieldcolname == 'potentialid' || $fieldcolname == 'salesorderid' || $fieldcolname == 'quoteid' || $fieldcolname == 'parentid')
+		if($fieldcolname == 'account_id' || $fieldcolname == 'accountid' || $fieldcolname == 'product_id' || $fieldcolname == 'vendor_id' || $fieldcolname == 'contact_id' || $fieldcolname == 'contactid' || $fieldcolname == 'vendorid' || $fieldcolname == 'potentialid' || $fieldcolname == 'salesorderid' || $fieldcolname == 'quoteid' || $fieldcolname == 'parentid' || $fieldcolname == "recurringtype")
 			$fieldtypeofdata = "V";
 		$fieldlabel = $mod_strings[$adb->query_result($result,$i,"fieldlabel")];