[Vtigercrm-commits] [vtiger-commits] r5855 - in /vtigercrm/trunk: modules/Contacts/Contact.php modules/Emails/Email.php soap/contactserialize.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: don
Date: Wed May 10 12:30:55 2006
New Revision: 5855

Log:
* Modified to fix the thundirbird issues

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/soap/contactserialize.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Wed May 10 12:30:55 2006
@@ -197,7 +197,7 @@
     {   
 	global $log;
 	$log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ...");
-      $query = "select users.user_name,groups.groupname, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id   from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid  left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid  left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid where user_name='" .$user_name ."' and crmentity.deleted=0  and contactdetails.email like '%" .$email_address ."%' limit 50";
+      $query = "select users.user_name, contactdetails.lastname last_name,contactdetails.firstname first_name,contactdetails.contactid as id, contactdetails.salutation as salutation, contactdetails.email as email1,contactdetails.title as title,contactdetails.mobile as phone_mobile,account.accountname as account_name,account.accountid as account_id   from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid inner join users on users.id=crmentity.smownerid  left join account on account.accountid=contactdetails.accountid left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid  left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid where user_name='" .$user_name ."' and crmentity.deleted=0  and contactdetails.email like '%" .$email_address ."%' limit 50";
     
 	$log->debug("Exiting get_contacts1 method ...");
       return $this->process_list_query1($query);

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Wed May 10 12:30:55 2006
@@ -45,6 +45,10 @@
 	var $date_start;
 	var $time_start;
   	var $module_id="emailid";
+
+	var $rel_users_table = "salesmanactivityrel";
+	var $rel_contacts_table = "cntactivityrel";
+	var $rel_serel_table = "seactivityrel";
 
 	var $table_name = "activity";
 	var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel');

Modified: vtigercrm/trunk/soap/contactserialize.php
==============================================================================
--- vtigercrm/trunk/soap/contactserialize.php (original)
+++ vtigercrm/trunk/soap/contactserialize.php Wed May 10 12:30:55 2006
@@ -1467,6 +1467,7 @@
 	$email_subject = str_replace("'", "''", $email_subject);
 	
 	//fixed subject issue 9/6/05
+	$email->column_fields[activitytype]='Emails';
 	$email->column_fields[subject]=$email_subject;
 	$email->column_fields[assigned_user_id] = $user_id;
 	$email->column_fields[date_start] = $date_sent;