Commit c8e904c0 authored by KarinG's avatar KarinG
Browse files

Merge branch 'report-field-type' into 'master'

Explicitly specify report field types to match changes in core

See merge request !159
parents 9111ea82 a530da88
......@@ -25,6 +25,7 @@ class CRM_Cdntaxreceipts_Form_Report_ReceiptsIssued extends CRM_Report_Form {
array(
'no_display' => TRUE,
'required' => TRUE,
'type' => CRM_Utils_Type::T_INT,
),
),
'grouping' => 'tax-fields',
......@@ -46,7 +47,7 @@ class CRM_Cdntaxreceipts_Form_Report_ReceiptsIssued extends CRM_Report_Form {
'receipt_no' => array('title' => 'Receipt No.', 'default' => TRUE),
'issue_type' => array('title' => 'Issue Type', 'default' => TRUE),
'issue_method' => array('title' => 'Issue Method', 'default' => TRUE),
'uid' => array('title' => 'Issued By', 'default' => TRUE),
'uid' => array('title' => 'Issued By', 'default' => TRUE, 'type' => CRM_Utils_Type::T_INT),
'receipt_status' => array('title' => 'Receipt Status', 'default' => TRUE,),
'email_opened' => array('title' => 'Email Open Date', 'type' => CRM_Utils_Type::T_TIMESTAMP, 'default' => TRUE),
),
......@@ -112,7 +113,9 @@ class CRM_Cdntaxreceipts_Form_Report_ReceiptsIssued extends CRM_Report_Form {
array(
'contribution_id' => array(
'default' => TRUE,
'dbAlias' => "GROUP_CONCAT(DISTINCT cdntaxreceipts_log_contributions_civireport.contribution_id ORDER BY cdntaxreceipts_log_contributions_civireport.contribution_id SEPARATOR ', ')", ),
'dbAlias' => "GROUP_CONCAT(DISTINCT cdntaxreceipts_log_contributions_civireport.contribution_id ORDER BY cdntaxreceipts_log_contributions_civireport.contribution_id SEPARATOR ', ')",
'type' => CRM_Utils_Type::T_INT,
),
),
'grouping' => 'tax-fields',
),
......
......@@ -61,6 +61,7 @@ class CRM_Cdntaxreceipts_ReceiptsIssuedReportTest extends CRM_Cdntaxreceipts_Bas
'civicrm_cdntaxreceipts_log_contributions_contribution_id' => 1,
'civicrm_contact_sort_name_link' => '/index.php?q=civicrm/contact/view&reset=1&cid=' . $contact_id,
'civicrm_contact_sort_name_hover' => 'View Contact Summary for this Contact',
'class' => NULL,
]
], $data);
}
......@@ -122,6 +123,7 @@ class CRM_Cdntaxreceipts_ReceiptsIssuedReportTest extends CRM_Cdntaxreceipts_Bas
'civicrm_contribution_payment_instrument_id' => 'Check',
'civicrm_contact_sort_name_link' => '/index.php?q=civicrm/contact/view&reset=1&cid=' . $contact_id,
'civicrm_contact_sort_name_hover' => 'View Contact Summary for this Contact',
'class' => NULL,
]
], $data);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment