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

(derive_new_entry): Simplified some code. (derive_new_entry): If no

Browse source 
commodity was specified for an amount, and none was figured out from
previous transactions, then use the default commodity (which is
specified using "D <SYMBOL>" in the ledger file).
This commit is contained in:
John Wiegley 2005-01-14 23:20:24 +00:00
parent d142018bcd
commit cb15e764eb
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
derive.cc
View file

@ -44,7 +44,7 @@ entry_t * derive_new_entry(journal_t& journal,
first = xact = new transaction_t(m_xact->account, amount_t(*i++));
added->add_transaction(xact);
if (xact->amount.commodity().symbol.empty())
if (! xact->amount.commodity())
xact->amount.set_commodity(m_xact->amount.commodity());
m_xact = matching->transactions.back();
@ -91,8 +91,12 @@ entry_t * derive_new_entry(journal_t& journal,
}
transaction_t * xact = new transaction_t(acct, amount_t(*i++));
if (cmdty && ! xact->amount.commodity())
xact->amount.set_commodity(*cmdty);
if (! xact->amount.commodity()) {
if (cmdty)
xact->amount.set_commodity(*cmdty);
else if (commodity_t::default_commodity)
xact->amount.set_commodity(*commodity_t::default_commodity);
}
added->add_transaction(xact);
}