sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(derive_new_entry): If the "entry" command can't figure out which

Browse source 
account to draw from, and if there is a "basket account" (defined with
"A" in a textual ledger), use that.
This commit is contained in:
John Wiegley 2005-07-13 08:32:16 +00:00
parent dab2bfabc8
commit 1f433a129f
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
derive.cc
View file

@ -45,13 +45,18 @@ entry_t * derive_new_entry(journal_t& journal,
added->add_transaction(new transaction_t(**j)); added->add_transaction(new transaction_t(**j));
} }
else if ((*i)[0] == '-' || std::isdigit((*i)[0])) { else if ((*i)[0] == '-' || std::isdigit((*i)[0])) {
if (! matching) account_t * draw_acct;
if (matching)
draw_acct = matching->transactions.front()->account;
else if (journal.basket)
draw_acct = journal.basket;
else
throw error("Could not determine the account to draw from"); throw error("Could not determine the account to draw from");
transaction_t * m_xact, * xact, * first; transaction_t * m_xact, * xact, * first;
m_xact = matching->transactions.front(); m_xact = matching->transactions.front();
first = xact = new transaction_t(m_xact->account, amount_t(*i++)); first = xact = new transaction_t(draw_acct, amount_t(*i++));
added->add_transaction(xact); added->add_transaction(xact);
if (! xact->amount.commodity()) if (! xact->amount.commodity())
@ -59,7 +64,7 @@ entry_t * derive_new_entry(journal_t& journal,
m_xact = matching->transactions.back(); m_xact = matching->transactions.back();
xact = new transaction_t(m_xact->account, - first->amount); xact = new transaction_t(draw_acct, - first->amount);
added->add_transaction(xact); added->add_transaction(xact);
if (i != end) { if (i != end) {
@ -112,14 +117,17 @@ entry_t * derive_new_entry(journal_t& journal,
added->add_transaction(xact); added->add_transaction(xact);
} }
if (! matching) { account_t * draw_acct;
if (matching)
draw_acct = matching->transactions.back()->account;
else if (journal.basket)
draw_acct = journal.basket;
else
throw error("Could not determine the account to draw from"); throw error("Could not determine the account to draw from");
} else {
transaction_t * xact transaction_t * xact = new transaction_t(draw_acct);
= new transaction_t(matching->transactions.back()->account);
added->add_transaction(xact); added->add_transaction(xact);
} }
}
done: done:
if (! added->finalize() || if (! added->finalize() ||