[Vtigercrm-commits] [vtiger-commits] r6316 - /vtigercrm/trunk/modules/HelpDesk/Merge.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Tue May 23 00:29:16 2006
New Revision: 6316

Log:
modified for 5.0 beta release

Modified:
    vtigercrm/trunk/modules/HelpDesk/Merge.php

Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Merge.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Merge.php Tue May 23 00:29:16 2006
@@ -71,7 +71,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and (field.tablename <>'CustomerDetails' and block <> 6) order by field.tablename";
+$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6) and block <> 30 order by field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);