--worked on CRM-11983

diff --git a/CRM/Contribute/PseudoConstant.php b/CRM/Contribute/PseudoConstant.php
index 5929744fc0152a8371f2a16ca395053661f7e365..fc0085ffa61b5e60fd9de4ab40c7ed2c90c6bab9 100644 (file)
--- a/CRM/Contribute/PseudoConstant.php
+++ b/CRM/Contribute/PseudoConstant.php
@@ -148,20 +148,22 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
    * @return array - array reference of all financial accounts if any
    * @static
    */
-  public static function &financialAccount($id = NULL, $financialAccountTypeId = NULL) {
+  public static function &financialAccount($id = NULL, $financialAccountTypeId = NULL, $retrieveColumn = 'name', $key = 'id') {
     $condition = NUll;
     if ($financialAccountTypeId) {
       $condition = " financial_account_type_id = ". $financialAccountTypeId;
     }
-    $cacheKey = "{$id}_{$financialAccountTypeId}";
+    $cacheKey = "{$id}_{$financialAccountTypeId}_{$retrieveColumn}_{$key}";
     if (!isset(self::$financialAccount[$cacheKey])) {
       CRM_Core_PseudoConstant::populate(
         self::$financialAccount[$cacheKey],
         'CRM_Financial_DAO_FinancialAccount',
         TRUE,
-        'name',
+        $retrieveColumn,
         'is_active',
-        $condition
+        $condition,
+        NULL,
+        $key
       );
 
     }

diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index cce5b416f4674ce98624e2c68020674ae71bdba2..e017ec3584f47bca590017800c43bec5bd36ece4 100644 (file)
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -87,6 +87,78 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           ),
         ),
       ),
+      'civicrm_financial_account' => array(
+        'dao' => 'CRM_Financial_DAO_FinancialAccount',
+        'fields' => array(
+          'debit_accounting_code' => array(
+            'title' => ts('Financial Account Code - Debit'),
+            'name'  => 'accounting_code',
+            'alias' => 'financial_account_civireport_debit',
+            'default' => TRUE,
+            'required' => TRUE,
+          ),
+          'credit_accounting_code' => array(
+            'title' => ts('Financial Account Code - Credit'),
+            'name'  => 'accounting_code',
+            'alias' => 'financial_account_civireport_credit',
+            'default' => TRUE,
+            'required' => TRUE,
+          ),
+          'debit_name' => array(
+            'title' => ts('Financial Account Name - Debit'),
+            'name'  => 'name',
+            'alias' => 'financial_account_civireport_debit',
+            'default' => TRUE,
+          ),
+          'credit_name' => array(
+            'title' => ts('Financial Account Name - Credit'),
+            'name'  => 'name',
+            'alias' => 'financial_account_civireport_credit',
+            'default' => TRUE,
+          ),
+        ),
+        'filters' => array(
+          'debit_accounting_code' => array(
+            'title' => ts('Financial Account Code - Debit'),
+            'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+            'options' => CRM_Contribute_PseudoConstant::financialAccount(NULL, NULL, 'accounting_code', 'accounting_code'),
+            'name'  => 'accounting_code',
+            'alias' => 'financial_account_civireport_debit',
+          ),
+          'credit_accounting_code' => array(
+            'title' => ts('Financial Account Code - Credit'), 
+            'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+            'options' => CRM_Contribute_PseudoConstant::financialAccount(NULL, NULL, 'accounting_code', 'accounting_code'),
+          ),
+          'debit_name' => array(
+            'title' => ts('Financial Account Name - Debit'),
+            'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+            'options' => CRM_Contribute_PseudoConstant::financialAccount(),
+            'name'  => 'id',
+            'alias' => 'financial_account_civireport_debit',
+          ),
+          'credit_name' => array(
+            'title' => ts('Financial Account Name - Credit'), 
+            'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+            'options' => CRM_Contribute_PseudoConstant::financialAccount(),
+          ),
+        ),
+      ),     
+      'civicrm_line_item' => array(
+        'dao' => 'CRM_Price_DAO_LineItem',
+        'fields' => array(
+          'financial_type_id' => array('title' => ts('Financial Type'),
+            'default' => TRUE,
+          ),
+        ),
+        'filters' => array(
+          'financial_type_id' => array( 
+            'title' => ts('Financial Type'), 
+            'operatorType' => CRM_Report_Form::OP_MULTISELECT,
+            'options' => CRM_Contribute_PseudoConstant::financialType(),
+          ),
+        ),
+      ),  
       'civicrm_contribution' =>
       array(
         'dao' => 'CRM_Contribute_DAO_Contribution',
@@ -118,22 +190,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           ),
         ),
         'grouping' => 'contri-fields',
