[Gnucash-changes] r14454 - gnucash/trunk - Restore the original sort ordering which is grouping by parent

[David Hampton]

Author: hampton
Date: 2006-06-27 23:46:25 -0400 (Tue, 27 Jun 2006)
New Revision: 14454
Trac: http://svn.gnucash.org/trac/changeset/14454

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm
   gnucash/trunk/src/report/standard-reports/portfolio.scm
Log:
Restore the original sort ordering which is grouping by parent
account, and then sorting within a group first by account code and
then by account name.  Partial fix for #345385.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-06-28 00:02:30 UTC (rev 14453)
+++ gnucash/trunk/ChangeLog	2006-06-28 03:46:25 UTC (rev 14454)
@@ -1,5 +1,12 @@
 2006-06-27  David Hampton  <hampton at employees.org>
 
+	* src/report/standard-reports/portfolio.scm:
+
+	* src/report/standard-reports/advanced-portfolio.scm: Restore the
+	original sort ordering which is grouping by parent account, and
+	then sorting within a group first by account code and then by
+	account name.  Partial fix for #345385.
+
 	* src/quotes/gnc-fq-update.in:
 	* src/quotes/gnc-fq-check.in:
 	* src/quotes/gnc-fq-helper.in:

Modified: gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm	2006-06-28 00:02:30 UTC (rev 14453)
+++ gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm	2006-06-28 03:46:25 UTC (rev 14454)
@@ -645,11 +645,6 @@
            table
 	   headercols)
           
-	  (set! accounts (sort accounts
-			       (lambda (a b)
-				 (string<? (gnc:account-get-name a)
-					   (gnc:account-get-name b)))))
-
           (table-add-stock-rows
            table accounts to-date currency price-fn exchange-fn
            include-empty include-gains show-symbol show-listing show-shares show-price 

Modified: gnucash/trunk/src/report/standard-reports/portfolio.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/portfolio.scm	2006-06-28 00:02:30 UTC (rev 14453)
+++ gnucash/trunk/src/report/standard-reports/portfolio.scm	2006-06-28 03:46:25 UTC (rev 14454)
@@ -231,11 +231,6 @@
                  (_ "Price")
                  (_ "Value")))
           
-	  (set! accounts (sort accounts
-			       (lambda (a b)
-				 (string<? (gnc:account-get-name a)
-					   (gnc:account-get-name b)))))
-
           (table-add-stock-rows
            table accounts to-date currency 
            exchange-fn price-fn include-empty collector)