[Vtigercrm-commits] [vtiger-commits] r4141 - /vtigercrm/trunk/modules/Calendar/appointment.pinc

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon Mar 13 04:17:44 2006
New Revision: 4141

Log:
in query activity.description has been changed to crmentity.description

Modified:
    vtigercrm/trunk/modules/Calendar/appointment.pinc

Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc
==============================================================================
--- vtigercrm/trunk/modules/Calendar/appointment.pinc (original)
+++ vtigercrm/trunk/modules/Calendar/appointment.pinc Mon Mar 13 04:17:44 2006
@@ -1976,7 +1976,7 @@
 		# Second query ( Get Recurring appointments )
 		#
 		#
-		$q = "SELECT activity.activityid, activity.subject, activity.activitytype, activity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid";
+		$q = "SELECT activity.activityid, activity.subject, activity.activitytype, crmentity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid";
 
 		$q.=" where ( activity.activitytype in ('Call','Meeting') AND "; 
 		if(!is_admin($current_user))