[Vtigercrm-commits] [vtiger-commits] r10152 - /vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed Feb  7 05:49:44 2007
New Revision: 10152

Log:
fix for trouble ticket status and advanced filter date fields in report --Minnie

Modified:
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.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 Wed Feb  7 05:49:44 2007
@@ -355,7 +355,7 @@
 					}
 					$advorsqls = implode(" or ",$advorsql);
 					$fieldvalue = " (".$advorsqls.") ";
-				}elseif($selectedfields[1] == 'status')
+				}elseif($selectedfields[0] == 'vtiger_activity' && $selectedfields[1] == 'status')	
 				{
 					$fieldvalue = "(case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end)".$this->getAdvComparator($comparator,trim($value),$datatype);
 				}
@@ -367,7 +367,9 @@
 				{
 					$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value),$datatype);
 				}
-				$advfilterlist[$fieldcolname] = $fieldvalue;		
+				if(isset($advfilterlist[$fieldcolname]))
+					$advfilterlist[$fieldcolname] = $advfilterlist[$fieldcolname].' and '.$fieldvalue;
+				else $advfilterlist[$fieldcolname] = $fieldvalue;		
 			}
 
 		}