From: <vo...@us...> - 2013-02-19 19:07:36
|
Revision: 3516 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3516&view=rev Author: vomikan Date: 2013-02-19 19:07:24 +0000 (Tue, 19 Feb 2013) Log Message: ----------- validators added for missing payee and to account Modified Paths: -------------- trunk/mmex/src/qif_import.cpp Modified: trunk/mmex/src/qif_import.cpp =================================================================== --- trunk/mmex/src/qif_import.cpp 2013-02-19 18:13:12 UTC (rev 3515) +++ trunk/mmex/src/qif_import.cpp 2013-02-19 19:07:24 UTC (rev 3516) @@ -499,26 +499,29 @@ if (subCategID == -1 && categID != -1) subCategID = core->categoryList_.AddSubCategory(categID, sSubCateg); - //TODO: Is it possible now? - if (to_account_id == -1 && type == TRANS_TYPE_TRANSFER_STR) - { - sMsg = wxString::Format(_("Unknown account: %s"), sToAccountName.c_str()); - log << sMsg << endl; - logWindow->AppendText(sMsg << wxT("\n")); - //FIXME: Transfer transaction with sane to and from account id will be created - to_account_id = fromAccountID; - status = wxT("V"); - } - if (type == TRANS_TYPE_TRANSFER_STR) { - payeeID = -1; + payeeID = -1; + if (to_account_id == -1) + { + sMsg = _("To account missing"); + log << sMsg << endl; + logWindow->AppendText(sMsg << wxT("\n")); + bValid = false; + } } else { to_account_id = -1; - if (!core->payeeList_.PayeeExists(sPayee)) + if (sPayee.IsEmpty()) { + sMsg = _("Payee missing"); + log << sMsg << endl; + logWindow->AppendText(sMsg << wxT("\n")); + bValid = false; + } + else if (!core->payeeList_.PayeeExists(sPayee)) + { sMsg = wxString::Format(_("Payee Added: %s"), sPayee.c_str()); log << sMsg << endl; logWindow->AppendText(wxString()<< sMsg << wxT("\n")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |