gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ae76a294 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/efe88f13 (commit)
	from  https://github.com/Gnucash/gnucash/commit/2d4f771b (commit)



commit ae76a294531de1b310cadf46c8bafb8bc81126ba
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue May 21 15:35:42 2019 +0800

    [aging] bugfix avoid report-crash when no APAR account exists
    
    need additional sanity checks.
    
    in a book with no suitable AP/AR account, from 'Customers Overview'
    spreadsheet, clicking 'Customer Listing' may call aging.scm renderer
    with account = #f leading to report crash.

diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm
index 4c2dc4528..55844b2a0 100644
--- a/gnucash/report/business-reports/aging.scm
+++ b/gnucash/report/business-reports/aging.scm
@@ -716,7 +716,7 @@ copying this report to a spreadsheet for use in a mail merge.")
     ;; set default title
     (gnc:html-document-set-title! document report-title)
     ;; maybe redefine better...
-    (if (not (null? account))
+    (if (and account (not (null? account)))
         (begin
           (gnc:html-document-set-title!
            document (string-append report-title ": " (xaccAccountGetName account)))
@@ -731,7 +731,7 @@ copying this report to a spreadsheet for use in a mail merge.")
 
     (gnc:html-table-set-col-headers! table heading-list)
 				     
-    (if (not (null? account))
+    (if (and account (not (null? account)))
 	(begin
 	  (setup-query query account report-date)
 	  ;; get the appropriate splits

commit efe88f13a83f27c896079cbc5d3709ffa721040e
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon May 20 11:35:31 2019 +0800

    [balsheet-pnl] link pnl->transaction-report inherits common-currency

diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/standard-reports/balsheet-pnl.scm
index 44795c88d..fd3de167d 100644
--- a/gnucash/report/standard-reports/balsheet-pnl.scm
+++ b/gnucash/report/standard-reports/balsheet-pnl.scm
@@ -1117,6 +1117,7 @@ also show overall period profit & loss."))
                           (cdr monetarypair)
                           (car monetarypair)
                           (closing-adjustment account col-idx)))))))
+
              (get-cell-anchor-fn (lambda (account col-idx)
                                    (define datepair (col-idx->datepair col-idx))
                                    (gnc:make-report-anchor
@@ -1126,9 +1127,16 @@ also show overall period profit & loss."))
                                            (cons 'absolute (car datepair)))
                                      (list "General" "End Date"
                                            (cons 'absolute (cdr datepair)))
+                                     (list "General" "Show original currency amount"
+                                           (and common-currency #t))
+                                     (list "General" "Common Currency"
+                                           common-currency)
+                                     (list "General" "Report's currency"
+                                           (or common-currency book-main-currency))
                                      (list "Display" "Amount" 'double)
                                      (list "Accounts" "Accounts"
                                            (list account))))))
+
              (chart (and include-chart?
                          (gnc:make-report-anchor
                           pnl-barchart-uuid report-obj



Summary of changes:
 gnucash/report/business-reports/aging.scm        | 4 ++--
 gnucash/report/standard-reports/balsheet-pnl.scm | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)