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

(report_budget_items): Removed an unused local variable.

Browse source
This commit is contained in:
John Wiegley 2005-07-13 07:24:24 +00:00
parent f9c2ddfd96
commit b79b3cf54b
1 changed files with 45 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
walk.cc
View file

@ -537,58 +537,51 @@ void generate_transactions::add_transaction(const interval_t& period,
void budget_transactions::report_budget_items(const std::time_t moment) void budget_transactions::report_budget_items(const std::time_t moment)
{ {
if (pending_xacts.size() > 0) { if (pending_xacts.size() == 0)
std::list<pending_xacts_list::iterator> to_clear; return;
bool reported; bool reported;
do { do {
reported = false; reported = false;
for (pending_xacts_list::iterator i = pending_xacts.begin(); for (pending_xacts_list::iterator i = pending_xacts.begin();
i != pending_xacts.end(); i != pending_xacts.end();
i++) { i++) {
std::time_t& begin = (*i).first.begin; std::time_t& begin = (*i).first.begin;
if (! begin) { if (! begin) {
(*i).first.start(moment); (*i).first.start(moment);
begin = (*i).first.begin; begin = (*i).first.begin;
}
if (std::difftime(begin, moment) < 0 &&
(! (*i).first.end || std::difftime(begin, (*i).first.end) < 0)) {
transaction_t& xact = *(*i).second;
DEBUG_PRINT("ledger.walk.budget", "Reporting budget for "
<< xact.account->fullname());
DEBUG_PRINT_TIME("ledger.walk.budget", begin);
DEBUG_PRINT_TIME("ledger.walk.budget", moment);
entry_temps.push_back(entry_t());
entry_t& entry = entry_temps.back();
entry.payee = "Budget entry";
entry.date = begin;
xact_temps.push_back(xact);
transaction_t& temp = xact_temps.back();
temp.entry = &entry;
temp.flags |= TRANSACTION_AUTO;
temp.amount.negate();
temp.flags |= TRANSACTION_BULK_ALLOC;
entry.add_transaction(&temp);
begin = (*i).first.increment(begin);
item_handler<transaction_t>::operator()(temp);
reported = true;
}
} }
} while (reported);
for (std::list<pending_xacts_list::iterator>::iterator if (std::difftime(begin, moment) < 0 &&
i = to_clear.begin(); (! (*i).first.end || std::difftime(begin, (*i).first.end) < 0)) {
i != to_clear.end(); transaction_t& xact = *(*i).second;
i++)
pending_xacts.erase(*i); DEBUG_PRINT("ledger.walk.budget", "Reporting budget for "
} << xact.account->fullname());
DEBUG_PRINT_TIME("ledger.walk.budget", begin);
DEBUG_PRINT_TIME("ledger.walk.budget", moment);
entry_temps.push_back(entry_t());
entry_t& entry = entry_temps.back();
entry.payee = "Budget entry";
entry.date = begin;
xact_temps.push_back(xact);
transaction_t& temp = xact_temps.back();
temp.entry = &entry;
temp.flags |= TRANSACTION_AUTO;
temp.amount.negate();
temp.flags |= TRANSACTION_BULK_ALLOC;
entry.add_transaction(&temp);
begin = (*i).first.increment(begin);
item_handler<transaction_t>::operator()(temp);
reported = true;
}
}
} while (reported);
} }
void budget_transactions::operator()(transaction_t& xact) void budget_transactions::operator()(transaction_t& xact)
@ -601,8 +594,10 @@ void budget_transactions::operator()(transaction_t& xact)
for (account_t * acct = xact.account; acct; acct = acct->parent) { for (account_t * acct = xact.account; acct; acct = acct->parent) {
if (acct == (*i).second->account) { if (acct == (*i).second->account) {
xact_in_budget = true; xact_in_budget = true;
// Report the transaction as if it had occurred in the parent // Report the transaction as if it had occurred in the parent
// account. // account. jww (2005-07-13): Note that this assignment will
// irrevocably change the underlying transaction.
if (xact.account != acct) if (xact.account != acct)
xact.account = acct; xact.account = acct;
goto handle; goto handle;