[Vtigercrm-commits] [vtiger-commits] r10747 - /vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Fri Apr 20 09:01:08 2007
New Revision: 10747

Log:
fix for unwanted fields displayed in calendar customview Choose Columns(Duration & No Time) list. Fixes #3342 --minnie

Modified:
    vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php

Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Fri Apr 20 09:01:08 2007
@@ -196,6 +196,10 @@
 			$sql = "select * from vtiger_field ";
 			$sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and";
 			$sql.= $display_type;
+			if($tabid == 9 || $tabid==16)
+			{
+				$sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')";
+			}
 			$sql.= " order by sequence";
 		}
 		else
@@ -205,7 +209,13 @@
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
 			$sql.= " where vtiger_field.tabid in (".$tabid.") and vtiger_field.block in (".$block.") and";
 			$sql.= "$display_type and vtiger_profile2field.visible=0";
-			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." group by columnname order by sequence";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList;
+			if($tabid == 9 || $tabid==16)
+			{
+				$sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')";
+			}
+
+			$sql.= "group by columnname order by sequence";
 		}	
 		if($tabid == '9,16')
                         $tabid ="9";