[Vtigercrm-commits] [vtiger-commits] r10831 - in /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php include/utils/SearchUtils.php modules/Calendar/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Thu May 10 10:01:47 2007
New Revision: 10831

Log:
Basic Search & Advanced Search issue fixed. Fixes #3802

Modified:
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/SearchUtils.php
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php

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 Thu May 10 10:01:47 2007
@@ -1912,6 +1912,8 @@
 				ON vtiger_potential.accountid = vtiger_account.accountid
 			INNER JOIN vtiger_potentialscf
 				ON vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_campaign
+				ON vtiger_campaign.campaignid = vtiger_potential.campaignid
 			LEFT JOIN vtiger_potentialgrouprelation
 				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
 			LEFT JOIN vtiger_groups

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 Thu May 10 10:01:47 2007
@@ -306,7 +306,7 @@
 			$search_field = "parent_id";
 		}
 		//Check ends
-		if(($module == "Calendar" || $module == "Invoice" ||$module == "Notes" || $module == "SalesOrder" || $module== "PurchaseOrder")  && ($search_field == "contact_id"))
+		if(($module == "Calendar" || $module == "Invoice" ||$module == "Notes" || $module == "SalesOrder" || $module== "PurchaseOrder") && ($search_field == "contact_id"))
 	       {
 	                 $module = 'Contacts';
 	                 $search_field = 'lastname';
@@ -471,6 +471,10 @@
 				$OPTION_SET .= "<option value=\'vtiger_contactdetails.lastname\'>".$app_strings['LBL_CONTACT_LAST_NAME']."</option>";
 				$OPTION_SET .= "<option value=\'vtiger_contactdetails.firstname\'>".$app_strings['LBL_CONTACT_FIRST_NAME']."</option>";
 			}
+			elseif($fieldcolname == "campaignid")
+			{
+				$OPTION_SET .= "<option value=\'vtiger_campaign.campaignname\'>".$mod_strings[$fieldlabel]."</option>";
+			}
 			else
 				$OPTION_SET .= "<option value=\'".$fieldtablename.".".$fieldcolname."\'>".$fieldlabel."</option>";
 		}
@@ -618,10 +622,7 @@
                                         $adv_string .= " ".getSearch_criteria($srch_cond,"1",$tab_name.'.'.$column_name)." ".$matchtype;
                                 if(stristr($srch_val,'no'))
                                         $adv_string .= " ".getSearch_criteria($srch_cond,"0",$tab_name.'.'.$column_name)." ".$matchtype;
-	
-
-			}
-
+			}
 			elseif($tab_col == "vtiger_crmentity.smownerid")
 			{
 				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'vtiger_users.user_name')." or";	

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Thu May 10 10:01:47 2007
@@ -334,7 +334,7 @@
 'Location'=>'Location',
 'No Time'=>'No Time',
 //Added for Send Reminder 4.2 release
-'Send Reminder'=>'Send Reminder',
+'Send Reminder'=>'Send Reminder (mins)',
 'LBL_YES'=>'Yes',
 'LBL_NO'=>'No',
 'LBL_DAYS'=>'day(s)',