gnucash maint: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Thu Apr 1 21:53:14 EDT 2021
Updated via https://github.com/Gnucash/gnucash/commit/05b7c149 (commit)
via https://github.com/Gnucash/gnucash/commit/22cb1f35 (commit)
via https://github.com/Gnucash/gnucash/commit/67e65d43 (commit)
from https://github.com/Gnucash/gnucash/commit/0d055182 (commit)
commit 05b7c1492c2ccd1b80105ad5cb82b41dabb2ca3e
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Apr 2 09:36:47 2021 +0800
[budget.scm] show correct tooltip for report option
Budget Report option 'Show notes' had used incorrect tooltip
diff --git a/gnucash/report/reports/standard/budget.scm b/gnucash/report/reports/standard/budget.scm
index 0d5ff5124..a54d65f09 100644
--- a/gnucash/report/reports/standard/budget.scm
+++ b/gnucash/report/reports/standard/budget.scm
@@ -236,7 +236,7 @@
(add-option
(gnc:make-simple-boolean-option
gnc:pagename-display optname-show-notes
- "s15" opthelp-show-budget #t))
+ "s15" opthelp-show-notes #t))
(add-option
(gnc:make-simple-boolean-option
gnc:pagename-display optname-show-actual
commit 22cb1f3567594971bae0f1c00cf1964d892661d3
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Apr 2 09:36:36 2021 +0800
Remove unused indentifiers
diff --git a/gnucash/report/html-acct-table.scm b/gnucash/report/html-acct-table.scm
index 29d554379..fb99fb7c6 100644
--- a/gnucash/report/html-acct-table.scm
+++ b/gnucash/report/html-acct-table.scm
@@ -777,8 +777,6 @@
(display-depth (get-val orig-env 'display-depth))
(depth-limit (get-val orig-env 'display-tree-depth))
(indent (get-val orig-env 'initial-indent))
- (indented-depth (get-val orig-env 'indented-depth))
- (subtotal-mode (get-val orig-env 'parent-account-subtotal-mode))
(label-cols (+ disp-depth-reached 1))
;; these parameters *should* always, by now, be set...
(new-env
@@ -954,7 +952,6 @@
(logical-cols (get-val env 'logical-cols))
(display-depth (get-val env 'display-depth))
(display-tree-depth (get-val env 'display-tree-depth))
- (subtotal-mode (get-val env 'subtotal-mode))
(row-type (get-val env 'row-type))
(rule-mode (and (equal? row-type 'subtotal-row)
(get-val env 'rule-mode)))
diff --git a/gnucash/report/reports/example/average-balance.scm b/gnucash/report/reports/example/average-balance.scm
index 042a7d36c..49044e3c9 100644
--- a/gnucash/report/reports/example/average-balance.scm
+++ b/gnucash/report/reports/example/average-balance.scm
@@ -401,8 +401,7 @@
(let ((barchart (gnc:make-html-chart))
(height (get-option gnc:pagename-display optname-plot-height))
(width (get-option gnc:pagename-display optname-plot-width))
- (col-labels '())
- (col-colors '()))
+ (col-labels '()))
(if (memq 'AvgBalPlot plot-type)
(let
((number-data
@@ -455,7 +454,6 @@
barchart (gnc-commodity-get-nice-symbol report-currency))
(gnc:html-chart-set-data-labels! barchart col-labels)
- ;; (gnc:html-barchart-set-col-colors! barchart col-colors)
(gnc:html-chart-set-data-labels! barchart (map car data))
;; (gnc:html-chart-set-row-labels-rotated?! barchart #t)
(gnc:html-chart-set-width! barchart width)
diff --git a/gnucash/report/reports/example/daily-reports.scm b/gnucash/report/reports/example/daily-reports.scm
index e8cd581e3..3e524dec4 100644
--- a/gnucash/report/reports/example/daily-reports.scm
+++ b/gnucash/report/reports/example/daily-reports.scm
@@ -58,12 +58,9 @@
(define optname-levels (N_ "Show Accounts until level"))
(define optname-subacct (N_ "Include Sub-Accounts"))
-(define optname-fullname (N_ "Show long account names"))
(define optname-show-total (N_ "Show Totals"))
-(define optname-slices (N_ "Maximum Slices"))
(define optname-plot-width (N_ "Plot Width"))
(define optname-plot-height (N_ "Plot Height"))
-(define optname-sort-method (N_ "Sort Method"))
;; The option-generator. The only dependence on the type of piechart
;; is the list of account types that the account selection option
@@ -106,11 +103,6 @@
accounts)))
#t))
- (gnc:options-add-account-levels!
- options gnc:pagename-accounts optname-levels "b"
- (N_ "Show accounts to this depth and not further.")
- 2)
-
(add-option
(gnc:make-simple-boolean-option
gnc:pagename-display optname-show-total
@@ -150,7 +142,6 @@
optname-from-date))))
(accounts (get-option gnc:pagename-accounts optname-accounts))
(dosubs? (get-option gnc:pagename-accounts optname-subacct))
- (account-levels (get-option gnc:pagename-accounts optname-levels))
(report-currency (get-option gnc:pagename-general
optname-report-currency))
(price-source (get-option gnc:pagename-general
@@ -163,15 +154,8 @@
(width (get-option gnc:pagename-display optname-plot-width))
(commodity-list #f)
(exchange-fn #f)
- (print-info (gnc-commodity-print-info report-currency #t))
- (beforebegindate (gnc:time64-end-day-time
- (gnc:time64-previous-day from-date)))
(document (gnc:make-html-document))
- (chart (gnc:make-html-chart))
- (topl-accounts (gnc:filter-accountlist-type
- account-types
- (gnc-account-get-children-sorted
- (gnc-get-current-root-account)))))
+ (chart (gnc:make-html-chart)))
(define (monetary->amount foreign-monetary date)
(gnc:gnc-monetary-amount
diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index fa4f4b1c6..5b61316ab 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -179,7 +179,6 @@ also show overall period profit & loss."))
;; options generator
(define (multicol-report-options-generator report-type)
(let* ((options (gnc:new-options))
- (book (gnc-get-current-book))
(add-option
(lambda (new-option)
(gnc:register-option options new-option))))
@@ -1193,8 +1192,6 @@ also show overall period profit & loss."))
(let ((datepair (col-idx->datepair col-idx))
(show-orig? (and common-currency #t))
(curr (or common-currency book-main-currency))
- (delta (or (not (eq? incr 'disabled)) 'MonthDelta))
- (price (or price-source 'pricedb-nearest))
(accts (if (pair? account) account (list account))))
(gnc:make-report-anchor
trep-uuid report-obj
diff --git a/gnucash/report/reports/standard/budget.scm b/gnucash/report/reports/standard/budget.scm
index 9da3133ad..0d5ff5124 100644
--- a/gnucash/report/reports/standard/budget.scm
+++ b/gnucash/report/reports/standard/budget.scm
@@ -46,7 +46,6 @@
(define optname-show-subaccounts (N_ "Always show sub-accounts"))
(define optname-accounts (N_ "Account"))
-(define optname-select-columns (N_ "Select Columns"))
(define optname-show-budget (N_ "Show Budget"))
(define opthelp-show-budget (N_ "Display a column for the budget values."))
(define optname-show-notes (N_ "Show Budget Notes"))
diff --git a/gnucash/report/reports/standard/cashflow-barchart.scm b/gnucash/report/reports/standard/cashflow-barchart.scm
index ad9d12b53..8addbacfd 100644
--- a/gnucash/report/reports/standard/cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/cashflow-barchart.scm
@@ -152,7 +152,6 @@
optname-accounts))
(include-trading-accounts (get-option gnc:pagename-accounts
optname-include-trading-accounts))
- (row-num 0)
(work-done 0)
(work-to-do 0)
(report-currency (get-option gnc:pagename-general
@@ -188,16 +187,11 @@
gnc:optname-reportname))
(doc (gnc:make-html-document))
- (table (gnc:make-html-table))
- (txt (gnc:make-html-text))
(chart (gnc:make-html-chart))
(non-zeros #f))
(if (not (null? accounts))
- (let* ((money-diff-collector (gnc:make-commodity-collector))
- (account-disp-list '())
- (time-exchange-fn #f)
- (commodity-list (gnc:accounts-get-commodities
+ (let* ((commodity-list (gnc:accounts-get-commodities
accounts
report-currency))
;; Get an exchange function that will convert each transaction using the
@@ -209,7 +203,6 @@
(date-string-list (map (lambda (date-list-item) ; date-list-item is (start . end)
(qof-print-date (car date-list-item)))
dates-list))
- (results-by-date '())
(in-list '())
(out-list '())
(net-list '())
diff --git a/gnucash/report/reports/standard/equity-statement.scm b/gnucash/report/reports/standard/equity-statement.scm
index 4b47cb179..5c0d60994 100644
--- a/gnucash/report/reports/standard/equity-statement.scm
+++ b/gnucash/report/reports/standard/equity-statement.scm
@@ -239,8 +239,6 @@
optname-report-commodity))
(price-source (get-option pagename-commodities
optname-price-source))
- (show-fcur? (get-option pagename-commodities
- optname-show-foreign))
(show-rates? (get-option pagename-commodities
optname-show-rates))
(use-rules? (get-option gnc:pagename-display
diff --git a/gnucash/report/reports/standard/new-aging.scm b/gnucash/report/reports/standard/new-aging.scm
index f767cf86f..2153eb6b2 100644
--- a/gnucash/report/reports/standard/new-aging.scm
+++ b/gnucash/report/reports/standard/new-aging.scm
@@ -39,8 +39,6 @@
(define optname-to-date (N_ "To"))
(define optname-sort-by (N_ "Sort By"))
(define optname-sort-order (N_ "Sort Order"))
-(define optname-report-currency (N_ "Report's currency"))
-(define optname-price-source (N_ "Price Source"))
(define optname-show-zeros (N_ "Show zero balance items"))
(define optname-date-driver (N_ "Due or Post Date"))
commit 67e65d436cd00903a5564ddc71c1fe3704bf3c9e
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Apr 2 09:35:23 2021 +0800
Remove duplicate definitions
diff --git a/gnucash/report/html-document.scm b/gnucash/report/html-document.scm
index fa34e0c5f..b18b7e833 100644
--- a/gnucash/report/html-document.scm
+++ b/gnucash/report/html-document.scm
@@ -110,7 +110,6 @@
(define gnc:html-document-set-headline! html-document-set-headline)
(define gnc:html-document-headline html-document-headline)
(define gnc:html-document-set-style-sheet! html-document-set-style-sheet)
-(define gnc:html-document-set-style-sheet! html-document-set-style-sheet)
(define gnc:html-document-style-sheet html-document-style-sheet)
(define gnc:html-document-set-style-stack! html-document-set-style-stack)
(define gnc:html-document-style-stack html-document-style-stack)
diff --git a/libgnucash/app-utils/business-options.scm b/libgnucash/app-utils/business-options.scm
index 3bdb7a403..96a4e4087 100644
--- a/libgnucash/app-utils/business-options.scm
+++ b/libgnucash/app-utils/business-options.scm
@@ -93,14 +93,6 @@
;; Access fancy date info from key-value pairs for current book
(gnc:option-get-value book gnc:*business-label* (list gnc:*fancy-date-label* key)))
-
-
-(define (gnc:options-fancy-date book)
- (let ((date-format (gnc:fancy-date-info book gnc:*fancy-date-format*)))
- (if (boolean? date-format) ;; date-format does not exist
- (qof-date-format-get-string (qof-date-format-get))
- date-format)))
-
(define (gnc:make-invoice-option
section
name
Summary of changes:
gnucash/report/html-acct-table.scm | 3 ---
gnucash/report/html-document.scm | 1 -
gnucash/report/reports/example/average-balance.scm | 4 +---
gnucash/report/reports/example/daily-reports.scm | 18 +-----------------
gnucash/report/reports/standard/balsheet-pnl.scm | 3 ---
gnucash/report/reports/standard/budget.scm | 3 +--
gnucash/report/reports/standard/cashflow-barchart.scm | 9 +--------
gnucash/report/reports/standard/equity-statement.scm | 2 --
gnucash/report/reports/standard/new-aging.scm | 2 --
libgnucash/app-utils/business-options.scm | 8 --------
10 files changed, 4 insertions(+), 49 deletions(-)
More information about the gnucash-changes
mailing list