From 3ac2ffb6c8094a49981ca7fccd1a1b8daffca5a4 Mon Sep 17 00:00:00 2001 From: yashodha Date: Wed, 21 Jun 2017 12:11:49 +0530 Subject: [PATCH] CRM-20753 - Net amount doesn't respect localization --- CRM/Contribute/Form/Contribution.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 2ef73e3744..2cc479ee79 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -307,7 +307,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP * @return array */ public function setDefaultValues() { - $defaults = $this->_values; // Set defaults for pledge payment. @@ -364,12 +363,11 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP } } - if (isset($defaults['non_deductible_amount'])) { - $defaults['non_deductible_amount'] = CRM_Utils_Money::format($defaults['non_deductible_amount'], NULL, '%a'); - } - - if (isset($defaults['fee_amount'])) { - $defaults['fee_amount'] = CRM_Utils_Money::format($defaults['fee_amount'], NULL, '%a'); + $amountFields = array('non_deductible_amount', 'fee_amount', 'net_amount'); + foreach ($amountFields as $amt) { + if (isset($defaults[$amt])) { + $defaults[$amt] = CRM_Utils_Money::format($defaults[$amt], NULL, '%a'); + } } if ($this->_contributionType) { -- 2.25.1