Merge pull request #2842 from nabinhait/foreign_currency_calc

Foreign currency calc