1 files changed, 26 insertions, 7 deletions
diff --git a/src/filters.cc b/src/filters.cc
index 0bf89283..6b91aab4 100644
--- a/src/filters.cc
+++ b/src/filters.cc
@@ -449,15 +449,19 @@ void collapse_posts::report_subtotal()
     DEBUG("filters.collapse", "earliest date    = " << earliest_date);
     DEBUG("filters.collapse", "latest date      = " << latest_date);
 
-    handle_value(/* value=      */ subtotal,
-                 /* account=    */ totals_account,
-                 /* xact=       */ &xact,
-                 /* temps=      */ temps,
-                 /* handler=    */ handler,
-                 /* date=       */ latest_date,
-                 /* act_date_p= */ false);
+    foreach (totals_map::value_type& pat, totals) {
+      handle_value(/* value=      */ pat.second,
+                   /* account=    */ &temps.create_account(pat.first),
+                   /* xact=       */ &xact,
+                   /* temps=      */ temps,
+                   /* handler=    */ handler,
+                   /* date=       */ latest_date,
+                   /* act_date_p= */ false);
+    }
+
   }
 
+  totals.clear();
   component_posts.clear();
 
   last_xact = NULL;
@@ -466,6 +470,20 @@ void collapse_posts::report_subtotal()
   count     = 0;
 }
 
+value_t& collapse_posts::find_totals(account_t* account)
+{
+  unsigned short depth=3;
+
+  if (depth == 0)
+    return totals[_("<Total>")];
+
+  if (account->depth == depth)
+    return totals[account->fullname()];
+
+  //else recurse
+  return find_totals(account->parent);
+}
+
 void collapse_posts::operator()(post_t& post)
 {
   // If we've reached a new xact, report on the subtotal
@@ -475,6 +493,7 @@ void collapse_posts::operator()(post_t& post)
     report_subtotal();
 
   post.add_to_value(subtotal, amount_expr);
+  post.add_to_value(find_totals(post.account), amount_expr);
 
   component_posts.push_back(&post);