gnucash master: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/948a9a29 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/24add7b1 (commit)
	from  https://github.com/Gnucash/gnucash/commit/7d02897d (commit)



commit 948a9a293cf189beff5d70f6010dcc3e51483e91
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Jul 1 19:44:11 2020 +0800

    Bug 797835 - Zero Crossing in 4.0 that wasn't in 3.10

diff --git a/gnucash/report/html-chart.scm b/gnucash/report/html-chart.scm
index 5abd87225..0ebf105b4 100644
--- a/gnucash/report/html-chart.scm
+++ b/gnucash/report/html-chart.scm
@@ -189,7 +189,7 @@
                                                                      (cons 'labelString "")))
                                                   (cons 'ticks (list
                                                                 (cons 'fontSize 10)
-                                                                (cons 'beginAtZero #t))))
+                                                                (cons 'beginAtZero #f))))
                                                  ;; the following another yAxis on the right
                                                  '((position . right)
                                                    (ticks . ((display . #f)))

commit 24add7b1f31f7d50c575203b18fd9b0eb6e8d756
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Jun 30 23:09:19 2020 +0800

    [balsheet-pnl] remove monetary-less

diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index 475c4a557..4269ab2aa 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -670,22 +670,6 @@ also show overall period profit & loss."))
                          cols-data)))
   (add-whole-line #f))
 
-(define (monetary-less . monetaries)
-  ;; syntax: (monetary-less mon0 mon1 mon2 ...)
-  ;; equiv:  (- mon0 mon1 mon2 ...)
-  ;; this works only if all monetaries have the same commodity
-  (let ((res (gnc:make-commodity-collector)))
-    (res 'add (gnc:gnc-monetary-commodity (car monetaries))
-         (gnc:gnc-monetary-amount (car monetaries)))
-    (for-each
-     (lambda (mon)
-       (res 'add (gnc:gnc-monetary-commodity mon) (- (gnc:gnc-monetary-amount mon))))
-     (cdr monetaries))
-    (let ((reslist (res 'format gnc:make-gnc-monetary #f)))
-      (if (null? (cdr reslist))
-          (car reslist)
-          (gnc:error "monetary-less: 1 commodity only" monetaries)))))
-
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; multicol-report-renderer
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1178,9 +1162,9 @@ also show overall period profit & loss."))
               (lambda (account col-idx)
                 (let* ((balances (assoc-ref accounts-balances account))
                        (monetarypair (col-idx->monetarypair balances col-idx)))
-                  (monetary-less
+                  (gnc:monetary+
                    (cdr monetarypair)
-                   (car monetarypair)))))
+                   (gnc:monetary-neg (car monetarypair))))))
 
              (get-cell-anchor-fn
               (lambda (account col-idx)



Summary of changes:
 gnucash/report/html-chart.scm                    |  2 +-
 gnucash/report/reports/standard/balsheet-pnl.scm | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)