gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/47308f6b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a0577cd0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/933ae74b (commit)
	from  https://github.com/Gnucash/gnucash/commit/6ffb77de (commit)



commit 47308f6bfd1fd243257ffa785c4920362ef53453
Merge: 6ffb77d a0577cd
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 18 12:24:39 2018 -0800

    Merge branch Chris Lam's 'unstable-TR-fix' of into unstable.


commit a0577cd0e7524fb77fcf605a8c5c6975a4870085
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Jan 7 22:30:24 2018 +1100

    BUGFIX: enable informal headers for dual-column only

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 71226a7..702f75a 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -1204,6 +1204,7 @@ tags within description, notes or memo. ")
         (for-each (lambda (cell) (addto! row-contents cell))
                   (gnc:html-make-empty-cells left-indent))
         (if (and (opt-val pagename-sorting optname-show-informal-headers)
+                 (column-uses? 'amount-double)
                  (member sortkey SORTKEY-INFORMAL-HEADERS))
             (begin
               (if export?

commit 933ae74b415b4e5d2bc691ab031eec1e1fc6eaa6
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Jan 10 23:36:26 2018 +1100

    BUGFIX TR common currency was broken

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 0ee0df3..71226a7 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -1071,7 +1071,7 @@ tags within description, notes or memo. ")
           ((damount (lambda (s) (if (gnc:split-voided? s)
                                     (xaccSplitVoidFormerAmount s)
                                     (xaccSplitGetAmount s))))
-           (trans-date (lambda (s) (gnc-transaction-get-date-posted (xaccSplitGetTransaction s))))
+           (trans-date (lambda (s) (gnc-transaction-get-date-posted (xaccSplitGetParent s))))
            (currency (lambda (s) (xaccAccountGetCommodity (xaccSplitGetAccount s))))
            (report-currency (lambda (s) (if (column-uses? 'common-currency)
                                             (opt-val gnc:pagename-general optname-currency)
@@ -1095,7 +1095,7 @@ tags within description, notes or memo. ")
                        ;; Use midday as the transaction time so it matches a price
                        ;; on the same day.  Otherwise it uses midnight which will
                        ;; likely match a price on the previous day
-                       (timespecCanonicalDayTime trans-date))))
+                       (timespecCanonicalDayTime (trans-date s)))))
            (split-value (lambda (s) (convert s (damount s)))) ; used for correct debit/credit
            (amount (lambda (s) (split-value s)))
            (debit-amount (lambda (s) (and (positive? (gnc:gnc-monetary-amount (split-value s)))



Summary of changes:
 gnucash/report/standard-reports/transaction.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)