[Vtigercrm-commits] [vtiger-commits] r9799 - in /vtigercrm/branches/5.0.3: data/CRMEntity.php include/utils/ExportUtils.php modules/Reports/AdvancedFilter.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Nov  8 03:13:46 2006
New Revision: 9799

Log:
typo error fixed

Modified:
    vtigercrm/branches/5.0.3/data/CRMEntity.php
    vtigercrm/branches/5.0.3/include/utils/ExportUtils.php
    vtigercrm/branches/5.0.3/modules/Reports/AdvancedFilter.php

Modified: vtigercrm/branches/5.0.3/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0.3/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0.3/data/CRMEntity.php Wed Nov  8 03:13:46 2006
@@ -972,15 +972,15 @@
                 for($i=0; $i < $numRows;$i++)
                 {
                         $columnName = $adb->query_result($result,$i,"columnname");
-                        $fieldlable = $adb->query_result($result,$i,"fieldlabel");
+                        $fieldlabel = $adb->query_result($result,$i,"fieldlabel");
                         //construct query as below
                         if($i == 0)
                         {
-                                $sql3 .= $tablename.".".$columnName. " '" .$fieldlable."'";
+                                $sql3 .= $tablename.".".$columnName. " '" .$fieldlabel."'";
                         }
                         else
                         {
-                                $sql3 .= ", ".$tablename.".".$columnName. " '" .$fieldlable."'";
+                                $sql3 .= ", ".$tablename.".".$columnName. " '" .$fieldlabel."'";
                         }
 
                 }

Modified: vtigercrm/branches/5.0.3/include/utils/ExportUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ExportUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ExportUtils.php Wed Nov  8 03:13:46 2006
@@ -87,21 +87,21 @@
 	for($i=0; $i < $num_rows;$i++)
 	{
 		$columnName = $adb->query_result($result,$i,"columnname");
-		$fieldlable = $adb->query_result($result,$i,"fieldlabel");
+		$fieldlabel = $adb->query_result($result,$i,"fieldlabel");
 		$tablename = $adb->query_result($result,$i,"tablename");
 
 		//HANDLE HERE - Mismatch fieldname-tablename in field table, in future we have to avoid these if elses
 		if($columnName == 'smownerid')//for all assigned to user name
 		{
-			$fields .= "vtiger_users.user_name as '".$fieldlable."', ";
+			$fields .= "vtiger_users.user_name as '".$fieldlabel."', ";
 		}
 		elseif($tablename == 'vtiger_account' && $columnName == 'parentid')//Account - Member Of
 		{
-			 $fields .= "vtiger_account2.accountname as '".$fieldlable."', ";
+			 $fields .= "vtiger_account2.accountname as '".$fieldlabel."', ";
 		}
 		elseif($tablename == 'vtiger_contactdetails' && $columnName == 'accountid')//Contact - Account Name
 		{
-			$fields .= "vtiger_account.accountname as '".$fieldlable."', ";
+			$fields .= "vtiger_account.accountname as '".$fieldlabel."', ";
 		}
 		elseif($tablename == 'vtiger_contactdetails' && $columnName == 'reportsto')//Contact - Reports To
 		{
@@ -109,11 +109,11 @@
 		}
 		elseif($tablename == 'vtiger_potential' && $columnName == 'accountid')//Potential - Account Name
 		{
-			$fields .= "vtiger_account.accountname as '".$fieldlable."',";
+			$fields .= "vtiger_account.accountname as '".$fieldlabel."',";
 		}
 		elseif($tablename == 'vtiger_potential' && $columnName == 'campaignid')//Potential - Campaign Source
 		{
-			$fields .= "vtiger_campaign.campaignname as '".$fieldlable."',";
+			$fields .= "vtiger_campaign.campaignname as '".$fieldlabel."',";
 		}
 		elseif($tablename == 'vtiger_seproductsrel' && $columnName == 'crmid')//Product - Related To
 		{
@@ -131,7 +131,7 @@
 		}
 		elseif($tablename == 'vtiger_products' && $columnName == 'vendor_id')//Product - Vendor Name
 		{
-			$fields .= "vtiger_vendor.vendorname as '".$fieldlable."',";
+			$fields .= "vtiger_vendor.vendorname as '".$fieldlabel."',";
 		}
 		elseif($tablename == 'vtiger_producttaxrel' && $columnName == 'taxclass')//avoid product - taxclass
 		{
@@ -155,11 +155,11 @@
 		}
 		elseif($tablename == 'vtiger_attachments' && $columnName == 'filename')//Emails filename
 		{
-			$fields .= $tablename.".name '".$fieldlable."',";
+			$fields .= $tablename.".name '".$fieldlabel."',";
 		}
 		else
 		{
-			$fields .= $tablename.".".$columnName. " '" .$fieldlable."',";
+			$fields .= $tablename.".".$columnName. " '" .$fieldlabel."',";
 		}
 	}
 	$fields = trim($fields,",");

Modified: vtigercrm/branches/5.0.3/modules/Reports/AdvancedFilter.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/AdvancedFilter.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/AdvancedFilter.php Wed Nov  8 03:13:46 2006
@@ -140,7 +140,7 @@
 					{
 					  foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
 					  {
-						if(isset($mod_strings[$fieldlable]))
+						if(isset($mod_strings[$fieldlabel]))
 						{
 							if($selected == $field)
 							{