[Vtigercrm-commits] [vtiger-commits] r10116 - in /vtigercrm/branches/5.0.3: include/ modules/Accounts/ modules/Contacts/ modules/HelpDesk/ modules/Leads/ modules/Potentials/ modules/Quotes/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Jan 29 08:18:14 EST 2007
Author: richie
Date: Mon Jan 29 06:18:01 2007
New Revision: 10116
Log:
start date and end date not visible. Fixes #2723
Modified:
vtigercrm/branches/5.0.3/include/RelatedListView.php
vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php
vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php
vtigercrm/branches/5.0.3/modules/Leads/Leads.php
vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/RelatedListView.php (original)
+++ vtigercrm/branches/5.0.3/include/RelatedListView.php Mon Jan 29 06:18:01 2007
@@ -383,8 +383,8 @@
$header[] = $app_strings['LBL_TYPE'];
$header[] = $app_strings['LBL_SUBJECT'];
$header[] = $app_strings['LBL_RELATED_TO'];
- $header[] = $app_strings['LBL_START_DATE'];
- $header[] = $app_strings['LBL_END_DATE'];
+ $header[] = $app_strings['LBL_START_DATE']." & ".$app_strings['LBL_TIME'];
+ $header[] = $app_strings['LBL_END_DATE']." & ".$app_strings['LBL_TIME'];
//$header[] = $app_strings['LBL_DESCRIPTION'];
$header[] = $app_strings['LBL_ACTION'];
$header[] = $app_strings['LBL_ASSIGNED_TO'];
@@ -413,10 +413,10 @@
$parentname = getRelatedTo('Calendar',$result,$i-1);
$entries[] = $parentname;
-
- $entries[] = $row['date_start'];
- $entries[] = $row['due_date'];
-
+
+ $entries[] = $row['date_start']." ".$row['time_start'];
+ $entries[] = $row['due_date']." ".$row['time_end'];
+
//$entries[] = nl2br($row['description']);
if(isPermitted("Calendar",1,$row["activityid"]) == 'yes')
@@ -445,7 +445,7 @@
$i++;
$entries_list[] = $entries;
}
-
+
$return_data = array('header'=>$header,'entries'=>$entries_list);
$log->debug("Exiting getHistory method ...");
return $return_data;
Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php Mon Jan 29 06:18:01 2007
@@ -288,6 +288,7 @@
$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject,
vtiger_activity.status, vtiger_activity.eventstatus,
vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,
+ vtiger_activity.time_start, vtiger_activity.time_end,
vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime,
vtiger_crmentity.description,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
FROM vtiger_activity
Modified: vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php Mon Jan 29 06:18:01 2007
@@ -397,7 +397,7 @@
{
global $log;
$log->debug("Entering get_history(".$id.") method ...");
- $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
+ $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_activity
inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php Mon Jan 29 06:18:01 2007
@@ -536,7 +536,7 @@
{
global $log;
$log->debug("Entering get_history(".$id.") method ...");
- $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description,
+ $query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus, vtiger_activity.date_start, vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end,vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime, vtiger_crmentity.description,
case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_activity
inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid= vtiger_activity.activityid
Modified: vtigercrm/branches/5.0.3/modules/Leads/Leads.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/Leads.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/Leads.php Mon Jan 29 06:18:01 2007
@@ -292,7 +292,8 @@
$log->debug("Entering get_history(".$id.") method ...");
$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start,
- vtiger_activity.due_date, vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime,
+ vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.time_end,
+ vtiger_crmentity.modifiedtime,vtiger_crmentity.createdtime,
vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
from vtiger_activity
inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
Modified: vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php Mon Jan 29 06:18:01 2007
@@ -383,7 +383,8 @@
$log->debug("Entering get_history(".$id.") method ...");
$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start,
- vtiger_activity.due_date, vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime,
+ vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.time_end,
+ vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime,
vtiger_crmentity.description,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_activity
inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Mon Jan 29 06:18:01 2007
@@ -215,7 +215,8 @@
$log->debug("Entering get_history(".$id.") method ...");
$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
vtiger_activity.eventstatus, vtiger_activity.activitytype,vtiger_activity.date_start,
- vtiger_activity.due_date, vtiger_contactdetails.contactid,
+ vtiger_activity.due_date,vtiger_activity.time_start, vtiger_activity.time_end,
+ vtiger_contactdetails.contactid,
vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
vtiger_crmentity.createdtime, vtiger_crmentity.description, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_activity
More information about the vtigercrm-commits
mailing list