[Vtigercrm-commits] [vtiger-commits] r6819 - /vtigercrm/trunk/modules/Accounts/Merge.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed May 31 00:12:48 2006
New Revision: 6819

Log:
* modified for 5.0 beta

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

Modified: vtigercrm/trunk/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Merge.php (original)
+++ vtigercrm/trunk/modules/Accounts/Merge.php Wed May 31 00:12:48 2006
@@ -93,7 +93,7 @@
 //End setting accountid=0 for the contacts which are deleted
 
 //<<<<<<<<<<<<<<<<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 (4,6) and field.block <> 4 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 (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);