gnucash maint: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Thu Sep 5 08:59:58 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/9b52fa68 (commit)
via https://github.com/Gnucash/gnucash/commit/b9af094f (commit)
from https://github.com/Gnucash/gnucash/commit/f389a2af (commit)
commit 9b52fa685fabbc00c401d816a1da9685aadd9b4c
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Sep 5 19:31:15 2019 +0800
[html-acct-table] ensure an integer number of empty-cells
tbl-width is not necessarily an even number; tbl-width being odd would
result in a half-fraction when calculating number of
empty-cells. convert to the appropriate integer.
this is the proper fix for the bug fixed by d865b149.
diff --git a/gnucash/report/report-system/html-acct-table.scm b/gnucash/report/report-system/html-acct-table.scm
index cc349c087..025951552 100644
--- a/gnucash/report/report-system/html-acct-table.scm
+++ b/gnucash/report/report-system/html-acct-table.scm
@@ -1084,7 +1084,7 @@
1 1 (gnc:make-html-text (gnc:html-make-nbsps lbl-depth)) label))
)
(gnc:html-make-empty-cells ;; padding after label
- (+ (- amt-depth (/ tbl-width 2))
+ (+ (- amt-depth (floor (/ tbl-width 2)))
(if total-rule? -1 0)
)
)
commit b9af094f8b9c40caf4b472fda430dd87ca13e0c0
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Sep 5 19:28:32 2019 +0800
[reports] fix some uses of assoc-ref
assoc-ref (or better, assq-ref because we're comparing symbols) is
used to lookup from the 'car's of a list of pairs, and return the
found pair's 'cdr'. the previous use of 2-element lists demonstrate a
lack of understanding how to encode the list of pairs. rewrite using
proper pairs rather than 2-element lists, which means the assq-ref
does not need a subsequent 'car' to retrieve the desired symbol.
diff --git a/gnucash/report/report-system/html-acct-table.scm b/gnucash/report/report-system/html-acct-table.scm
index f67129c47..cc349c087 100644
--- a/gnucash/report/report-system/html-acct-table.scm
+++ b/gnucash/report/report-system/html-acct-table.scm
@@ -1210,14 +1210,10 @@
(comm-amt
;; this will be the immediate/recursive commodity
;; balance (a commodity collector) or #f.
- (get-val env
- (car (or (assoc-ref
- '((immediate-bal account-bal)
- (recursive-bal recursive-bal)
- (omit-bal #f))
- bal-method)
- '(#f)
- ))))
+ (get-val env (assq-ref '((immediate-bal . account-bal)
+ (recursive-bal . recursive-bal)
+ (omit-bal . #f))
+ bal-method)))
(zero-mode (let ((mode
(get-val
env 'zero-balance-display-mode)))
diff --git a/gnucash/report/standard-reports/account-summary.scm b/gnucash/report/standard-reports/account-summary.scm
index b45dfea6b..af30dfb5d 100644
--- a/gnucash/report/standard-reports/account-summary.scm
+++ b/gnucash/report/standard-reports/account-summary.scm
@@ -290,10 +290,9 @@
(parent-balance-mode (get-option gnc:pagename-display
optname-parent-balance-mode))
(parent-total-mode
- (car
- (assoc-ref '((t #t) (f #f) (canonically-tabbed canonically-tabbed))
- (get-option gnc:pagename-display
- optname-parent-total-mode))))
+ (assq-ref '((t . #t) (f . #f) (canonically-tabbed . canonically-tabbed))
+ (get-option gnc:pagename-display
+ optname-parent-total-mode)))
(show-zb-accts? (get-option gnc:pagename-display
optname-show-zb-accts))
(omit-zb-bals? (get-option gnc:pagename-display
diff --git a/gnucash/report/standard-reports/balance-sheet.scm b/gnucash/report/standard-reports/balance-sheet.scm
index de1ba8fd9..1fb65ea22 100644
--- a/gnucash/report/standard-reports/balance-sheet.scm
+++ b/gnucash/report/standard-reports/balance-sheet.scm
@@ -322,10 +322,9 @@
(parent-balance-mode (get-option gnc:pagename-display
optname-parent-balance-mode))
(parent-total-mode
- (car
- (assoc-ref '((t #t) (f #f) (canonically-tabbed canonically-tabbed))
- (get-option gnc:pagename-display
- optname-parent-total-mode))))
+ (assq-ref '((t . #t) (f . #f) (canonically-tabbed . canonically-tabbed))
+ (get-option gnc:pagename-display
+ optname-parent-total-mode)))
(show-zb-accts? (get-option gnc:pagename-display
optname-show-zb-accts))
(omit-zb-bals? (get-option gnc:pagename-display
diff --git a/gnucash/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/standard-reports/budget-balance-sheet.scm
index 7adad833c..8b954ddf4 100644
--- a/gnucash/report/standard-reports/budget-balance-sheet.scm
+++ b/gnucash/report/standard-reports/budget-balance-sheet.scm
@@ -330,10 +330,9 @@
(parent-balance-mode (get-option gnc:pagename-display
optname-parent-balance-mode))
(parent-total-mode
- (car
- (assoc-ref '((t #t) (f #f) (canonically-tabbed canonically-tabbed))
- (get-option gnc:pagename-display
- optname-parent-total-mode))))
+ (assq-ref '((t . #t) (f . #f) (canonically-tabbed . canonically-tabbed))
+ (get-option gnc:pagename-display
+ optname-parent-total-mode)))
(show-zb-accts? (get-option gnc:pagename-display
optname-show-zb-accts))
(omit-zb-bals? (get-option gnc:pagename-display
diff --git a/gnucash/report/standard-reports/budget-income-statement.scm b/gnucash/report/standard-reports/budget-income-statement.scm
index c220781ed..ad16d6483 100644
--- a/gnucash/report/standard-reports/budget-income-statement.scm
+++ b/gnucash/report/standard-reports/budget-income-statement.scm
@@ -372,10 +372,9 @@
(parent-balance-mode (get-option gnc:pagename-display
optname-parent-balance-mode))
(parent-total-mode
- (car
- (assoc-ref '((t #t) (f #f) (canonically-tabbed canonically-tabbed))
- (get-option gnc:pagename-display
- optname-parent-total-mode))))
+ (assq-ref '((t . #t) (f . #f) (canonically-tabbed . canonically-tabbed))
+ (get-option gnc:pagename-display
+ optname-parent-total-mode)))
(show-zb-accts? (get-option gnc:pagename-display
optname-show-zb-accts))
(omit-zb-bals? (get-option gnc:pagename-display
diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
index c86bf5aa6..254a5b41a 100644
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/standard-reports/income-statement.scm
@@ -326,10 +326,9 @@
(parent-balance-mode (get-option gnc:pagename-display
optname-parent-balance-mode))
(parent-total-mode
- (car
- (assoc-ref '((t #t) (f #f) (canonically-tabbed canonically-tabbed))
- (get-option gnc:pagename-display
- optname-parent-total-mode))))
+ (assq-ref '((t . #t) (f . #f) (canonically-tabbed . canonically-tabbed))
+ (get-option gnc:pagename-display
+ optname-parent-total-mode)))
(show-zb-accts? (get-option gnc:pagename-display
optname-show-zb-accts))
(omit-zb-bals? (get-option gnc:pagename-display
diff --git a/gnucash/report/standard-reports/sx-summary.scm b/gnucash/report/standard-reports/sx-summary.scm
index 2891ad725..967df6a25 100644
--- a/gnucash/report/standard-reports/sx-summary.scm
+++ b/gnucash/report/standard-reports/sx-summary.scm
@@ -272,10 +272,9 @@
(parent-balance-mode (get-option gnc:pagename-display
optname-parent-balance-mode))
(parent-total-mode
- (car
- (assoc-ref '((t #t) (f #f) (canonically-tabbed canonically-tabbed))
- (get-option gnc:pagename-display
- optname-parent-total-mode))))
+ (assq-ref '((t . #t) (f . #f) (canonically-tabbed . canonically-tabbed))
+ (get-option gnc:pagename-display
+ optname-parent-total-mode)))
(show-zb-accts? (get-option gnc:pagename-display
optname-show-zb-accts))
(omit-zb-bals? (get-option gnc:pagename-display
diff --git a/gnucash/report/standard-reports/trial-balance.scm b/gnucash/report/standard-reports/trial-balance.scm
index 4694f3b1b..464e62601 100644
--- a/gnucash/report/standard-reports/trial-balance.scm
+++ b/gnucash/report/standard-reports/trial-balance.scm
@@ -165,15 +165,14 @@
(if show-comm?
(gnc-commodity-table bal report-commodity exchange-fn)
bal-sum))))
- (car (assoc-ref
- (list
- (list 'entry balance)
- (list 'debit (if neg? #f balance))
- (list 'credit (if neg? balance #f))
- (list 'zero-q (if neg? #f (if balance #f #t)))
- (list 'debit-q (if neg? #f (if balance #t #f)))
- (list 'credit-q (if neg? #t #f)))
- req))))
+ (assq-ref (list
+ (cons 'entry balance)
+ (cons 'debit (if neg? #f balance))
+ (cons 'credit (if neg? balance #f))
+ (cons 'zero-q (if neg? #f (if balance #f #t)))
+ (cons 'debit-q (if neg? #f (if balance #t #f)))
+ (cons 'credit-q (if neg? #t #f)))
+ req)))
;; options generator
(define (trial-balance-options-generator)
Summary of changes:
gnucash/report/report-system/html-acct-table.scm | 14 +++++---------
gnucash/report/standard-reports/account-summary.scm | 7 +++----
gnucash/report/standard-reports/balance-sheet.scm | 7 +++----
.../report/standard-reports/budget-balance-sheet.scm | 7 +++----
.../report/standard-reports/budget-income-statement.scm | 7 +++----
gnucash/report/standard-reports/income-statement.scm | 7 +++----
gnucash/report/standard-reports/sx-summary.scm | 7 +++----
gnucash/report/standard-reports/trial-balance.scm | 17 ++++++++---------
8 files changed, 31 insertions(+), 42 deletions(-)
More information about the gnucash-changes
mailing list