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

Report collapsed xacts using earliest date

Browse source
This commit is contained in:
John Wiegley 2009-02-16 01:14:23 -04:00
parent f8681e482e
commit be208ef260
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/filters.cc
View file

@ -293,21 +293,29 @@ void collapse_xacts::report_subtotal()
else if (only_collapse_if_zero && ! subtotal.is_zero()) { else if (only_collapse_if_zero && ! subtotal.is_zero()) {
foreach (xact_t * xact, component_xacts) foreach (xact_t * xact, component_xacts)
item_handler<xact_t>::operator()(*xact); item_handler<xact_t>::operator()(*xact);
component_xacts.clear();
} }
else { else {
if (only_collapse_if_zero) date_t earliest_date;
component_xacts.clear();
foreach (xact_t * xact, component_xacts) {
date_t reported = xact->reported_date();
if (! is_valid(earliest_date) ||
reported < earliest_date)
earliest_date = reported;
}
entry_temps.push_back(entry_t()); entry_temps.push_back(entry_t());
entry_t& entry = entry_temps.back(); entry_t& entry = entry_temps.back();
entry.payee = last_entry->payee; entry.payee = last_entry->payee;
entry._date = last_entry->_date; entry._date = (is_valid(earliest_date) ?
earliest_date : last_entry->_date);
DEBUG("filters.collapse", "Pseudo-entry date = " << *entry._date);
handle_value(subtotal, &totals_account, last_entry, 0, xact_temps, handle_value(subtotal, &totals_account, &entry, 0, xact_temps, *handler);
*handler);
} }
component_xacts.clear();
last_entry = NULL; last_entry = NULL;
last_xact = NULL; last_xact = NULL;
subtotal = 0L; subtotal = 0L;
@ -325,8 +333,7 @@ void collapse_xacts::operator()(xact_t& xact)
xact.add_to_value(subtotal, amount_expr); xact.add_to_value(subtotal, amount_expr);
count++; count++;
if (only_collapse_if_zero) component_xacts.push_back(&xact);
component_xacts.push_back(&xact);
last_entry = xact.entry; last_entry = xact.entry;
last_xact = &xact; last_xact = &xact;