[Vtigercrm-commits] [vtiger-commits] r9128 - /vtigercrm/trunk/modules/Dashboard/HomepageDB.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Aug 24 07:52:34 2006
New Revision: 9128

Log:
changes made to fix the DashBoard related issue  --Minnie

Modified:
    vtigercrm/trunk/modules/Dashboard/HomepageDB.php

Modified: vtigercrm/trunk/modules/Dashboard/HomepageDB.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/HomepageDB.php (original)
+++ vtigercrm/trunk/modules/Dashboard/HomepageDB.php Thu Aug 24 07:52:34 2006
@@ -19,8 +19,7 @@
 	//if($is_admin)
 	//	$homepagedb_query = "select vtiger_crmentity.* from vtiger_crmentity where vtiger_crmentity.setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder','SalesOrder','Activities','HelpDesk','Campaigns') and vtiger_crmentity.deleted=0";
 	//else	
-	$homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id;
-	//$homepagedb_query = "select vtiger_crmentity.* from vtiger_crmentity where vtiger_crmentity.setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder','SalesOrder','Calendar','HelpDesk','Campaigns') and vtiger_crmentity.deleted=0 and vtiger_crmentity.smownerid=".$current_user->id;
+	$homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id;
 	$graph_by="setype";
 	$graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name;
 	$module="Home";