[Vtigercrm-commits] [vtiger-commits] r9681 - /vtigercrm/branches/5.0.2/modules/Reports/ReportRun.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Mon Oct 23 07:30:39 2006
New Revision: 9681

Log:
* Added inner join with campaignscf table in Campaings - Report query, Fixes #2454

Modified:
    vtigercrm/branches/5.0.2/modules/Reports/ReportRun.php

Modified: vtigercrm/branches/5.0.2/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.2/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.2/modules/Reports/ReportRun.php Mon Oct 23 07:30:39 2006
@@ -1269,11 +1269,14 @@
 
 
 		}	
-		if($module == "Campaigns")// added for 5.0
-		{
-			$query = "from vtiger_campaign 
-				inner join vtiger_crmentity as vtiger_crmentityCampaigns on vtiger_crmentityCampaigns.crmid=vtiger_campaign.campaignid 				             left join vtiger_users as vtiger_usersCampaigns on vtiger_usersCampaigns.id = vtiger_crmentityCampaigns.smownerid 
-				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
+		if($module == "Campaigns")
+		{
+		 $query = "from vtiger_campaign
+			        inner join vtiger_campaignscf as vtiger_campaignscf on vtiger_campaignscf.campaignid=vtiger_campaign.campaignid   
+				inner join vtiger_crmentity as vtiger_crmentityCampaigns on vtiger_crmentityCampaigns.crmid=vtiger_campaign.campaignid
+
+		             left join vtiger_users as vtiger_usersCampaigns on vtiger_usersCampaigns.id = vtiger_crmentityCampaigns.smownerid
+                                ".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityCampaigns.deleted=0";
 		}
 		$log->info("ReportRun :: Successfully returned getReportsQuery".$module);