-      ),     
-      'civicrm_line_item' => array(
-        'dao' => 'CRM_Price_DAO_LineItem',
-        'fields' => array(
-          'financial_type_id' => array('title' => ts('Financial Type'),
-            'default' => TRUE,
-          ),
-        ),
-        'filters' => array(
-          'financial_type_id' => array( 
-            'title' => ts('Financial Type'), 
-            'operatorType' => CRM_Report_Form::OP_MULTISELECT,
-            'options' => CRM_Contribute_PseudoConstant::financialType(),
-          ),
-        ),
-      ),  
+      ),
       'civicrm_financial_trxn' => array(
         'dao' => 'CRM_Financial_DAO_FinancialTrxn',
         'fields' => array(
@@ -146,7 +203,8 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           ),
           'trxn_date' => array(
             'title' => ts('Transaction Date'),
-            'default' => TRUE
+            'default' => TRUE,
+            'type' => CRM_Utils_Type::T_DATE,
           ),
           'trxn_id' => array(
             'title' => ts('Trans #'),
@@ -180,23 +238,6 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           'amount' =>
           array('title' => ts('Amount')),
         ),
-      ),
-      'civicrm_financial_account' => array(
-        'dao' => 'CRM_Financial_DAO_FinancialAccount',
-        'fields' => array(
-          'debit_accounting_code' => array(
-            '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'),
-            'name'  => 'accounting_code',
-            'alias' => 'financial_account_civireport_credit',
-            'default' => TRUE,
-          ),
-        )
       ),   
     );
     parent::__construct();
