From: <vo...@us...> - 2013-02-05 08:23:59
|
Revision: 3438 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3438&view=rev Author: vomikan Date: 2013-02-05 08:07:32 +0000 (Tue, 05 Feb 2013) Log Message: ----------- Update Modified Paths: -------------- trunk/mmex/src/mmex.cpp trunk/mmex/src/mmtransaction.cpp Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2013-02-04 18:43:21 UTC (rev 3437) +++ trunk/mmex/src/mmex.cpp 2013-02-05 08:07:32 UTC (rev 3438) @@ -1320,7 +1320,7 @@ navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Financial Year"))); } - wxTreeItemId incexpmonthly = navTreeCtrl_->AppendItem(incexpOverTime, _("Income vs Expenses - All Time"), 4, 4); + wxTreeItemId incexpmonthly = navTreeCtrl_->AppendItem(incexpOverTime, _("All Time"), 4, 4); navTreeCtrl_->SetItemData(incexpmonthly, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - All Time"))); ////////////////////////////////////////////////////////////////// @@ -1689,28 +1689,16 @@ menuPrintingEnable(true); createReportsPage(rs); } - else if (sData == wxT("Where the Money Comes From")) + else if (sData == wxT("Where the Money Goes")) { wxDateTime dtEnd = wxDateTime::Now(); wxDateTime dtBegin = wxDateTime::Now(); - wxString title = _("Where the Money Comes From"); + wxString title = _("Where the Money Goes"); mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get() - , bIgnoreFuture, dtBegin, dtEnd, title, 1); + , true, dtBegin, dtEnd, title, 2); menuPrintingEnable(true); createReportsPage(rs); } - else if (sData.StartsWith(wxT("Where the Money Comes From - "))) - { - GetDateRange(dtBegin, dtEnd, sData); - - if (bIgnoreFuture && sData == wxT("Where the Money Comes From - Current Month")) - title = _("Where the Money Comes From - Current Month to Date"); - - mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get() - , false, dtBegin, dtEnd, title, 1); - menuPrintingEnable(true); - createReportsPage(rs); - } else if (sData.StartsWith(wxT("Where the Money Goes -"))) { GetDateRange(dtBegin, dtEnd, sData); @@ -1723,36 +1711,28 @@ menuPrintingEnable(true); createReportsPage(rs); } - else if (sData == wxT("Income vs Expenses - All Time")) + else if (sData == wxT("Where the Money Comes From")) { - wxString title = _("Income vs Expenses - All Time"); - mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get() - , false, wxDateTime::Now(), wxDateTime::Now(), title); + wxDateTime dtEnd = wxDateTime::Now(); + wxDateTime dtBegin = wxDateTime::Now(); + wxString title = _("Where the Money Comes From"); + mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get() + , true, dtBegin, dtEnd, title, 1); menuPrintingEnable(true); createReportsPage(rs); - } - else if (sData.StartsWith(wxT("Income vs Expenses - "))) + } + else if (sData.StartsWith(wxT("Where the Money Comes From - "))) { GetDateRange(dtBegin, dtEnd, sData); - if (bIgnoreFuture && sData == wxT("Income vs Expenses - Current Month")) - title = _("Income vs Expenses - Current Month to Date"); + if (bIgnoreFuture && sData == wxT("Where the Money Comes From - Current Month")) + title = _("Where the Money Comes From - Current Month to Date"); - //int year = today.GetYear(); - //mmPrintableBase* rs = new mmReportIncExpensesOverFinancialPeriod(this, m_core.get(), year); - mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get() - , bIgnoreFuture, dtBegin, dtEnd, title); + mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get() + , false, dtBegin, dtEnd, title, 1); menuPrintingEnable(true); createReportsPage(rs); } - else if (sData == wxT("Income vs Expenses - All Time")) - { - wxString title = _("Income vs Expenses - All Time"); - mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get() - , false, wxDateTime::Now(), wxDateTime::Now(), title); - menuPrintingEnable(true); - createReportsPage(rs); - } else if (sData == wxT("Categories - Over Time")) { wxProgressDialog proDlg(_("Category Report"), _("Category Report being generated... Please wait."), 100, this); @@ -1778,7 +1758,7 @@ { wxString title = _("Payee Report"); mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get() - , bIgnoreFuture, wxDateTime::Now(), wxDateTime::Now(), title); + , true, wxDateTime::Now(), wxDateTime::Now(), title); menuPrintingEnable(true); createReportsPage(rs); } @@ -1795,6 +1775,36 @@ createReportsPage(rs); } + else if (sData == wxT("Income vs Expenses - All Time")) + { + wxString title = _("Income vs Expenses - All Time"); + mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get() + , true, wxDateTime::Now(), wxDateTime::Now(), title); + menuPrintingEnable(true); + createReportsPage(rs); + } + else if (sData.StartsWith(wxT("Income vs Expenses - "))) + { + GetDateRange(dtBegin, dtEnd, sData); + + if (bIgnoreFuture && sData == wxT("Income vs Expenses - Current Month")) + title = _("Income vs Expenses - Current Month to Date"); + + //int year = today.GetYear(); + //mmPrintableBase* rs = new mmReportIncExpensesOverFinancialPeriod(this, m_core.get(), year); + mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get() + , false, dtBegin, dtEnd, title); + menuPrintingEnable(true); + createReportsPage(rs); + } + else if (sData == wxT("Income vs Expenses - All Time")) + { + wxString title = _("Income vs Expenses - All Time"); + mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get() + , false, wxDateTime::Now(), wxDateTime::Now(), title); + menuPrintingEnable(true); + createReportsPage(rs); + } else if (sData == wxT("Cash Flow")) { mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this); Modified: trunk/mmex/src/mmtransaction.cpp =================================================================== --- trunk/mmex/src/mmtransaction.cpp 2013-02-04 18:43:21 UTC (rev 3437) +++ trunk/mmex/src/mmtransaction.cpp 2013-02-05 08:07:32 UTC (rev 3438) @@ -977,12 +977,13 @@ } if (ignoreFuture) { - if (pBankTransaction->date_.IsLaterThan(wxDateTime::Now())) + if ( pBankTransaction->date_.GetDateOnly() > wxDateTime::Now().GetDateOnly()) continue; //skip future dated transactions } if (!ignoreDate) { - if (!pBankTransaction->date_.IsBetween(dtBegin, dtEnd)) + if ((pBankTransaction->date_.GetDateOnly() < dtBegin.GetDateOnly()) + || (pBankTransaction->date_.GetDateOnly() > dtEnd.GetDateOnly())) { continue; //skip } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |