[Vtigercrm-commits] [vtiger-commits] r4840 - /vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: allanbush
Date: Mon Apr  3 11:16:17 2006
New Revision: 4840

Log:
Fixed detail view by replacing || with OR in related list query.  Refs #17.

Modified:
    vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php

Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/modules/Orders/Order.php Mon Apr  3 11:16:17 2006
@@ -166,7 +166,7 @@
 	}
 	function get_activities($id)
 	{
-		$query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL || activity.status != 'Completed' ) and (  activity.eventstatus is NULL ||  activity.eventstatus != 'Held')";
+		$query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and ( activity.status is NULL OR activity.status != 'Completed' ) and (  activity.eventstatus is NULL OR  activity.eventstatus != 'Held')";
 		renderRelatedActivities($query,$id);
 	}
 	function get_history($id)