[Vtigercrm-commits] [vtiger-commits] r7274 - in /vtigercrm/trunk/modules: Contacts/Contact.php Emails/Email.php Invoice/Invoice.php Products/Product.php PurchaseOrder/PurchaseOrder.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon Jun 19 14:37:42 2006
New Revision: 7274

Log:
* Modified the fieldname vtiger_attachmentsid to attachmentsid which is used to get the relatedlist fileid

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Mon Jun 19 14:37:42 2006
@@ -344,7 +344,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      ' AS ActivityType,
 		vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-		vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid, vtiger_notes.notesid AS crmid,
+		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_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Jun 19 14:37:42 2006
@@ -219,7 +219,7 @@
 		$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 vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -232,7 +232,7 @@
 		$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  vtiger_attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Jun 19 14:37:42 2006
@@ -197,7 +197,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Mon Jun 19 14:37:42 2006
@@ -111,7 +111,7 @@
 		$query = "SELECT vtiger_notes.title, 'Notes      ' AS ActivityType,
 			vtiger_notes.filename, vtiger_attachments.type  AS FileType,
 				crm2.modifiedtime AS lastmodified,
-			vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid,
+			vtiger_seattachmentsrel.attachmentsid AS attachmentsid,
 			vtiger_notes.notesid AS crmid, vtiger_crmentity.createdtime,
 			vtiger_notes.notecontent AS description,
 			vtiger_users.user_name
@@ -136,7 +136,7 @@
 			vtiger_attachments.name AS filename,
 			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified,
-			vtiger_attachments.attachmentsid AS vtiger_attachmentsid,
+			vtiger_attachments.attachmentsid AS attachmentsid,
 			vtiger_seattachmentsrel.attachmentsid AS crmid,
 			vtiger_crmentity.createdtime,
 			vtiger_attachments.description, vtiger_users.user_name

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Jun 19 14:37:42 2006
@@ -186,7 +186,7 @@
 		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title, 'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -203,7 +203,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime  lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid