From 23b0cad6ef0f47a1cf68cf96c67013fb77c1b269 Mon Sep 17 00:00:00 2001
From: Stephen Morgan <morgan.stephen99@gmail.com>
Date: Fri, 6 Aug 2021 16:30:23 +1000
Subject: [PATCH] fix: areg: Make sure aregister sorts first by transaction
 register date, then by parse order to break any ties. (#1642)

---
 .../Reports/AccountTransactionsReport.hs      |  4 +-
 hledger/test/aregister.test                   | 41 ++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs b/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs
index eb6b5184c..eb26c9be1 100644
--- a/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs
+++ b/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs
@@ -152,9 +152,9 @@ accountTransactionsReport rspec@ReportSpec{_rsReportOpts=ropts} j thisacctq = it
 
     items =
         accountTransactionsReportItems reportq thisacctq startbal maNegate
-      -- sort by the transaction's register date, for accurate starting balance
+      -- sort by the transaction's register date, then index, for accurate starting balance
       . ptraceAtWith 5 (("ts4:\n"++).pshowTransactions.map snd)
-      . sortBy (comparing $ Down . fst)
+      . sortBy (comparing (Down . fst) <> comparing (Down . tindex . snd))
       . map (\t -> (transactionRegisterDate reportq thisacctq t, t))
       $ jtxns acctJournal
 
diff --git a/hledger/test/aregister.test b/hledger/test/aregister.test
index a29c1e963..7e436478f 100644
--- a/hledger/test/aregister.test
+++ b/hledger/test/aregister.test
@@ -42,15 +42,36 @@ $ hledger -f- areg a aaa
 Transactions in a and subaccounts:
 2021-01-03                      a:aa:aaa                       100           100
 
-# 5. Same-day transactions are displayed in parse order, as usual. (#1642)
-# <
-# 2021-01-01 first
-#     (a)           1
+# 5. Sorts transactions first by transaction date (earliest date of the
+# matching postings) then by parse order. (#1642)
+# Also, make sure to use the posting date of matching transactions, if it
+# differs from the transaction date.
+<
+2021-01-03 fifth
+    (a)           5
 
-# 2021-01-01 second
-#     (a)           2
+2021-01-02 third
+    (a)           3
 
-# $ hledger -f- areg a -w80
-# Transactions in a and subaccounts:
-# 2021-07-31 first                a                                1             1
-# 2021-07-31 second               a                                2             3
+2021-01-02 fourth
+    (a)           4
+
+2021-01-01 first
+    (a)           1
+
+2021-01-03 second, because of posting date
+    (a)           2  ; date:2021-01-01
+
+2021-01-04 sixth, because posting date is not matching
+    (a)           6
+    (b)           0  ; date:2021-01-01
+
+
+$ hledger -f- areg a -w80
+Transactions in a and subaccounts:
+2021-01-01 first                a                                1             1
+2021-01-01 second, because o..  a                                2             3
+2021-01-02 third                a                                3             6
+2021-01-02 fourth               a                                4            10
+2021-01-03 fifth                a                                5            15
+2021-01-04 sixth, because po..  b                                6            21