Skip to content

Commit

Permalink
Merge pull request #16689 from pradpnayak/priceSetSchema
Browse files Browse the repository at this point in the history
Use dbAlias to generate where clause for date field in activity report
  • Loading branch information
seamuslee001 authored Mar 6, 2020
2 parents df70897 + c44cb2b commit c8ebc62
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CRM/Report/Form/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ public function where($recordType = NULL) {
$from = CRM_Utils_Array::value("{$fieldName}_from", $this->_params);
$to = CRM_Utils_Array::value("{$fieldName}_to", $this->_params);

$clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']);
$clause = $this->dateClause($field['dbAlias'], $relative, $from, $to, $field['type']);
}
else {
$op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/ActivitySummary.php
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ public function where($durationMode = FALSE) {
$from = CRM_Utils_Array::value("{$fieldName}_from", $this->_params);
$to = CRM_Utils_Array::value("{$fieldName}_to", $this->_params);

$clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']);
$clause = $this->dateClause($field['dbAlias'], $relative, $from, $to, $field['type']);
}
else {
$op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
Expand Down

0 comments on commit c8ebc62

Please sign in to comment.