Merge pull request #4274 from mrpaulc/CRM-14868

CRM-14868 - allow currency symbol in contribution amount_other

diff --cc CRM/Contribute/Form/Contribution/Main.php
index e92d239e77de88567efaca35f7086ae2d0e8a1b1,b6c6a179d744210463e6fb95cc1df984a4550c32..056ca1d192caa0fe9b405bb19636756969f9f367
--- 1/CRM/Contribute/Form/Contribution/Main.php
--- 2/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@@ -1277,17 -1278,12 +1278,18 @@@ class CRM_Contribute_Form_Contribution_
        if ($this->_membershipBlock) {
          $component = 'membership';
        }
+ 
        CRM_Price_BAO_PriceSet::processAmount($this->_values['fee'], $params, $lineItem[$priceSetId], $component);
 +      if ($params['tax_amount']) {
 +        $this->set('tax_amount', $params['tax_amount']);
 +      }
  
        if ($proceFieldAmount) {
 -        $lineItem[$params['priceSetId']][$fieldOption]['line_total'] = $proceFieldAmount;
          $lineItem[$params['priceSetId']][$fieldOption]['unit_price'] = $proceFieldAmount;
 +        $lineItem[$params['priceSetId']][$fieldOption]['line_total'] = $proceFieldAmount;
 +        if (isset($lineItem[$params['priceSetId']][$fieldOption]['tax_amount'])) {
 +          $proceFieldAmount += $lineItem[$params['priceSetId']][$fieldOption]['tax_amount'];
 +        }
          if (!$this->_membershipBlock['is_separate_payment']) {
            $params['amount'] = $proceFieldAmount; //require when separate membership not used
          }