From: <ste...@us...> - 2012-01-17 09:43:50
|
Revision: 1647 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1647&view=rev Author: stef145g Date: 2012-01-17 09:43:39 +0000 (Tue, 17 Jan 2012) Log Message: ----------- Finalised report settings to ignore future dates in reports. Modified Paths: -------------- trunk/mmex/src/mmtransaction.cpp trunk/mmex/src/mmtransaction.h 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 Modified: trunk/mmex/src/mmtransaction.cpp =================================================================== --- trunk/mmex/src/mmtransaction.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/mmtransaction.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -864,8 +864,8 @@ bool ignoreDate, const wxDateTime &dtBegin, const wxDateTime &dtEnd, - bool evaluateTransfer, - bool asDeposit, + bool evaluateTransfer, // activates the asDeposit parameter. + bool asDeposit, // No effect when evaluateTransfer is false. bool ignoreFuture ) const { Modified: trunk/mmex/src/mmtransaction.h =================================================================== --- trunk/mmex/src/mmtransaction.h 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/mmtransaction.h 2012-01-17 09:43:39 UTC (rev 1647) @@ -158,6 +158,7 @@ /* Query Functions */ void getExpensesIncome(int accountID, double& expenses, double& income, bool ignoreDate, const wxDateTime &dtBegin, const wxDateTime &dtEnd, bool ignoreFuture = false) const; + // The setting asDeposit is only valid if evaluateTransfer is true double getAmountForCategory(int categID, int subcategID, bool ignoreDate, const wxDateTime &dtBegin, const wxDateTime &dtEnd, bool evaluateTransfer = false, bool asDeposit = false, bool ignoreFuture = false) const; double getAmountForPayee(int payeeID, bool ignoreDate, const wxDateTime &dtbegin, const wxDateTime &dtEnd, bool ignoreFuture = false) const; void getTransactionStats(int accountID, int& number, bool ignoreDate, const wxDateTime &dtBegin, const wxDateTime &dtEnd, bool ignoreFuture = false) const; Modified: trunk/mmex/src/reportcategexp.cpp =================================================================== --- trunk/mmex/src/reportcategexp.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/reportcategexp.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -108,7 +108,7 @@ int categID = q1.GetInt(wxT("CATEGID")); wxString categString = q1.GetString(wxT("CATEGNAME")); wxString balance; - double amt = core_->bTransactionList_.getAmountForCategory(categID, -1, ignoreDate_, dtBegin_, dtEnd_, mmIniOptions::ignoreFutureTransactions_); + double amt = core_->bTransactionList_.getAmountForCategory(categID, -1, ignoreDate_, dtBegin_, dtEnd_, false, false, mmIniOptions::ignoreFutureTransactions_); mmex::formatDoubleToCurrency(amt, balance); if ((type_ == 0) || ((type_ == 1 && amt > 0.0) || @@ -139,7 +139,7 @@ int subcategID = q2.GetInt(wxT("SUBCATEGID")); wxString subcategString = q2.GetString(wxT("SUBCATEGNAME")); - amt = core_->bTransactionList_.getAmountForCategory(categID, subcategID, ignoreDate_, dtBegin_, dtEnd_, mmIniOptions::ignoreFutureTransactions_); + amt = core_->bTransactionList_.getAmountForCategory(categID, subcategID, ignoreDate_, dtBegin_, dtEnd_, false, false, mmIniOptions::ignoreFutureTransactions_); mmex::formatDoubleToCurrency(amt, balance); // if we want only income Modified: trunk/mmex/src/reportcategovertimeperf.cpp =================================================================== --- trunk/mmex/src/reportcategovertimeperf.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/reportcategovertimeperf.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -122,7 +122,7 @@ columns_totals_t &columns_totals ) { - double period_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, periodBegin, periodEnd, mmIniOptions::ignoreFutureTransactions_); + double period_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, periodBegin, periodEnd, false, false, mmIniOptions::ignoreFutureTransactions_); if (period_amount == 0) { return; @@ -148,7 +148,7 @@ // 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, mmIniOptions::ignoreFutureTransactions_); + double month_amount = core.bTransactionList_.getAmountForCategory(cat_id, subcat_id, false, dtBegin, dtEnd, false, false, mmIniOptions::ignoreFutureTransactions_); wxString month_amount_str; Modified: trunk/mmex/src/reportincexpenses.cpp =================================================================== --- trunk/mmex/src/reportincexpenses.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/reportincexpenses.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -49,7 +49,7 @@ double expenses = 0.0; double income = 0.0; - core_->bTransactionList_.getExpensesIncome(-1,expenses, income, ignoreDate_, dtBegin_,dtEnd_); + core_->bTransactionList_.getExpensesIncome(-1,expenses, income, ignoreDate_, dtBegin_,dtEnd_, mmIniOptions::ignoreFutureTransactions_); mmGraphIncExpensesMonth gg; gg.init(income, expenses); Modified: trunk/mmex/src/reportincexpensesfinancialperiod.cpp =================================================================== --- trunk/mmex/src/reportincexpensesfinancialperiod.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/reportincexpensesfinancialperiod.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -115,7 +115,7 @@ bool ignoreDate = false; income = 0.0; expenses = 0.0; - core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); @@ -148,7 +148,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); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, false, yearBegin, yearEnd, mmIniOptions::ignoreFutureTransactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); Modified: trunk/mmex/src/reportincexpesestime.cpp =================================================================== --- trunk/mmex/src/reportincexpesestime.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/reportincexpesestime.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -57,7 +57,7 @@ bool ignoreDate = false; income = 0.0; expenses = 0.0; - core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); 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); + core_->bTransactionList_.getExpensesIncome(-1, expenses, income, false, dtBegin, dtEnd, mmIniOptions::ignoreFutureTransactions_); wxString actualExpStr; mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr); Modified: trunk/mmex/src/reportpayee.cpp =================================================================== --- trunk/mmex/src/reportpayee.cpp 2012-01-17 06:22:29 UTC (rev 1646) +++ trunk/mmex/src/reportpayee.cpp 2012-01-17 09:43:39 UTC (rev 1647) @@ -55,7 +55,7 @@ { wxString balance; double amt = core_->bTransactionList_.getAmountForPayee( - core_->payeeList_.payees_[idx]->payeeID_, ignoreDate_, dtBegin_, dtEnd_ + core_->payeeList_.payees_[idx]->payeeID_, ignoreDate_, dtBegin_, dtEnd_, mmIniOptions::ignoreFutureTransactions_ ); mmex::formatDoubleToCurrency(amt, balance); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |