[Vtigercrm-commits] [vtiger-commits] r6482 - /vtigercrm/trunk/modules/Accounts/Account.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Fri May 26 10:30:08 2006
New Revision: 6482

Log:
Updated the Related List Query for activity & history - Ahmed

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Fri May 26 10:30:08 2006
@@ -285,7 +285,7 @@
 				AND (activity.status IS NOT NULL
 					AND activity.status != 'Deferred')
 				OR (activity.eventstatus !=''
-					AND  activity.eventstatus = 'Planned'))";
+					AND  activity.eventstatus != 'Held'))";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Accounts','Activities',$focus,$query,$button,$returnset);
 
@@ -323,7 +323,7 @@
 				OR activity.activitytype = 'Task')
 			AND (activity.status = 'Completed'
 				OR activity.status = 'Deferred'
-				OR (activity.eventstatus != 'Planned'
+				OR (activity.eventstatus = 'Held'
 					AND activity.eventstatus != ''))
 			AND seactivityrel.crmid = ".$id;
 		//Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php