[Vtigercrm-commits] [vtiger-commits] r9668 - in /vtigercrm/branches/5.0.2/modules: Invoice/ListTopInvoice.php Potentials/ListViewTop.php PurchaseOrder/ListTopPurchaseOrder.php Quotes/ListTopQuotes.php SalesOrder/ListTopSalesOrder.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Oct 19 10:23:21 2006
New Revision: 9668

Log:
My Home Page do not display some Boxes when Sharing Access are set to 'Private'. Fixes #2312

Modified:
    vtigercrm/branches/5.0.2/modules/Invoice/ListTopInvoice.php
    vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php
    vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php
    vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php
    vtigercrm/branches/5.0.2/modules/SalesOrder/ListTopSalesOrder.php

Modified: vtigercrm/branches/5.0.2/modules/Invoice/ListTopInvoice.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Invoice/ListTopInvoice.php (original)
+++ vtigercrm/branches/5.0.2/modules/Invoice/ListTopInvoice.php Thu Oct 19 10:23:21 2006
@@ -52,9 +52,9 @@
 	$date_var = date('Y-m-d');
 
 	//Changed for Patch 2 by Don
-	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_invoice.invoicestatus != \'Paid\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_invoice.invoicestatus != \'Paid\'';
 	$query = getListQuery("Invoice",$where);
-
+	$query .= " ORDER BY total DESC";
 	//<<<<<<<<customview>>>>>>>>>
 
 	$list_result = $adb->limitQuery($query,0,5);

Modified: vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/branches/5.0.2/modules/Potentials/ListViewTop.php Thu Oct 19 10:23:21 2006
@@ -42,7 +42,7 @@
 	$title[]='myTopOpenPotentials.gif';
 	$title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES'];
 	$title[]='home_mypot';
-	$where = "AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND vtiger_crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC";
+	$where = "AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_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'];
@@ -53,6 +53,7 @@
         $header[]=$current_module_strings['LBL_LIST_AMOUNT'].'('.$curr_symbol.')';
 	$header[]=$current_module_strings['LBL_LIST_DATE_CLOSED'];
 	$list_query = getListQuery("Potentials",$where);
+	$list_query .=" ORDER BY amount DESC";
 	$list_result = $adb->limitQuery($list_query,0,5);
 	$open_potentials_list = array();
 	$noofrows = $adb->num_rows($list_result);

Modified: vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php (original)
+++ vtigercrm/branches/5.0.2/modules/PurchaseOrder/ListTopPurchaseOrder.php Thu Oct 19 10:23:21 2006
@@ -56,9 +56,9 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_purchaseorder.duedate >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_purchaseorder.duedate >= \''.$date_var.'\'';
 	$query = getListQuery("PurchaseOrder",$where);
-
+	$query .=" ORDER BY total DESC";
 
 	//<<<<<<<<customview>>>>>>>>>
 

Modified: vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php (original)
+++ vtigercrm/branches/5.0.2/modules/Quotes/ListTopQuotes.php Thu Oct 19 10:23:21 2006
@@ -60,9 +60,9 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_quotes.validtill >= \''.$date_var.'\'';
 	$query = getListQuery("Quotes",$where);
-
+	$query .=" ORDER BY total DESC";
 	//<<<<<<<<customview>>>>>>>>>
 
 	$list_result = $adb->limitQuery($query,0,5);

Modified: vtigercrm/branches/5.0.2/modules/SalesOrder/ListTopSalesOrder.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/SalesOrder/ListTopSalesOrder.php (original)
+++ vtigercrm/branches/5.0.2/modules/SalesOrder/ListTopSalesOrder.php Thu Oct 19 10:23:21 2006
@@ -56,9 +56,9 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_salesorder.duedate >= \''.$date_var.'\'';
 	$query = getListQuery("SalesOrder",$where);
-
+	$query .=" ORDER BY total DESC";
 	//<<<<<<<<customview>>>>>>>>>
 
 	$list_result = $adb->limitQuery($query,0,5);