From 4f2ca02d173f382f1fde2c2edaa9a6ca31e3e953 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Thu, 12 Dec 2019 16:59:31 +0530
Subject: [PATCH] Fixes #1224 Default filter conditions is addressed
---
modules/Migration/schema/540_to_600RC.php | 10 +++++-----
modules/Migration/schema/720_to_721.php | 1 +
modules/Reports/models/Record.php | 15 ++++++++++-----
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/modules/Migration/schema/540_to_600RC.php b/modules/Migration/schema/540_to_600RC.php
index 007fe2ecd..6e5a38b8b 100644
--- a/modules/Migration/schema/540_to_600RC.php
+++ b/modules/Migration/schema/540_to_600RC.php
@@ -204,28 +204,28 @@ $selectcolumns = Array(
Array('vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
'vtiger_contactdetails:email:Contacts_Email:email:E',
'vtiger_activity:subject:Emails_Subject:subject:V',
- 'vtiger_email_track:access_count:Emails_Access_Count:access_count:I'),
+ 'vtiger_email_track:access_count:Emails_Access_Count:access_count:V'),
Array('vtiger_account:accountname:Accounts_Account_Name:accountname:V',
'vtiger_account:phone:Accounts_Phone:phone:V',
'vtiger_account:email1:Accounts_Email:email1:E',
'vtiger_activity:subject:Emails_Subject:subject:V',
- 'vtiger_email_track:access_count:Emails_Access_Count:access_count:I'),
+ 'vtiger_email_track:access_count:Emails_Access_Count:access_count:V'),
Array('vtiger_leaddetails:lastname:Leads_Last_Name:lastname:V',
'vtiger_leaddetails:company:Leads_Company:company:V',
'vtiger_leaddetails:email:Leads_Email:email:E',
'vtiger_activity:subject:Emails_Subject:subject:V',
- 'vtiger_email_track:access_count:Emails_Access_Count:access_count:I'),
+ 'vtiger_email_track:access_count:Emails_Access_Count:access_count:V'),
Array('vtiger_vendor:vendorname:Vendors_Vendor_Name:vendorname:V',
'vtiger_vendor:glacct:Vendors_GL_Account:glacct:V',
'vtiger_vendor:email:Vendors_Email:email:E',
'vtiger_activity:subject:Emails_Subject:subject:V',
- 'vtiger_email_track:access_count:Emails_Access_Count:access_count:I'),
+ 'vtiger_email_track:access_count:Emails_Access_Count:access_count:V'),
);
$advfilters = Array(
Array(
Array(
- 'columnname' => 'vtiger_email_track:access_count:Emails_Access_Count:access_count:I',
+ 'columnname' => 'vtiger_email_track:access_count:Emails_Access_Count:access_count:V',
'comparator' => 'n',
'value' => ''
)
diff --git a/modules/Migration/schema/720_to_721.php b/modules/Migration/schema/720_to_721.php
index 294a00836..41925e233 100644
--- a/modules/Migration/schema/720_to_721.php
+++ b/modules/Migration/schema/720_to_721.php
@@ -12,6 +12,7 @@ if (defined('VTIGER_UPGRADE')) {
global $current_user, $adb;
$db = PearDatabase::getInstance();
+ //Profile privilege supported for Emails Module
$actions = array('Save', 'EditView', 'Delete', 'DetailView', 'CreateView');
$emailsTabId = getTabid('Emails');
diff --git a/modules/Reports/models/Record.php b/modules/Reports/models/Record.php
index 66259d386..a0a16ee9b 100644
--- a/modules/Reports/models/Record.php
+++ b/modules/Reports/models/Record.php
@@ -1041,12 +1041,17 @@ class Reports_Record_Model extends Vtiger_Record_Model {
$tranformedStandardFilter['comparator'] = 'bw';
$fields = explode(':',$standardFilter['columnname']);
-
+ $standardReports = array('Last Month Activities', 'This Month Activities');
if($fields[1] == 'createdtime' || $fields[1] == 'modifiedtime' ||($fields[0] == 'vtiger_activity' && $fields[1] == 'date_start')){
- $tranformedStandardFilter['columnname'] = "$fields[0]:$fields[1]:$fields[3]:$fields[2]:DT";
- $date[] = $standardFilter['startdate'].' 00:00:00';
- $date[] = $standardFilter['enddate'].' 00:00:00';
- $tranformedStandardFilter['value'] = implode(',',$date);
+ if(in_array($this->get('reportname'), $standardReports)){
+ $tranformedStandardFilter['columnname'] = "$fields[0]Calendar:$fields[1]:$fields[3]:$fields[2]:DT";
+ $tranformedStandardFilter['comparator'] = $standardFilter['type'];
+ }else{
+ $tranformedStandardFilter['columnname'] = "$fields[0]Calendar:$fields[1]:$fields[3]:$fields[2]:DT";
+ $date[] = $standardFilter['startdate'].' 00:00:00';
+ $date[] = $standardFilter['enddate'].' 00:00:00';
+ $tranformedStandardFilter['value'] = implode(',',$date);
+ }
} else{
$tranformedStandardFilter['columnname'] = "$fields[0]:$fields[1]:$fields[3]:$fields[2]:D";
$tranformedStandardFilter['value'] = $standardFilter['startdate'].','.$standardFilter['enddate'];
--
GitLab