From 2006e4c40e4295ababc78ef3b367504ba0d3a341 Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Tue, 23 Jun 2015 11:24:20 +0530
Subject: [PATCH] minor fix

---
 CRM/Report/Form/Contribute/Recur.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php
index d638a6da67..4947dffb75 100644
--- a/CRM/Report/Form/Contribute/Recur.php
+++ b/CRM/Report/Form/Contribute/Recur.php
@@ -105,10 +105,6 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
             'required' => TRUE,
             'no_display' => TRUE,
           ),
-          'amount' => array(
-            'title' => ts('Amount'),
-            'default' => TRUE,
-          ),
           'contribution_status_id' => array(
             'title' => ts('Contribution Status'),
           ),
@@ -120,10 +116,9 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
             'title' => ts('Frequency unit'),
             'default' => TRUE,
           ),
-          'installment_amount' => array(
+          'amount' => array(
             'title' => ts('Installment Amount'),
-            'required' => TRUE,
-            'dbAlias' => 'ROUND(contribution_recur_civireport.amount/contribution_recur_civireport.installments, 2)',
+            'default' => TRUE,
           ),
           'installments' => array(
             'title' => ts('Installments'),
@@ -185,16 +180,14 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
             'title' => ts('Frequency Interval'),
             'type' => CRM_Utils_Type::T_INT,
           ),
+          'amount' => array(
+            'title' => ts('Installment Amount'),
+            'type' => CRM_Utils_Type::T_MONEY,
+          ),
           'installments' => array(
             'title' => ts('Installments'),
             'type' => CRM_Utils_Type::T_INT,
           ),
-          'installment_amount' => array(
-            'title' => ts('Installment Amount'),
-            'type' => CRM_Utils_Type::T_MONEY,
-            'dbAlias' => 'civicrm_contribution_recur_installment_amount',
-            'having' => TRUE,
-          ),
           'start_date' => array(
             'title' => ts('Start Date'),
             'operatorType' => CRM_Report_Form::OP_DATE,
@@ -369,9 +362,6 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
       if ($value = CRM_Utils_Array::value('civicrm_contribution_recur_amount', $row)) {
         $rows[$rowNum]['civicrm_contribution_recur_amount'] = CRM_Utils_Money::format($rows[$rowNum]['civicrm_contribution_recur_amount'], $rows[$rowNum]['civicrm_contribution_recur_currency']);
       }
-      if ($value = CRM_Utils_Array::value('civicrm_contribution_recur_installment_amount', $row)) {
-        $rows[$rowNum]['civicrm_contribution_recur_installment_amount'] = CRM_Utils_Money::format($rows[$rowNum]['civicrm_contribution_recur_installment_amount'], $rows[$rowNum]['civicrm_contribution_recur_currency']);
-      }
     }
   }
 
-- 
2.25.1