[Vtigercrm-commits] [vtiger-commits] r10149 - in /vtigercrm/branches/5.0.3/modules: Accounts/ListViewTop.php Leads/ListViewTop.php Potentials/ListViewTop.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Tue Feb  6 06:43:14 2007
New Revision: 10149

Log:
ListviewTops for home page fix --Minnie

Modified:
    vtigercrm/branches/5.0.3/modules/Accounts/ListViewTop.php
    vtigercrm/branches/5.0.3/modules/Leads/ListViewTop.php
    vtigercrm/branches/5.0.3/modules/Potentials/ListViewTop.php

Modified: vtigercrm/branches/5.0.3/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/ListViewTop.php Tue Feb  6 06:43:14 2007
@@ -37,7 +37,7 @@
 	global $current_user;
 	$current_module_strings = return_module_language($current_language, "Accounts");
 
-	$list_query = "select vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol, sum(vtiger_potential.amount) as amount from vtiger_potential inner join vtiger_crmentity on (vtiger_potential.potentialid=vtiger_crmentity.crmid) inner join vtiger_account on (vtiger_potential.accountid=vtiger_account.accountid) where vtiger_crmentity.deleted=0 AND vtiger_crmentity.smownerid='".$current_user->id."' and vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' and vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' group by vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol order by amount desc;";
+	$list_query = "select vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol, sum(vtiger_potential.amount) as amount from vtiger_potential inner join vtiger_crmentity on (vtiger_potential.potentialid=vtiger_crmentity.crmid) inner join vtiger_account on (vtiger_potential.accountid=vtiger_account.accountid) where vtiger_crmentity.deleted=0 AND vtiger_crmentity.smownerid='".$current_user->id."' and vtiger_potential.sales_stage not in ('Closed Won', 'Closed Lost','".$app_strings['LBL_CLOSE_WON']."','".$app_strings['LBL_CLOSE_LOST']."') group by vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol order by amount desc;";
 	$list_result=$adb->query($list_query);
 	$open_accounts_list = array();
 	$noofrows = min($adb->num_rows($list_result),5);

Modified: vtigercrm/branches/5.0.3/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/ListViewTop.php Tue Feb  6 06:43:14 2007
@@ -68,7 +68,7 @@
 		$start_date = date("Y-m-d", strtotime("-1 week"));
 	}	
 
-	$list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; 
+	$list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_leaddetails.leadstatus not in ("Lost Lead", "Junk Lead","'.$current_module_strings['Lost Lead'].'","'.$current_module_strings['Junk Lead'].'") AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; 
 	
 	$list_result = $adb->query($list_query);
 	$noofrows = $adb->num_rows($list_result);

Modified: vtigercrm/branches/5.0.3/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/ListViewTop.php Tue Feb  6 06:43:14 2007
@@ -42,7 +42,7 @@
 	$title[]='myTopOpenPotentials.gif';
 	$title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES'];
 	$title[]='home_mypot';
-	$where = "AND vtiger_potential.sales_stage <> 'Closed Won' AND vtiger_potential.sales_stage <> 'Closed Lost' AND vtiger_crmentity.smownerid='".$current_user->id."'";
+	$where = "AND vtiger_potential.sales_stage not in ('Closed Won','Closed Lost','".$current_module_strings['Closed Won']."','".$current_module_strings['Closed Lost']."') AND vtiger_crmentity.smownerid='".$current_user->id."'";
 	$header=array();
 	$header[]=$current_module_strings['LBL_LIST_OPPORTUNITY_NAME'];
 	$header[]=$current_module_strings['LBL_LIST_ACCOUNT_NAME'];