-fixed for CRM-12017

CRM/Report/Form/Contribute/Bookkeeping.php

@@ -92,14 +92,14 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
         'dao' => 'CRM_Contribute_DAO_Contribution',
         'fields' =>
         array(
-          'receive_date' => array('default' => TRUE),
-          'trxn_id' => array('title' => ts('Trans #'),
-            'default' => TRUE,
+          'receive_date' => array(
+            'default' => TRUE
           ),
-          'invoice_id' => array('title' => ts('Invoice ID'),
+          'invoice_id' => array(
+            'title' => ts('Invoice ID'),
             'default' => TRUE,
           ),
-          'contribution_status_id' => array('title' => ts('Status'),
+          'contribution_status_id' => array('title' => ts('Contribution Status'),
             'default' => TRUE,
           ),
           'id' => array('title' => ts('Contribution #'),
@@ -144,14 +144,27 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           'payment_instrument_id' => array('title' => ts('Payment Instrument'),
             'default' => TRUE,
           ),
+          'trxn_date' => array(
+            'title' => ts('Transaction Date'),
+            'default' => TRUE
+          ),
+          'trxn_id' => array(
+            'title' => ts('Trans #'),
+            'default' => TRUE,
+          ),
         ),
         'filters' =>
         array(
           'payment_instrument_id' => array(
-            'title' => ts('Paid By'),
+            'title' => ts('Payment Instrument'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
             'options' => CRM_Contribute_PseudoConstant::paymentInstrument(),
           ),
+          'trxn_date' => array( 
+            'title' => ts('Transaction Date'),
+            'operatorType' => CRM_Report_Form::OP_DATE,
+            'type' => CRM_Utils_Type::T_DATE,
+          ),
         ),
       ), 
       'civicrm_entity_financial_trxn' => array(
@@ -172,13 +185,13 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
         'dao' => 'CRM_Financial_DAO_FinancialAccount',
         'fields' => array(
           'debit_accounting_code' => array(
-            'title' => ts('Financial Account Code- Debit'),
+            'title' => ts('Financial Account Code - Debit'),
             'name'  => 'accounting_code',
             'alias' => 'financial_account_civireport_debit',
             'default' => TRUE,
           ),
           'credit_accounting_code' => array(
-            'title' => ts('Financial Account Code- Credit'),
+            'title' => ts('Financial Account Code - Credit'),
             'name'  => 'accounting_code',
             'alias' => 'financial_account_civireport_credit',
             'default' => TRUE,

xml/templates/civicrm_navigation.tpl

@@ -736,7 +736,7 @@ VALUES
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
 VALUES
-    ( @domainID, 'Bookkeeping Transactions', 'contribute/bookkeeping', 'Provides transaction details for all contributions and payments, including Transaction #, Invoice ID, Payment Instrument and Check #.', 'access CiviContribute', '{literal}a:25:{s:6:"fields";a:10:{s:9:"sort_name";s:1:"1";s:12:"receive_date";s:1:"1";s:12:"total_amount";s:1:"1";s:20:"contribution_type_id";s:1:"1";s:7:"trxn_id";s:1:"1";s:10:"invoice_id";s:1:"1";s:12:"check_number";s:1:"1";s:21:"payment_instrument_id";s:1:"1";s:22:"contribution_status_id";s:1:"1";s:2:"id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:23:"contribution_type_id_op";s:2:"in";s:26:"contribution_type_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:11:"description";s:37:"Shows Bookkeeping Transactions Report";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}{/literal}');
+    ( @domainID, 'Bookkeeping Transactions', 'contribute/bookkeeping', 'Provides transaction details for all contributions and payments, including Transaction #, Invoice ID, Payment Instrument and Check #.', 'access CiviContribute', '{literal}a:32:{s:6:"fields";a:12:{s:9:"sort_name";s:1:"1";s:12:"receive_date";s:1:"1";s:22:"contribution_status_id";s:1:"1";s:2:"id";s:1:"1";s:17:"financial_type_id";s:1:"1";s:12:"check_number";s:1:"1";s:21:"payment_instrument_id";s:1:"1";s:9:"trxn_date";s:1:"1";s:7:"trxn_id";s:1:"1";s:6:"amount";s:1:"1";s:21:"debit_accounting_code";s:1:"1";s:22:"credit_accounting_code";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:20:"financial_type_id_op";s:2:"in";s:23:"financial_type_id_value";a:0:{}s:24:"payment_instrument_id_op";s:2:"in";s:27:"payment_instrument_id_value";a:0:{}s:18:"trxn_date_relative";s:1:"0";s:14:"trxn_date_from";s:0:"";s:12:"trxn_date_to";s:0:"";s:10:"amount_min";s:0:"";s:10:"amount_max";s:0:"";s:9:"amount_op";s:3:"lte";s:12:"amount_value";s:0:"";s:11:"description";s:133:"Provides transaction details for all contributions and payments, including Transaction #, Invoice ID, Payment Instrument and Check #.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:9:"parent_id";s:0:"";s:6:"groups";s:0:"";s:9:"domain_id";i:1;s:11:"is_reserved";b:0;}{/literal}');
 
 -- Membership reports
 INSERT INTO `civicrm_report_instance`