@@ -216,8 +257,31 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           if (CRM_Utils_Array::value('required', $field) ||
             CRM_Utils_Array::value($fieldName, $this->_params['fields'])
           ) {
-            if ($fieldName != 'credit_accounting_code' && $fieldName != 'amount') {
+            switch ($fieldName) {
+            case 'credit_accounting_code' :
+              $select[] = " CASE 
+                            WHEN {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id IS NOT NULL
+                            THEN  {$this->_aliases['civicrm_financial_account']}_credit_1.accounting_code
+                            ELSE  {$this->_aliases['civicrm_financial_account']}_credit_2.accounting_code
+                            END AS civicrm_financial_account_credit_accounting_code ";
+              break;
+            case 'amount' : 
+              $select[] = " CASE 
+                            WHEN  {$this->_aliases['civicrm_entity_financial_trxn']}_item.entity_id IS NOT NULL
+                            THEN {$this->_aliases['civicrm_entity_financial_trxn']}_item.amount
+                            ELSE {$this->_aliases['civicrm_entity_financial_trxn']}.amount
+                            END AS civicrm_entity_financial_trxn_amount ";
+              break;
+            case 'credit_name' :
+              $select[] = " CASE 
+                            WHEN {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id IS NOT NULL
+                            THEN  {$this->_aliases['civicrm_financial_account']}_credit_1.name
+                            ELSE  {$this->_aliases['civicrm_financial_account']}_credit_2.name
+                            END AS civicrm_financial_account_credit_name ";
+              break;
+            default :
               $select[] = "{$field['dbAlias']} as {$tableName}_{$fieldName}";
+              break; 
             }
             $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = $field['title'];
             $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);
@@ -227,15 +291,6 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
     }
 
     $this->_select = "SELECT " . implode(', ', $select) . " ";
-    $this->_select .= ", CASE 
-            WHEN {$this->_aliases['civicrm_financial_trxn']}.from_financial_account_id IS NOT NULL
-              THEN  {$this->_aliases['civicrm_financial_account']}_credit_1.accounting_code
-              ELSE  {$this->_aliases['civicrm_financial_account']}_credit_2.accounting_code
-            END AS civicrm_financial_account_credit_accounting_code, CASE 
-            WHEN  {$this->_aliases['civicrm_entity_financial_trxn']}_item.entity_id IS NOT NULL
-              THEN {$this->_aliases['civicrm_entity_financial_trxn']}_item.amount
-              ELSE {$this->_aliases['civicrm_entity_financial_trxn']}.amount
-            END AS civicrm_entity_financial_trxn_amount ";
   }
 
   function from() {
@@ -243,10 +298,10 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
 
     $this->_from = "FROM  civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
               INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
-                      ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND 
+                    ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND 
                          {$this->_aliases['civicrm_contribution']}.is_test = 0
               LEFT JOIN civicrm_membership_payment payment
-                        ON ( {$this->_aliases['civicrm_contribution']}.id = payment.contribution_id )
+                    ON ( {$this->_aliases['civicrm_contribution']}.id = payment.contribution_id )
               LEFT JOIN civicrm_membership {$this->_aliases['civicrm_membership']}
                     ON payment.membership_id = {$this->_aliases['civicrm_membership']}.id 
               LEFT JOIN civicrm_entity_financial_trxn {$this->_aliases['civicrm_entity_financial_trxn']}
@@ -273,6 +328,57 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           $this->_orderBy = " ORDER BY {$this->_aliases['civicrm_contact']}.sort_name, {$this->_aliases['civicrm_contribution']}.id, {$this->_aliases['civicrm_entity_financial_trxn']}.id ";
   }
 
+  function where() {
+    foreach ($this->_columns as $tableName => $table) {
+      if (array_key_exists('filters', $table)) {
+        foreach ($table['filters'] as $fieldName => $field) {
+          $clause = NULL;
+          if ($fieldName == 'credit_accounting_code') {
+            $field['dbAlias'] = "CASE
+              WHEN financial_trxn_civireport.from_financial_account_id IS NOT NULL
+              THEN  financial_account_civireport_credit_1.accounting_code
+              ELSE  financial_account_civireport_credit_2.accounting_code 
+              END";
+          }
+          else if ($fieldName == 'credit_name') {
+            $field['dbAlias'] = "CASE
+              WHEN financial_trxn_civireport.from_financial_account_id IS NOT NULL
+              THEN  financial_account_civireport_credit_1.id
+              ELSE  financial_account_civireport_credit_2.id 
+              END";
+          }
+          if (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) {
+            $relative = CRM_Utils_Array::value("{$fieldName}_relative", $this->_params);
+            $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']);
+          }
+          else {
+            $op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
+            if ($op) {
+              $clause = $this->whereClause($field,
+                $op,
+                CRM_Utils_Array::value("{$fieldName}_value", $this->_params),
+                CRM_Utils_Array::value("{$fieldName}_min", $this->_params),
+                CRM_Utils_Array::value("{$fieldName}_max", $this->_params)
+              );
+            }
+          }
+          if (!empty($clause)) {
+            $clauses[] = $clause;
+          }
+        }
+      }
+    }
+    if (empty($clauses)) {
+      $this->_where = "WHERE ( 1 )";
+    }
+    else {
+      $this->_where = "WHERE " . implode(' AND ', $clauses);
+    }
+  }
+
   function postProcess() {
     // get the acl clauses built before we assemble the query
     $this->buildACLClause($this->_aliases['civicrm_contact']);
@@ -291,8 +397,8 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
 
     $sql = "{$select} {$this->_from} {$this->_where}";
     $dao = CRM_Core_DAO::executeQuery($sql);
-
-    if ($dao->fetch()) {
+    $dao->fetch();
+    if ($dao->count) {
       $statistics['counts']['amount'] = array(
         'value' => $dao->amount,
         'title' => 'Total Amount',