[Vtigercrm-commits] [vtiger-commits] r10447 - in /vtigercrm/branches/5.0.3/modules/Reports: ReportRun.php Reports.php language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Thu Mar 15 09:36:43 2007
New Revision: 10447

Log:
Ticket id added in reports

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
    vtigercrm/branches/5.0.3/modules/Reports/Reports.php
    vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Thu Mar 15 09:36:43 2007
@@ -153,6 +153,9 @@
 		{
 			$access_fields[] = $collistrow["fieldname"];
 		}
+		//added to include ticketid for Reports module in select columnlist for all users
+		if($module == "HelpDesk")
+			$access_fields[] = "ticketid";
 		return $access_fields;
 	}
 	

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Thu Mar 15 09:36:43 2007
@@ -325,6 +325,12 @@
 		{
 			 $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type';
 		}
+		
+		if($module == 'HelpDesk' && $block == 25)
+                {
+                        $module_columnlist['vtiger_crmentity:crmid:HelpDesk_Ticket_ID:ticketid:I'] = 'Ticket ID';
+                }
+
 
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
@@ -899,7 +905,7 @@
 				$mod_strings = return_module_language($current_language,$module);
 				$fieldlabel = trim(str_replace($module," ",$selectedfields[2]));
 				$fieldlabel = trim(str_replace("_"," ",$fieldlabel));		
-			if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields))
+			if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields) && $fieldname != 'ticketid')
 			{
 				if(isset($mod_strings[$fieldlabel])) 
 				{

Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Thu Mar 15 09:36:43 2007
@@ -203,6 +203,8 @@
 'MIN'=>'MIN',
 'LBL_CUSTOM_REPORTS'=>'Custom Reports',
 
+'ticketid'=>'Ticket Id',
+
 )
 
 ?>