From: <ste...@us...> - 2012-01-19 15:03:40
|
Revision: 1667 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1667&view=rev Author: stef145g Date: 2012-01-19 15:03:28 +0000 (Thu, 19 Jan 2012) Log Message: ----------- Addition and renaming of extra variables. Modified Paths: -------------- trunk/mmex/src/budgetingpanel.cpp trunk/mmex/src/mmex.cpp trunk/mmex/src/mmhomepagepanel.cpp trunk/mmex/src/optionsdialog.cpp trunk/mmex/src/reportbudgetcategorysummary.cpp trunk/mmex/src/reportbudgetingperf.cpp trunk/mmex/src/reportcategexp.cpp trunk/mmex/src/reportcategovertimeperf.cpp trunk/mmex/src/reportincexpenses.cpp trunk/mmex/src/reportincexpensesfinancialperiod.cpp trunk/mmex/src/reportincexpesestime.cpp trunk/mmex/src/reportpayee.cpp trunk/mmex/src/reportsummary.cpp trunk/mmex/src/util.cpp trunk/mmex/src/util.h Modified: trunk/mmex/src/budgetingpanel.cpp =================================================================== --- trunk/mmex/src/budgetingpanel.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/budgetingpanel.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -419,7 +419,9 @@ { transferAsDeposit = false; } - th.actual_ = mmDBWrapper::getAmountForCategory(db_, th.categID_, th.subcategID_, false, dtBegin, dtEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); + th.actual_ = mmDBWrapper::getAmountForCategory(db_, th.categID_, th.subcategID_, false, + dtBegin, dtEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); if (th.actual_ < 0) actExpenses += th.actual_; else @@ -474,7 +476,9 @@ { transferAsDeposit = false; } - thsub.actual_ = mmDBWrapper::getAmountForCategory(db_, thsub.categID_, thsub.subcategID_, false, dtBegin, dtEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); + thsub.actual_ = mmDBWrapper::getAmountForCategory(db_, thsub.categID_, thsub.subcategID_, false, + dtBegin, dtEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); if (thsub.actual_ < 0) actExpenses += thsub.actual_; else Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/mmex.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -2809,21 +2809,21 @@ wxMenuItem* menuItemLinks = new wxMenuItem(menuView, MENU_VIEW_LINKS, _("&Navigation"), _("Show/Hide the Navigation tree control"), wxITEM_CHECK); wxMenuItem* menuItemBankAccount = new wxMenuItem(menuView, MENU_VIEW_BANKACCOUNTS, - _("&Bank Accounts"), _("Show/Hide Bank Accounts on Summary page"), wxITEM_CHECK); + _("&Bank Accounts"), _("Show/Hide Bank Accounts on Summary page"), wxITEM_CHECK); wxMenuItem* menuItemTermAccount = new wxMenuItem(menuView, MENU_VIEW_TERMACCOUNTS, - _("Term &Accounts"), _("Show/Hide Term Accounts on Summary page"), wxITEM_CHECK); + _("Term &Accounts"), _("Show/Hide Term Accounts on Summary page"), wxITEM_CHECK); wxMenuItem* menuItemStockAccount = new wxMenuItem(menuView, MENU_VIEW_STOCKACCOUNTS, - _("&Stock Accounts"), _("Show/Hide Stock Accounts on Summary page"), wxITEM_CHECK); - wxMenuItem* menuItemBudgetFinancialYears = new wxMenuItem(menuView, MENU_VIEW_BUDGET_FINANCIAL_YEARS, - _("Budget &Year as Financial Years"), _("Display Budgets in Financial Year Format"), wxITEM_CHECK); + _("&Stock Accounts"), _("Show/Hide Stock Accounts on Summary page"), wxITEM_CHECK); + wxMenuItem* menuItemBudgetFinancialYears = new wxMenuItem(menuView, MENU_VIEW_BUDGET_FINANCIAL_YEARS, + _("Budgets: As &Financial Years"), _("Display Budgets in Financial Year Format"), wxITEM_CHECK); + wxMenuItem* menuItemBudgetTransferTotal = new wxMenuItem(menuView, MENU_VIEW_BUDGET_TRANSFER_TOTAL, + _("Budgets: &Include Transfers in Totals"), _("Include the transfer transactions in the Budget Totals"), wxITEM_CHECK); wxMenuItem* menuItemBudgetSetupWithoutSummary = new wxMenuItem(menuView, MENU_VIEW_BUDGET_SETUP_SUMMARY, - _("Budget Setup - &without Summaries"), _("Display the Budget Setup without category summaries"), wxITEM_CHECK); + _("Budget Setup: &Without Summaries"), _("Display the Budget Setup without category summaries"), wxITEM_CHECK); wxMenuItem* menuItemBudgetCategorySummary = new wxMenuItem(menuView, MENU_VIEW_BUDGET_CATEGORY_SUMMARY, - _("Budget &Category Summary - with Categories"), _("Include the categories in the Budget Category Summary"), wxITEM_CHECK); - wxMenuItem* menuItemBudgetTransferTotal = new wxMenuItem(menuView, MENU_VIEW_BUDGET_TRANSFER_TOTAL, - _("Budget &Totals - with Transfers"), _("Include the transfer transactions in the Budget Totals"), wxITEM_CHECK); + _("Budget Summary: Include &Categories"), _("Include the categories in the Budget Category Summary"), wxITEM_CHECK); wxMenuItem* menuItemIgnoreFutureTransactions = new wxMenuItem(menuView, MENU_IGNORE_FUTURE_TRANSACTIONS, - _("Ignore Future Transactions"), _("Ignore Future transactions"), wxITEM_CHECK); + _("Ignore F&uture Transactions"), _("Ignore Future transactions"), wxITEM_CHECK); //Add the menu items to the menu bar menuView->Append(menuItemToolbar); @@ -2842,10 +2842,10 @@ // menuView->AppendSubMenu(budgetingMenu,_("Budget...")); menuView->Append(menuItemBudgetFinancialYears); + menuView->Append(menuItemBudgetTransferTotal); menuView->AppendSeparator(); menuView->Append(menuItemBudgetSetupWithoutSummary); menuView->Append(menuItemBudgetCategorySummary); - menuView->Append(menuItemBudgetTransferTotal); menuView->AppendSeparator(); menuView->Append(menuItemIgnoreFutureTransactions); @@ -4360,7 +4360,7 @@ void mmGUIFrame::OnIgnoreFutureTransactions(wxCommandEvent &event) { m_mgr.GetPane(wxT("Ignore Future Transactions")).Show(event.IsChecked()); - mmIniOptions::ignoreFutureTransactions_ = !mmIniOptions::ignoreFutureTransactions_; + mmIniOptions::ignore_future_transactions_ = !mmIniOptions::ignore_future_transactions_; if (!refreshRequested_) { refreshRequested_ = true; Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/mmhomepagepanel.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -167,8 +167,8 @@ wxASSERT(pCurrencyPtr); mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - double bal = pCA->initialBalance_ + core_->bTransactionList_.getBalance(pCA->accountID_, mmIniOptions::ignoreFutureTransactions_); - double reconciledBal = pCA->initialBalance_ + core_->bTransactionList_.getReconciledBalance(pCA->accountID_, mmIniOptions::ignoreFutureTransactions_); + double bal = pCA->initialBalance_ + core_->bTransactionList_.getBalance(pCA->accountID_, mmIniOptions::ignore_future_transactions_); + double reconciledBal = pCA->initialBalance_ + core_->bTransactionList_.getReconciledBalance(pCA->accountID_, mmIniOptions::ignore_future_transactions_); double rate = pCurrencyPtr->baseConv_; tBalance += bal * rate; // actual amount in that account in the original rate @@ -177,7 +177,7 @@ { double income = 0.0; double expenses = 0.0; - core_->bTransactionList_.getExpensesIncome(pCA->accountID_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(pCA->accountID_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignore_future_transactions_); // show the actual amount in that account wxString balanceStr; @@ -227,8 +227,8 @@ wxASSERT(pCurrencyPtr); mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - double bal = pTA->initialBalance_ + core_->bTransactionList_.getBalance(pTA->accountID_, mmIniOptions::ignoreFutureTransactions_); - double reconciledBal = pTA->initialBalance_ + core_->bTransactionList_.getReconciledBalance(pTA->accountID_, mmIniOptions::ignoreFutureTransactions_); + double bal = pTA->initialBalance_ + core_->bTransactionList_.getBalance(pTA->accountID_, mmIniOptions::ignore_future_transactions_); + double reconciledBal = pTA->initialBalance_ + core_->bTransactionList_.getReconciledBalance(pTA->accountID_, mmIniOptions::ignore_future_transactions_); double rate = pCurrencyPtr->baseConv_; tTermBalance += bal * rate; // actual amount in that account in the original rate @@ -237,7 +237,7 @@ { double income = 0; double expenses = 0; - core_->bTransactionList_.getExpensesIncome(pTA->accountID_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(pTA->accountID_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignore_future_transactions_); // show the actual amount in that account wxString balanceStr; Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/optionsdialog.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -404,8 +404,8 @@ generalPanel->SetSizer(generalPanelSizer); // ------------------------------------------ - // HomePage Header Settings - wxStaticBox* headerStaticBox = new wxStaticBox(generalPanel, wxID_ANY, _("Home Page Header")); + // Display Header Settings + wxStaticBox* headerStaticBox = new wxStaticBox(generalPanel, wxID_ANY, _("Display Heading")); // Define the staticBox font and set it as wxFONTWEIGHT_BOLD wxFont staticBoxFontSetting = headerStaticBox->GetFont(); @@ -927,7 +927,7 @@ wxStaticText* itemStaticText54 = new wxStaticText(itemPanelExpImp, wxID_STATIC, _("CSV Delimiter"), wxDefaultPosition, wxDefaultSize, 0); itemStaticBoxSizer184->Add(itemStaticText54, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxFlexGridSizer* itemFlexGridSizer184 = new wxFlexGridSizer(2, 3, 0, 0); + wxFlexGridSizer* itemFlexGridSizer184 = new wxFlexGridSizer(2, 3, 10, 10); itemStaticBoxSizer184->Add(itemFlexGridSizer184, 0, wxALL); wxString delimiter = mmDBWrapper::getInfoSettingValue(db_, wxT("DELIMITER"), mmex::DEFDELIMTER); Modified: trunk/mmex/src/reportbudgetcategorysummary.cpp =================================================================== --- trunk/mmex/src/reportbudgetcategorysummary.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportbudgetcategorysummary.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -155,7 +155,9 @@ { transferAsDeposit = false; } - th.actual_ = mmDBWrapper::getAmountForCategory(db_, th.categID_, th.subcategID_, false, yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); + th.actual_ = mmDBWrapper::getAmountForCategory(db_, th.categID_, th.subcategID_, false, + yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); mmex::formatDoubleToCurrencyEdit(th.actual_, th.actualStr_); if (th.actual_ < 0) { @@ -217,7 +219,9 @@ { transferAsDeposit = false; } - thsub.actual_ = mmDBWrapper::getAmountForCategory(db_, thsub.categID_, thsub.subcategID_, false, yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); + thsub.actual_ = mmDBWrapper::getAmountForCategory(db_, thsub.categID_, thsub.subcategID_, false, + yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); mmex::formatDoubleToCurrencyEdit(thsub.actual_, thsub.actualStr_); if (thsub.actual_ < 0) { actExpenses += thsub.actual_; Modified: trunk/mmex/src/reportbudgetingperf.cpp =================================================================== --- trunk/mmex/src/reportbudgetingperf.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportbudgetingperf.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -62,8 +62,9 @@ { transferAsDeposit = false; } - double actualMonthVal = core_->bTransactionList_.getAmountForCategory(budgetEntry.categID_, budgetEntry.subcategID_, false, dtBegin, dtEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); - + double actualMonthVal = core_->bTransactionList_.getAmountForCategory(budgetEntry.categID_, budgetEntry.subcategID_, + false, dtBegin, dtEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); wxString actualMonthValStr; mmex::formatDoubleToCurrencyEdit(actualMonthVal, actualMonthValStr); @@ -173,7 +174,9 @@ { transferAsDeposit = false; } - th.actual_ = core_->bTransactionList_.getAmountForCategory(th.categID_, th.subcategID_, false, yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); + th.actual_ = core_->bTransactionList_.getAmountForCategory(th.categID_, th.subcategID_, false, + yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); mmex::formatDoubleToCurrencyEdit(th.actual_, th.actualStr_); if (th.actual_ < 0) @@ -262,7 +265,9 @@ { transferAsDeposit = false; } - thsub.actual_ = core_->bTransactionList_.getAmountForCategory(thsub.categID_, thsub.subcategID_, false, yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignoreFutureTransactions_); + thsub.actual_ = core_->bTransactionList_.getAmountForCategory(thsub.categID_, thsub.subcategID_, false, + yearBegin, yearEnd, evaluateTransfer, transferAsDeposit, mmIniOptions::ignore_future_transactions_ + ); mmex::formatDoubleToCurrencyEdit(thsub.actual_, thsub.actualStr_); // set the overall actual abount for the year Modified: trunk/mmex/src/reportcategexp.cpp =================================================================== --- trunk/mmex/src/reportcategexp.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportcategexp.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -112,7 +112,9 @@ int categID = q1.GetInt(wxT("CATEGID")); wxString categString = q1.GetString(wxT("CATEGNAME")); wxString balance; - double amt = core_->bTransactionList_.getAmountForCategory(categID, -1, ignoreDate_, dtBegin_, dtEnd_, false, false, mmIniOptions::ignoreFutureTransactions_); + double amt = core_->bTransactionList_.getAmountForCategory(categID, -1, ignoreDate_, + dtBegin_, dtEnd_, false, false, mmIniOptions::ignore_future_transactions_ + ); mmex::formatDoubleToCurrency(amt, balance); if ((type_ == 0) || ((type_ == 1 && amt > 0.0) || @@ -143,7 +145,9 @@ int subcategID = q2.GetInt(wxT("SUBCATEGID")); wxString subcategString = q2.GetString(wxT("SUBCATEGNAME")); - amt = core_->bTransactionList_.getAmountForCategory(categID, subcategID, ignoreDate_, dtBegin_, dtEnd_, false, false, mmIniOptions::ignoreFutureTransactions_); + amt = core_->bTransactionList_.getAmountForCategory(categID, subcategID, ignoreDate_, + dtBegin_, dtEnd_, false, false, mmIniOptions::ignore_future_transactions_ + ); mmex::formatDoubleToCurrency(amt, balance); // if we want only income Modified: trunk/mmex/src/reportcategovertimeperf.cpp =================================================================== --- trunk/mmex/src/reportcategovertimeperf.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportcategovertimeperf.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -122,8 +122,9 @@ columns_totals_t &columns_totals ) { - double period_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, periodBegin, periodEnd, false, false, mmIniOptions::ignoreFutureTransactions_); - + double period_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, + periodBegin, periodEnd, false, false, mmIniOptions::ignore_future_transactions_ + ); if (period_amount == 0) { return; } @@ -148,8 +149,9 @@ // wxLogDebug(wxT("begin=%s, end=%s"), dtBegin.Format().c_str(), dtEnd.Format().c_str()); - double month_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, dtBegin, dtEnd, false, false, mmIniOptions::ignoreFutureTransactions_); - + double month_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, + dtBegin, dtEnd, false, false, mmIniOptions::ignore_future_transactions_ + ); wxString month_amount_str; if (month_amount != 0) Modified: trunk/mmex/src/reportincexpenses.cpp =================================================================== --- trunk/mmex/src/reportincexpenses.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportincexpenses.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -54,7 +54,7 @@ double expenses = 0.0; double income = 0.0; - core_->bTransactionList_.getExpensesIncome(-1,expenses, income, ignoreDate_, dtBegin_,dtEnd_, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(-1,expenses, income, ignoreDate_, dtBegin_,dtEnd_, mmIniOptions::ignore_future_transactions_); mmGraphIncExpensesMonth gg; gg.init(income, expenses); Modified: trunk/mmex/src/reportincexpensesfinancialperiod.cpp =================================================================== --- trunk/mmex/src/reportincexpensesfinancialperiod.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportincexpensesfinancialperiod.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -111,7 +111,7 @@ bool ignoreDate = false; income = 0.0; expenses = 0.0; - core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::ignore_future_transactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); @@ -144,7 +144,7 @@ // Now we get the totals for the financial year period expenses = 0.0; income = 0.0; - core_->bTransactionList_.getExpensesIncome(-1, expenses, income, false, yearBegin, yearEnd, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, false, yearBegin, yearEnd, mmIniOptions::ignore_future_transactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); Modified: trunk/mmex/src/reportincexpesestime.cpp =================================================================== --- trunk/mmex/src/reportincexpesestime.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportincexpesestime.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -57,7 +57,7 @@ bool ignoreDate = false; income = 0.0; expenses = 0.0; - core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::ignore_future_transactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); @@ -98,7 +98,7 @@ expenses = 0.0; income = 0.0; - core_->bTransactionList_.getExpensesIncome(-1, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignore_future_transactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); Modified: trunk/mmex/src/reportpayee.cpp =================================================================== --- trunk/mmex/src/reportpayee.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportpayee.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -54,10 +54,9 @@ for (int idx = 0; idx < numPayees; idx++) { wxString balance; - double amt = core_->bTransactionList_.getAmountForPayee( - core_->payeeList_.payees_[idx]->payeeID_, ignoreDate_, dtBegin_, dtEnd_, mmIniOptions::ignoreFutureTransactions_ + double amt = core_->bTransactionList_.getAmountForPayee(core_->payeeList_.payees_[idx]->payeeID_, + ignoreDate_, dtBegin_, dtEnd_, mmIniOptions::ignore_future_transactions_ ); - mmex::formatDoubleToCurrency(amt, balance); if (amt != 0.0) Modified: trunk/mmex/src/reportsummary.cpp =================================================================== --- trunk/mmex/src/reportsummary.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/reportsummary.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -62,7 +62,7 @@ mmCheckingAccount* pCA = dynamic_cast<mmCheckingAccount*>(core_->accountList_.accounts_[iAdx].get()); if (pCA && pCA->status_== mmAccount::MMEX_Open) { - double bal = pCA->initialBalance_ + core_->bTransactionList_.getBalance(pCA->accountID_, mmIniOptions::ignoreFutureTransactions_); + double bal = pCA->initialBalance_ + core_->bTransactionList_.getBalance(pCA->accountID_, mmIniOptions::ignore_future_transactions_); boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->accountList_.getCurrencyWeakPtr(pCA->accountID_).lock(); wxASSERT(pCurrencyPtr); @@ -101,7 +101,7 @@ mmTermAccount* pTA = dynamic_cast<mmTermAccount*>(core_->accountList_.accounts_[iAdx].get()); if (pTA && pTA->status_== mmAccount::MMEX_Open) { - double bal = pTA->initialBalance_ + core_->bTransactionList_.getBalance(pTA->accountID_, mmIniOptions::ignoreFutureTransactions_); + double bal = pTA->initialBalance_ + core_->bTransactionList_.getBalance(pTA->accountID_, mmIniOptions::ignore_future_transactions_); boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->accountList_.getCurrencyWeakPtr(pTA->accountID_).lock(); wxASSERT(pCurrencyPtr); Modified: trunk/mmex/src/util.cpp =================================================================== --- trunk/mmex/src/util.cpp 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/util.cpp 2012-01-19 15:03:28 UTC (rev 1667) @@ -243,8 +243,13 @@ bool mmIniOptions::expandStocksHome_ = true; bool mmIniOptions::expandBankTree_ = true; bool mmIniOptions::expandTermTree_ = false; -bool mmIniOptions::ignoreFutureTransactions_ = false; +bool mmIniOptions::budget_financial_years_ = false; +bool mmIniOptions::budget_include_transfers_ = false; +bool mmIniOptions::budget_setup_no_summaries_ = false; +bool mmIniOptions::budget_summary_no_categories_ = true; +bool mmIniOptions::ignore_future_transactions_ = false; + int mmIniOptions::transPayeeSelectionNone_ = 0; int mmIniOptions::transCategorySelectionNone_ = 0; int mmIniOptions::transStatusReconciled_ = 0; @@ -294,7 +299,11 @@ if (mmDBWrapper::getINISettingValue(db, wxT("EXPAND_BANK_TREE"), wxT("TRUE")) != wxT("TRUE")) expandBankTree_ = false; if (mmDBWrapper::getINISettingValue(db, wxT("EXPAND_TERM_TREE"), wxT("FALSE")) != wxT("FALSE")) expandTermTree_ = true; - if (mmDBWrapper::getINISettingValue(db, wxT("REPORT_FUTURE_TRANSACTIONS"), wxT("FALSE")) != wxT("FALSE")) ignoreFutureTransactions_ = true; + if (mmDBWrapper::getINISettingValue(db, wxT("BUDGET_FINANCIAL_YEARS"), wxT("TRUE")) != wxT("TRUE")) budget_financial_years_ = false; + if (mmDBWrapper::getINISettingValue(db, wxT("BUDGET_INCLUDE_TRANSFERS"), wxT("TRUE")) != wxT("TRUE")) budget_include_transfers_ = false; + if (mmDBWrapper::getINISettingValue(db, wxT("BUDGET_SETUP_NO_SUMMARIES"), wxT("TRUE")) != wxT("TRUE")) budget_setup_no_summaries_ = false; + if (mmDBWrapper::getINISettingValue(db, wxT("BUDGET_SUMMARY_NO_CATEGORIES"), wxT("FALSE")) != wxT("FALSE")) budget_summary_no_categories_ = true; + if (mmDBWrapper::getINISettingValue(db, wxT("REPORT_FUTURE_TRANSACTIONS"), wxT("FALSE")) != wxT("FALSE")) ignore_future_transactions_ = true; // Read the preference as a string and convert to int transPayeeSelectionNone_ = wxAtoi(mmDBWrapper::getINISettingValue(db, wxT("TRANSACTION_PAYEE_NONE"), wxT("0"))); Modified: trunk/mmex/src/util.h =================================================================== --- trunk/mmex/src/util.h 2012-01-19 13:04:48 UTC (rev 1666) +++ trunk/mmex/src/util.h 2012-01-19 15:03:28 UTC (rev 1667) @@ -112,8 +112,13 @@ static bool expandStocksHome_; static bool expandBankTree_; static bool expandTermTree_; - static bool ignoreFutureTransactions_; + static bool budget_financial_years_; + static bool budget_include_transfers_; + static bool budget_setup_no_summaries_; + static bool budget_summary_no_categories_; + static bool ignore_future_transactions_; + static int transPayeeSelectionNone_; static int transCategorySelectionNone_; static int transStatusReconciled_; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |