From 82f7170740a6900f3df6f4ec6c737870b3e6ce1a Mon Sep 17 00:00:00 2001
From: David Hampton <hampton@employees.org>
Date: Wed, 28 Jun 2006 03:46:25 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14454 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                                          | 7 +++++++
 src/report/standard-reports/advanced-portfolio.scm | 5 -----
 src/report/standard-reports/portfolio.scm          | 5 -----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e20e460c8..c642934092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-06-27  David Hampton  <hampton@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:
diff --git a/src/report/standard-reports/advanced-portfolio.scm b/src/report/standard-reports/advanced-portfolio.scm
index 72302ca78a..e37392abb5 100644
--- a/src/report/standard-reports/advanced-portfolio.scm
+++ b/src/report/standard-reports/advanced-portfolio.scm
@@ -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 
diff --git a/src/report/standard-reports/portfolio.scm b/src/report/standard-reports/portfolio.scm
index 78cb500ec2..88fca7b689 100644
--- a/src/report/standard-reports/portfolio.scm
+++ b/src/report/standard-reports/portfolio.scm
@@ -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)