From: <vo...@us...> - 2013-10-07 08:33:04
|
Revision: 4780 http://sourceforge.net/p/moneymanagerex/code/4780 Author: vomikan Date: 2013-10-07 08:33:00 +0000 (Mon, 07 Oct 2013) Log Message: ----------- fix Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-10-07 07:43:44 UTC (rev 4779) +++ trunk/src/billsdepositspanel.cpp 2013-10-07 08:33:00 UTC (rev 4780) @@ -238,34 +238,43 @@ listCtrlAccount_->DeleteAllItems(); int cnt = 0, selected_item = -1; - for (const auto& q1: Model_Billsdeposits::instance().all(Model_Billsdeposits::COL_NEXTOCCURRENCEDATE)) + for (const auto& entry: Model_Billsdeposits::instance().all(Model_Billsdeposits::COL_NEXTOCCURRENCEDATE)) { mmBDTransactionHolder th; - Model_Account::Data* account = Model_Account::instance().get(th.accountID_); - if (!account) continue; - th.id_ = q1.BDID; - th.nextOccurDate_ = Model_Billsdeposits::NEXTOCCURRENCEDATE(q1); + Model_Account::Data* account = Model_Account::instance().get(entry.ACCOUNTID); + const Model_Category::Data* category = Model_Category::instance().get(entry.CATEGID); + const Model_Subcategory::Data* sub_category = (entry.SUBCATEGID != -1 ? Model_Subcategory::instance().get(entry.SUBCATEGID) : 0); + if (!account || !category) + { + if (!account) + wxLogDebug("Account %i is missing -----------------------------------------", entry.ACCOUNTID); + if (!category ||!sub_category) + wxLogDebug("Category %i is missing -------------------------------------", entry.CATEGID); + wxASSERT(false); + continue; + } + + th.id_ = entry.BDID; + th.nextOccurDate_ = Model_Billsdeposits::NEXTOCCURRENCEDATE(entry); th.nextOccurStr_ = mmGetDateForDisplay(th.nextOccurDate_); - int repeats = q1.REPEATS; - th.payeeID_ = q1.PAYEEID; - th.sStatus_ = q1.STATUS; - th.transType_ = q1.TRANSCODE; - th.accountID_ = q1.ACCOUNTID; - th.toAccountID_ = q1.TOACCOUNTID; + int repeats = entry.REPEATS; + th.payeeID_ = entry.PAYEEID; + th.sStatus_ = entry.STATUS; + th.transType_ = entry.TRANSCODE; + th.accountID_ = entry.ACCOUNTID; + th.toAccountID_ = entry.TOACCOUNTID; th.accountName_ = account->ACCOUNTNAME; - th.amt_ = q1.TRANSAMOUNT; - th.toAmt_ = q1.TOTRANSAMOUNT; - th.sNumber_ = q1.TRANSACTIONNUMBER; - th.notes_ = q1.NOTES; - th.categID_ = q1.CATEGID; - const Model_Category::Data* category = Model_Category::instance().get(q1.CATEGID); - const Model_Subcategory::Data* sub_category = (q1.SUBCATEGID != -1 ? Model_Subcategory::instance().get(q1.SUBCATEGID) : 0); + th.amt_ = entry.TRANSAMOUNT; + th.toAmt_ = entry.TOTRANSAMOUNT; + th.sNumber_ = entry.TRANSACTIONNUMBER; + th.notes_ = entry.NOTES; + th.categID_ = entry.CATEGID; th.categoryStr_ = category->CATEGNAME; - th.subcategID_ = q1.SUBCATEGID; + th.subcategID_ = entry.SUBCATEGID; th.subcategoryStr_ = sub_category ? sub_category->SUBCATEGNAME : ""; - int numRepeats = q1.NUMOCCURRENCES; + int numRepeats = entry.NUMOCCURRENCES; th.bd_repeat_user_ = false; th.bd_repeat_auto_ = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-10-07 09:14:34
|
Revision: 4781 http://sourceforge.net/p/moneymanagerex/code/4781 Author: vomikan Date: 2013-10-07 09:14:31 +0000 (Mon, 07 Oct 2013) Log Message: ----------- fix Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-10-07 08:33:00 UTC (rev 4780) +++ trunk/src/billsdepositspanel.cpp 2013-10-07 09:14:31 UTC (rev 4781) @@ -37,11 +37,11 @@ END_EVENT_TABLE() /*******************************************************/ BEGIN_EVENT_TABLE(billsDepositsListCtrl, mmListCtrl) - EVT_LIST_ITEM_ACTIVATED(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListItemActivated) - EVT_LIST_ITEM_RIGHT_CLICK(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnItemRightClick) - EVT_LIST_ITEM_SELECTED(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListItemSelected) - EVT_LIST_ITEM_DESELECTED(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListItemDeselected) - EVT_LIST_COL_END_DRAG(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnItemResize) + EVT_LIST_ITEM_ACTIVATED(wxID_ANY, billsDepositsListCtrl::OnListItemActivated) + EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY, billsDepositsListCtrl::OnItemRightClick) + EVT_LIST_ITEM_SELECTED(wxID_ANY, billsDepositsListCtrl::OnListItemSelected) + EVT_LIST_ITEM_DESELECTED(wxID_ANY, billsDepositsListCtrl::OnListItemDeselected) + EVT_LIST_COL_END_DRAG(wxID_ANY, billsDepositsListCtrl::OnItemResize) EVT_MENU(MENU_TREEPOPUP_NEW, billsDepositsListCtrl::OnNewBDSeries) @@ -50,7 +50,7 @@ EVT_MENU(MENU_POPUP_BD_ENTER_OCCUR, billsDepositsListCtrl::OnEnterBDTransaction) EVT_MENU(MENU_POPUP_BD_SKIP_OCCUR, billsDepositsListCtrl::OnSkipBDTransaction) - EVT_LIST_KEY_DOWN(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListKeyDown) + EVT_LIST_KEY_DOWN(wxID_ANY, billsDepositsListCtrl::OnListKeyDown) END_EVENT_TABLE() /*******************************************************/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-10-20 02:47:32
|
Revision: 4925 http://sourceforge.net/p/moneymanagerex/code/4925 Author: guanlisheng Date: 2013-10-20 02:47:26 +0000 (Sun, 20 Oct 2013) Log Message: ----------- cleanup used debug log message Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-10-20 02:42:20 UTC (rev 4924) +++ trunk/src/billsdepositspanel.cpp 2013-10-20 02:47:26 UTC (rev 4925) @@ -247,11 +247,6 @@ const Model_Subcategory::Data* sub_category = (entry.SUBCATEGID != -1 ? Model_Subcategory::instance().get(entry.SUBCATEGID) : 0); if (!account || !category) { - if (!account) - wxLogDebug("Account %i is missing -----------------------------------------", entry.ACCOUNTID); - if (!category ||!sub_category) - wxLogDebug("Category %i is missing -------------------------------------", entry.CATEGID); - wxASSERT(false); continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-11-10 04:41:17
|
Revision: 5153 http://sourceforge.net/p/moneymanagerex/code/5153 Author: guanlisheng Date: 2013-11-10 04:41:14 +0000 (Sun, 10 Nov 2013) Log Message: ----------- fix linux compile Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-11-10 04:29:33 UTC (rev 5152) +++ trunk/src/billsdepositspanel.cpp 2013-11-10 04:41:14 UTC (rev 5153) @@ -711,7 +711,7 @@ break; case COL_FREQUENCY: std::stable_sort(bills_.begin(), bills_.end() - , [](const Model_Billsdeposits::Data& x, const Model_Billsdeposits::Data& y) + , [](const Model_Billsdeposits::Full_Data& x, const Model_Billsdeposits::Full_Data& y) { wxString x_text = mmBillsDepositsPanel::GetFrequency(&x); wxString y_text = mmBillsDepositsPanel::GetFrequency(&y); @@ -720,7 +720,7 @@ break; case COL_DAYS: std::stable_sort(bills_.begin(), bills_.end() - , [](const Model_Billsdeposits::Data& x, const Model_Billsdeposits::Data& y) + , [](const Model_Billsdeposits::Full_Data& x, const Model_Billsdeposits::Full_Data& y) { bool x_useText = false; wxString x_text = mmBillsDepositsPanel::GetRemainingDays(&x); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-11-10 06:31:32
|
Revision: 5156 http://sourceforge.net/p/moneymanagerex/code/5156 Author: vomikan Date: 2013-11-10 06:31:30 +0000 (Sun, 10 Nov 2013) Log Message: ----------- fix for gcc Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-11-10 05:40:25 UTC (rev 5155) +++ trunk/src/billsdepositspanel.cpp 2013-11-10 06:31:30 UTC (rev 5156) @@ -711,19 +711,19 @@ break; case COL_FREQUENCY: std::stable_sort(bills_.begin(), bills_.end() - , [](const Model_Billsdeposits::Full_Data& x, const Model_Billsdeposits::Full_Data& y) + , [&](const Model_Billsdeposits::Full_Data& x, const Model_Billsdeposits::Full_Data& y) { - wxString x_text = mmBillsDepositsPanel::GetFrequency(&x); - wxString y_text = mmBillsDepositsPanel::GetFrequency(&y); + wxString x_text = this->GetFrequency(&x); + wxString y_text = this->GetFrequency(&y); return x_text < y_text; }); break; case COL_DAYS: std::stable_sort(bills_.begin(), bills_.end() - , [](const Model_Billsdeposits::Full_Data& x, const Model_Billsdeposits::Full_Data& y) + , [&](const Model_Billsdeposits::Data& x, const Model_Billsdeposits::Data& y) { bool x_useText = false; - wxString x_text = mmBillsDepositsPanel::GetRemainingDays(&x); + wxString x_text = this->GetRemainingDays(&x); long x_num = 0; if (isdigit(x_text[0])) { @@ -734,9 +734,9 @@ } else x_useText = true; - atoi(x_text); + bool y_useText = false; - wxString y_text = mmBillsDepositsPanel::GetRemainingDays(&y); + wxString y_text = this->GetRemainingDays(&y); long y_num = 0; if (isdigit(y_text[0])) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-11-10 17:58:39
|
Revision: 5167 http://sourceforge.net/p/moneymanagerex/code/5167 Author: siena123 Date: 2013-11-10 17:58:36 +0000 (Sun, 10 Nov 2013) Log Message: ----------- cleanup - TODO Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-11-10 17:45:00 UTC (rev 5166) +++ trunk/src/billsdepositspanel.cpp 2013-11-10 17:58:36 UTC (rev 5167) @@ -767,9 +767,8 @@ void billsDepositsListCtrl::refreshVisualList(int selected_index) { - //TODO: if (selected_index >= (long)cp_->bills_.size() || selected_index < 0) - selected_index = /*g_asc*/ true ? (long)cp_->bills_.size() - 1 : 0; + selected_index = - 1; if (!cp_->bills_.empty()) { RefreshItems(0, cp_->bills_.size() - 1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-11-16 08:45:48
|
Revision: 5243 http://sourceforge.net/p/moneymanagerex/code/5243 Author: guanlisheng Date: 2013-11-16 08:45:42 +0000 (Sat, 16 Nov 2013) Log Message: ----------- fix Repeating Transaction bug Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-11-16 01:19:10 UTC (rev 5242) +++ trunk/src/billsdepositspanel.cpp 2013-11-16 08:45:42 UTC (rev 5243) @@ -254,9 +254,9 @@ item.SetImage(listCtrlAccount_->m_asc ? 4 : 3); listCtrlAccount_->SetColumn(listCtrlAccount_->m_selected_col, item); + bills_.clear(); if (transFilterActive_) { - bills_.clear(); for (const Model_Billsdeposits::Data& data : Model_Billsdeposits::instance().all(Model_Billsdeposits::COL_NEXTOCCURRENCEDATE)) { if (transFilterDlg_->getAccountCheckBox() && transFilterDlg_->getAccountID() != data.ACCOUNTID) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-11-17 22:22:56
|
Revision: 5281 http://sourceforge.net/p/moneymanagerex/code/5281 Author: siena123 Date: 2013-11-17 22:22:53 +0000 (Sun, 17 Nov 2013) Log Message: ----------- use wxAtoi instead of atoi Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-11-17 22:09:41 UTC (rev 5280) +++ trunk/src/billsdepositspanel.cpp 2013-11-17 22:22:53 UTC (rev 5281) @@ -727,7 +727,7 @@ long x_num = 0; if (isdigit(x_text[0])) { - x_num = atoi(x_text); + x_num = wxAtoi(x_text); wxString removed; if (x_text.EndsWith(wxString("!"), &removed)) x_num = -x_num; @@ -740,7 +740,7 @@ long y_num = 0; if (isdigit(y_text[0])) { - y_num = atoi(y_text); + y_num = wxAtoi(y_text); wxString removed; if (y_text.EndsWith(wxString("!"), &removed)) y_num = -y_num; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-11-23 16:51:14
|
Revision: 5347 http://sourceforge.net/p/moneymanagerex/code/5347 Author: siena123 Date: 2013-11-23 16:51:11 +0000 (Sat, 23 Nov 2013) Log Message: ----------- fix memory leak Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-11-23 15:21:52 UTC (rev 5346) +++ trunk/src/billsdepositspanel.cpp 2013-11-23 16:51:11 UTC (rev 5347) @@ -85,6 +85,7 @@ const wxPoint& pos, const wxSize& size, long style, const wxString& name) : m_imageList() , listCtrlAccount_() +, transFilterDlg_(0) { ColName_[COL_PAYEE] = _("Payee"); ColName_[COL_ACCOUNT] = _("Account"); @@ -130,6 +131,8 @@ { if (m_imageList) delete m_imageList; + if (transFilterDlg_) + delete transFilterDlg_; } void mmBillsDepositsPanel::CreateControls() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-12-16 03:53:25
|
Revision: 5602 http://sourceforge.net/p/moneymanagerex/code/5602 Author: siena123 Date: 2013-12-16 03:53:23 +0000 (Mon, 16 Dec 2013) Log Message: ----------- [bug:#249] fix displayed payee name for transfer transaction type in repeating transaction panel Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-12-16 03:52:09 UTC (rev 5601) +++ trunk/src/billsdepositspanel.cpp 2013-12-16 03:53:23 UTC (rev 5602) @@ -325,7 +325,11 @@ { r.ACCOUNTNAME = account->ACCOUNTNAME; if (Model_Billsdeposits::type(r) == Model_Billsdeposits::TRANSFER) - r.PAYEENAME = account->ACCOUNTNAME; + { + Model_Account::Data* to_account = Model_Account::instance().get(r.TOACCOUNTID); + if (to_account) + r.PAYEENAME = to_account->ACCOUNTNAME; + } } bills_.push_back(r); @@ -343,7 +347,11 @@ { r.ACCOUNTNAME = account->ACCOUNTNAME; if (Model_Billsdeposits::type(r) == Model_Billsdeposits::TRANSFER) - r.PAYEENAME = account->ACCOUNTNAME; + { + Model_Account::Data* to_account = Model_Account::instance().get(r.TOACCOUNTID); + if (to_account) + r.PAYEENAME = to_account->ACCOUNTNAME; + } } bills_.push_back(r); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-12-24 11:35:52
|
Revision: 5715 http://sourceforge.net/p/moneymanagerex/code/5715 Author: vomikan Date: 2013-12-24 11:35:48 +0000 (Tue, 24 Dec 2013) Log Message: ----------- button labels Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2013-12-24 05:32:37 UTC (rev 5714) +++ trunk/src/billsdepositspanel.cpp 2013-12-24 11:35:48 UTC (rev 5715) @@ -230,16 +230,16 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_LEFT|wxALL, 5); - wxButton* itemButton6 = new wxButton( itemPanel12, wxID_NEW); + wxButton* itemButton6 = new wxButton( itemPanel12, wxID_NEW, _("&New ")); itemButton6->SetToolTip(_("New Bills & Deposit Series")); itemBoxSizer5->Add(itemButton6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); - wxButton* itemButton81 = new wxButton( itemPanel12, wxID_EDIT); + wxButton* itemButton81 = new wxButton( itemPanel12, wxID_EDIT, _("&Edit ")); itemButton81->SetToolTip(_("Edit Bills & Deposit Series")); itemBoxSizer5->Add(itemButton81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); itemButton81->Enable(false); - wxButton* itemButton7 = new wxButton( itemPanel12, wxID_DELETE); + wxButton* itemButton7 = new wxButton( itemPanel12, wxID_DELETE, _("&Delete ")); itemButton7->SetToolTip(_("Delete Bills & Deposit Series")); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); itemButton7->Enable(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2014-02-12 16:07:18
|
Revision: 6121 http://sourceforge.net/p/moneymanagerex/code/6121 Author: vomikan Date: 2014-02-12 16:07:14 +0000 (Wed, 12 Feb 2014) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/billsdepositspanel.cpp Modified: trunk/src/billsdepositspanel.cpp =================================================================== --- trunk/src/billsdepositspanel.cpp 2014-02-12 00:07:26 UTC (rev 6120) +++ trunk/src/billsdepositspanel.cpp 2014-02-12 16:07:14 UTC (rev 6121) @@ -167,7 +167,7 @@ transFilterDlg_ = new mmFilterTransactionsDialog(this); initVirtualListControl(); - + this->windowsFreezeThaw(); return TRUE; @@ -303,105 +303,30 @@ listCtrlAccount_->SetColumn(listCtrlAccount_->m_selected_col, item); bills_.clear(); - if (transFilterActive_) + + for (const Model_Billsdeposits::Data& data : Model_Billsdeposits::instance().all(Model_Billsdeposits::COL_NEXTOCCURRENCEDATE)) { - for (const Model_Billsdeposits::Data& data : Model_Billsdeposits::instance().all(Model_Billsdeposits::COL_NEXTOCCURRENCEDATE)) - { - /*if (transFilterDlg_->getAccountCheckBox() && transFilterDlg_->getAccountID() != data.ACCOUNTID) - continue; // Skip + if (transFilterActive_ && !transFilterDlg_->checkAll(data)) + continue; - if (transFilterDlg_->getDateRangeCheckBox() && !Model_Billsdeposits::NEXTOCCURRENCEDATE(data).IsBetween(transFilterDlg_->getFromDateCtrl(), transFilterDlg_->getToDateControl())) - continue; // Skip + Model_Billsdeposits::Full_Data r(data); - if (!transFilterDlg_->checkPayee(data.PAYEEID)) - continue; // Skip - - if (transFilterDlg_->getCategoryCheckBox()) + const Model_Payee::Data* payee = Model_Payee::instance().get(r.PAYEEID); + if (payee) r.PAYEENAME = payee->PAYEENAME; + const Model_Account::Data* account = Model_Account::instance().get(r.ACCOUNTID); + if (account) + { + r.ACCOUNTNAME = account->ACCOUNTNAME; + if (Model_Billsdeposits::type(r) == Model_Billsdeposits::TRANSFER) { - if (data.CATEGID != -1) - { - if (transFilterDlg_->getCategoryID() != data.CATEGID) - continue; // Skip - if (transFilterDlg_->getSubCategoryID() != data.SUBCATEGID && !transFilterDlg_->getSimilarCategoryStatus()) - continue; // Skip - } - else - { - bool bMatching = false; - for (const Model_Budgetsplittransaction::Data split : Model_Billsdeposits::splittransaction(data)) - { - if (split.CATEGID != data.CATEGID) - continue; - if (split.SUBCATEGID != data.SUBCATEGID && !transFilterDlg_->getSimilarCategoryStatus()) - continue; - - bMatching = true; - break; - } - if (!bMatching) - continue; - } + Model_Account::Data* to_account = Model_Account::instance().get(r.TOACCOUNTID); + if (to_account) + r.PAYEENAME = to_account->ACCOUNTNAME; } - if (transFilterDlg_->getStatusCheckBox() && !transFilterDlg_->compareStatus(data.STATUS)) - continue; // Skip - - // Repeating transactions are always a transfer to - if (transFilterDlg_->getTypeCheckBox() && !transFilterDlg_->allowType(data.TRANSCODE, data.ACCOUNTID != data.TOACCOUNTID)) - continue; // Skip - - if (transFilterDlg_->getAmountRangeCheckBoxMin() && transFilterDlg_->getAmountMin() > data.TRANSAMOUNT) - continue; // Skip - - if (transFilterDlg_->getAmountRangeCheckBoxMax() && transFilterDlg_->getAmountMax() < data.TRANSAMOUNT) - continue; // Skip - - if (transFilterDlg_->getNumberCheckBox() && !data.TRANSACTIONNUMBER.Lower().Matches(transFilterDlg_->getNumber().Trim().Lower())) - continue; // Skip - - if (transFilterDlg_->getNotesCheckBox() && !data.NOTES.Lower().Matches(transFilterDlg_->getNotes().Trim().Lower())) - continue; // Skip*/ - if (!transFilterDlg_->checkAll(data)) continue; - - Model_Billsdeposits::Full_Data r(data); - - const Model_Payee::Data* payee = Model_Payee::instance().get(r.PAYEEID); - if (payee) r.PAYEENAME = payee->PAYEENAME; - const Model_Account::Data* account = Model_Account::instance().get(r.ACCOUNTID); - if (account) - { - r.ACCOUNTNAME = account->ACCOUNTNAME; - if (Model_Billsdeposits::type(r) == Model_Billsdeposits::TRANSFER) - { - Model_Account::Data* to_account = Model_Account::instance().get(r.TOACCOUNTID); - if (to_account) - r.PAYEENAME = to_account->ACCOUNTNAME; - } - } - - bills_.push_back(r); } + bills_.push_back(r); } - else - for (const auto& data: Model_Billsdeposits::instance().all(Model_Billsdeposits::COL_NEXTOCCURRENCEDATE)) - { - Model_Billsdeposits::Full_Data r(data); - const Model_Payee::Data* payee = Model_Payee::instance().get(r.PAYEEID); - if (payee) r.PAYEENAME = payee->PAYEENAME; - const Model_Account::Data* account = Model_Account::instance().get(r.ACCOUNTID); - if (account) - { - r.ACCOUNTNAME = account->ACCOUNTNAME; - if (Model_Billsdeposits::type(r) == Model_Billsdeposits::TRANSFER) - { - Model_Account::Data* to_account = Model_Account::instance().get(r.TOACCOUNTID); - if (to_account) - r.PAYEENAME = to_account->ACCOUNTNAME; - } - } - - bills_.push_back(r); - } sortTable(); int cnt = 0, selected_item = -1; This was sent by MMEX an easy to use, money management application. |