[Vtigercrm-commits] [vtiger-commits] r9365 - /vtigercrm/trunk/modules/Invoice/Invoice.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Sat Sep  9 02:31:33 2006
New Revision: 9365

Log:
Postgres fixes by Jens done --By Don

Modified:
    vtigercrm/trunk/modules/Invoice/Invoice.php

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Sep  9 02:31:33 2006
@@ -208,10 +208,10 @@
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		
-		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
-		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
-			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		$query = "select vtiger_notes.title,'Notes      ' as ActivityType, vtiger_notes.filename,
+ 		vtiger_attachments.type as FileType,crm2.modifiedtime as lastmodified,
+ 		vtiger_seattachmentsrel.attachmentsid as attachmentsid, vtiger_notes.notesid as crmid,
+ 			crm2.createdtime, vtiger_notes.notecontent as description, vtiger_users.user_name	
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
@@ -223,9 +223,9 @@
 		
 		$query .= ' union all ';
 
-		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
-		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		$query .= "select vtiger_attachments.description as title ,'Attachments' as ActivityType,
+ 		vtiger_attachments.name as filename, vtiger_attachments.type as FileType, crm2.modifiedtime as lastmodified,
+ 		vtiger_attachments.attachmentsid as attachmentsid, vtiger_seattachmentsrel.attachmentsid as crmid,	
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid