[Vtigercrm-commits] [vtiger-commits] r9060 - /vtigercrm/branches/4.2/modules/Contacts/Contact.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: allanbush
Date: Mon Aug 21 23:30:48 2006
New Revision: 9060

Log:
Added contact sub details to contact export.  Closes #1813.

Modified:
    vtigercrm/branches/4.2/modules/Contacts/Contact.php

Modified: vtigercrm/branches/4.2/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/Contact.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/Contact.php Mon Aug 21 23:30:48 2006
@@ -492,11 +492,12 @@
 		if($this->checkIfCustomTableExists())
 		{
 	   $query =  $this->constructCustomQueryAddendum() .",
-                                contactdetails.*, contactaddress.*,
+                                contactdetails.*, contactsubdetails.*, contactaddress.*,
                                 account.accountname AS account_name,
                                 users.user_name AS assigned_user_name
                                 FROM contactdetails
 				inner join crmentity on crmentity.crmid=contactdetails.contactid
+                                inner join contactsubdetails on contactsubdetails.contactsubscriptionid=contactdetails.contactid
                                 LEFT JOIN users ON crmentity.smcreatorid=users.id
                                 LEFT JOIN account on contactdetails.accountid=account.accountid
 				left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid
@@ -506,11 +507,12 @@
 		else
 		{
                   	 $query = "SELECT
-                                contactdetails.*, contactaddress.*,
+                                contactdetails.*, contactsubdetails.*, contactaddress.*,
                                 account.accountname AS account_name,
                                 users.user_name AS assigned_user_name
                                 FROM contactdetails
                                 inner join crmentity on crmentity.crmid=contactdetails.contactid
+                                inner join contactsubdetails on contactsubdetails.contactsubscriptionid=contactdetails.contactid
                                 LEFT JOIN users ON crmentity.smcreatorid=users.id
                                 LEFT JOIN account on contactdetails.accountid=account.accountid
 				left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid