[Vtigercrm-commits] [vtiger-commits] r9550 - /vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Tue Oct  3 05:40:46 2006
New Revision: 9550

Log:
Issue during mail merge in trouble tickets fixed

Modified:
    vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php

Modified: vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php
==============================================================================
--- vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php (original)
+++ vtigercrm/branches/5.0.1/modules/HelpDesk/Merge.php Tue Oct  3 05:40:46 2006
@@ -92,7 +92,7 @@
 	{
 		$column_name = "productsRel.productname";
 	}
-	if($tablename == "crmentity")
+	if($tablename == "vtiger_crmentity")
 	{
 		if($modulename == "Contacts")
 		{
@@ -171,7 +171,7 @@
 			left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id
 			left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id
 			left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id               
-			left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid 
+			left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid 
 			left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid
 			left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid
 			left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid