Move when Unknown accounts are processed
This commit is contained in:
parent
4dd536c670
commit
4b58047ecb
1 changed files with 9 additions and 10 deletions
|
|
@ -123,10 +123,18 @@ account_t * journal_t::register_account(const string& name, post_t * post,
|
||||||
if (i != account_aliases.end())
|
if (i != account_aliases.end())
|
||||||
result = (*i).second;
|
result = (*i).second;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! result)
|
if (! result)
|
||||||
result = master_account->find_account(name);
|
result = master_account->find_account(name);
|
||||||
|
|
||||||
|
if (result->name == _("Unknown")) {
|
||||||
|
foreach (account_mapping_t& value, payees_for_unknown_accounts) {
|
||||||
|
if (value.first.match(post->xact->payee)) {
|
||||||
|
result = value.second;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (! result->has_flags(ACCOUNT_KNOWN)) {
|
if (! result->has_flags(ACCOUNT_KNOWN)) {
|
||||||
if (! post) {
|
if (! post) {
|
||||||
if (force_checking)
|
if (force_checking)
|
||||||
|
|
@ -145,15 +153,6 @@ account_t * journal_t::register_account(const string& name, post_t * post,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result->name == _("Unknown")) {
|
|
||||||
foreach (account_mapping_t& value, payees_for_unknown_accounts) {
|
|
||||||
if (value.first.match(post->xact->payee)) {
|
|
||||||
result = value.second;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue