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

Don't sort or subtotal xacts for account reports

Browse source
This commit is contained in:
John Wiegley 2009-02-19 15:47:54 -04:00
parent bef9fdc471
commit 26ddb8343c
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/chain.cc
View file

@ -80,16 +80,16 @@ xact_handler_ptr chain_xact_handlers(report_t& report,
handler.reset(new filter_xacts(handler, only_predicate, report)); handler.reset(new filter_xacts(handler, only_predicate, report));
} }
// sort_xacts will sort all the xacts it sees, based on the `sort_order'
// value expression.
if (report.HANDLED(sort_)) {
if (report.HANDLED(sort_entries_))
handler.reset(new sort_entries(handler, report.HANDLER(sort_).str()));
else
handler.reset(new sort_xacts(handler, report.HANDLER(sort_).str()));
}
if (! only_preliminaries) { if (! only_preliminaries) {
// sort_xacts will sort all the xacts it sees, based on the `sort_order'
// value expression.
if (report.HANDLED(sort_)) {
if (report.HANDLED(sort_entries_))
handler.reset(new sort_entries(handler, report.HANDLER(sort_).str()));
else
handler.reset(new sort_xacts(handler, report.HANDLER(sort_).str()));
}
// changed_value_xacts adds virtual xacts to the list to account for // changed_value_xacts adds virtual xacts to the list to account for
// changes in market value of commodities, which otherwise would affect // changes in market value of commodities, which otherwise would affect
// the running total unpredictably. // the running total unpredictably.
@ -104,18 +104,18 @@ xact_handler_ptr chain_xact_handlers(report_t& report,
handler.reset(new collapse_xacts(handler, expr, handler.reset(new collapse_xacts(handler, expr,
display_predicate, only_predicate, display_predicate, only_predicate,
report.HANDLED(collapse_if_zero))); report.HANDLED(collapse_if_zero)));
}
// subtotal_xacts combines all the xacts it receives into one subtotal // subtotal_xacts combines all the xacts it receives into one subtotal
// entry, which has one xact for each commodity in each account. // entry, which has one xact for each commodity in each account.
// //
// period_xacts is like subtotal_xacts, but it subtotals according to time // period_xacts is like subtotal_xacts, but it subtotals according to time
// periods rather than totalling everything. // periods rather than totalling everything.
// //
// dow_xacts is like period_xacts, except that it reports all the xacts // dow_xacts is like period_xacts, except that it reports all the xacts
// that fall on each subsequent day of the week. // that fall on each subsequent day of the week.
if (report.HANDLED(subtotal)) if (report.HANDLED(subtotal))
handler.reset(new subtotal_xacts(handler, expr)); handler.reset(new subtotal_xacts(handler, expr));
}
if (report.HANDLED(dow)) if (report.HANDLED(dow))
handler.reset(new dow_xacts(handler, expr)); handler.reset(new dow_xacts(handler, expr));