Merge pull request #4198 from whalley/master

fix(#3998): refinements

src/reports/categexp.cpp

@@ -202,13 +202,16 @@ wxString mmReportCategoryExpenses::getHTMLText()
 
                     hb.startTableRow("xtoggle");
                     {
+                        Model_Subcategory::Data *sc = Model_Subcategory::instance().get(entry.subCatID);
+                        wxString displayName = (sc) ? sc->SUBCATEGNAME : entry.name;
                         hb.addTableCellLink(wxString::Format("viewtrans:%d:%d", entry.catID, entry.subCatID)
-                            , wxString::Format("   &nbsp%s",entry.name));
+                            , wxString::Format("   &nbsp%s", displayName));
                         hb.addMoneyCell(entry.amount);
                         hb.addEmptyTableCell();
                     }
                     hb.endTableRow();
 
+                    // This is the last subcategory for the category
                     if (group_counter[entry.categs] == group)
                     {
                         group = 0;

src/reports/htmlbuilder.cpp

@@ -47,6 +47,7 @@ namespace tags
     function collapseAllToggles() {
         $(".xtoggle").hide();
     }
+    collapseAllToggles();
     var elements = document.getElementsByClassName('money');
     for (var i = 0; i < elements.length; i++) {
         elements[i].style.textAlign = 'right';