#37 Fixed remainder amount calculation for grant programs

CRM/Grant/Form/GrantProgramView.php

@@ -145,8 +145,8 @@ class CRM_Grant_Form_GrantProgramView extends CRM_Core_Form {
           $ids['grant_id'] = $value['grant_id'];
         }
         else {
-          $requestedAmount = (($value['assessment']/100) * $value['amount_total'] * ($grantThresholds['Funding factor'] / 100));
-          $amountEligible = $grantThresholds['Maximum Grant'] - $amountGranted;
+          $requestedAmount = CRM_Utils_Money::format((($value['assessment']/100) * $value['amount_total'] * ($grantThresholds['Funding factor'] / 100)), NULL, NULL, TRUE);
+          $amountEligible = CRM_Utils_Money::format(($grantThresholds['Maximum Grant'] - $amountGranted), NULL, NULL, TRUE);
           if ($requestedAmount > $amountEligible) {
             if ($amountEligible > $totalAmount) {
               $grant['eligible'][] = $amountEligible;
@@ -179,7 +179,7 @@ class CRM_Grant_Form_GrantProgramView extends CRM_Core_Form {
         $result = CRM_Grant_BAO_Grant::add(&$value, &$ids);
       } 
     }
-     
+
     $grantProgramParams['remainder_amount'] = $totalAmount;
     $grantProgramParams['id'] =  $_POST['pid'];
     $ids['grant_program'] =  $_POST['pid'];

grantprograms.php

@@ -627,7 +627,7 @@ function grantprograms_civicrm_pre($op, $objectName, $id, &$params) {
     }
     
     if ($objectName == 'Grant' && $op == "edit") {
-      if (!empty($previousGrant->amount_granted) && CRM_Utils_Array::value('amount_granted', $params) && CRM_Utils_Money::format($previousGrant->amount_granted) != CRM_Utils_Money::format($params['amount_granted']) && !CRM_Utils_Array::value('allocation', $params)) {
+      if (!empty($previousGrant->amount_granted) && array_key_exists('amount_granted', $params) && CRM_Utils_Money::format($previousGrant->amount_granted) != CRM_Utils_Money::format($params['amount_granted']) && !CRM_Utils_Array::value('allocation', $params)) {
         $programParams = array('id' => $previousGrant->grant_program_id);
         $grantProgram = CRM_Grant_BAO_GrantProgram::retrieve($programParams, CRM_Core_DAO::$_nullArray);
         $remainderDifference = CRM_Utils_Rule::cleanMoney($params['amount_granted']) - $previousGrant->amount_granted;