From: <vo...@us...> - 2012-11-24 22:57:48
|
Revision: 3157 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3157&view=rev Author: vomikan Date: 2012-11-24 22:57:40 +0000 (Sat, 24 Nov 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2012-11-24 22:26:45 UTC (rev 3156) +++ trunk/mmex/src/mmcheckingpanel.cpp 2012-11-24 22:57:40 UTC (rev 3157) @@ -747,7 +747,6 @@ double amount = m_trans[selIndex]->amt_; wxString amountStr; double convrate = core_->accountList_.getAccountBaseCurrencyConvRate(accountId); - double toconvrate = core_->accountList_.getAccountBaseCurrencyConvRate(toaccountId); boost::shared_ptr<mmCurrency> pCurrency = core_->accountList_.getCurrencyWeakPtr(accountId).lock(); int currencyid = pCurrency->currencyID_; @@ -757,6 +756,7 @@ wxString infoStr = wxT(""); if (transcodeStr == TRANS_TYPE_TRANSFER_STR) { + double toconvrate = core_->accountList_.getAccountBaseCurrencyConvRate(toaccountId); boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->accountList_.getCurrencyWeakPtr(toaccountId).lock(); wxASSERT(pCurrencyPtr); wxString tocurpfxStr = pCurrencyPtr->pfxSymbol_; @@ -820,15 +820,15 @@ { //load settings for base currency wxString currencyName = core_->currencyList_.getCurrencyName(basecurrencyid); - boost::shared_ptr<mmCurrency> pCurrency = core_->currencyList_.getCurrencySharedPtr(currencyName); - wxASSERT(pCurrency); + boost::shared_ptr<mmCurrency> pCurrencyBase = core_->currencyList_.getCurrencySharedPtr(currencyName); + wxASSERT(pCurrencyBase); wxString basecuramountStr; - mmDBWrapper::loadCurrencySettings(core_->db_.get(), pCurrency->currencyID_); + mmDBWrapper::loadCurrencySettings(core_->db_.get(), pCurrencyBase->currencyID_); mmex::formatDoubleToCurrency(amount*convrate, basecuramountStr); - pCurrency = core_->accountList_.getCurrencyWeakPtr(accountId).lock(); - wxASSERT(pCurrency); - mmex::CurrencyFormatter::instance().loadSettings(*pCurrency); + pCurrencyBase = core_->accountList_.getCurrencyWeakPtr(accountId).lock(); + wxASSERT(pCurrencyBase); + mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyBase); mmex::formatDoubleToCurrency(amount, amountStr); //output This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |