mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
TR: remove unnecessary no-account-after-filtering step
This merges the initial 'no-account' warning and the 'no-account-after-filtering' warning. This reduces the number of strings required. The user can select some accounts, set an account name filter which produces no accounts, and will see a blank report with the gnc:render-options-changed confirming that options were set, and the blank filter is caused by the filter. Example: http://i.imgur.com/eqq1Bpa.png
This commit is contained in:
parent
3749ca528b
commit
6004b55d16
@ -108,10 +108,6 @@
|
||||
(define NO-MATCHING-TRANS-TEXT (_ "No transactions were found that \
|
||||
match the time interval and account selection specified \
|
||||
in the Options panel."))
|
||||
(define NO-MATCHING-ACCT-HEADER (_ "No matching accounts found"))
|
||||
(define NO-MATCHING-ACCT-TEXT (_ "No account were found that match the \
|
||||
options specified in the Options panels."))
|
||||
|
||||
|
||||
(define DATE-SORTING-TYPES (list 'date 'reconciled-date))
|
||||
|
||||
@ -1711,25 +1707,17 @@ tags within description, notes or memo. ")
|
||||
|
||||
(if (or (null? c_account_1) (and-map not c_account_1))
|
||||
|
||||
(if (null? c_account_0)
|
||||
;; error condition: no accounts specified or obtained after filtering
|
||||
(begin
|
||||
|
||||
;; error condition: no accounts specified
|
||||
(gnc:html-document-add-object!
|
||||
document
|
||||
(gnc:html-make-no-account-warning report-title (gnc:report-id report-obj)))
|
||||
|
||||
;; error condition: accounts were specified but none matched string/regex
|
||||
(begin
|
||||
(gnc:html-document-add-object!
|
||||
document
|
||||
(gnc:make-html-text
|
||||
(gnc:html-markup-h2 NO-MATCHING-ACCT-HEADER)
|
||||
(gnc:html-markup-p NO-MATCHING-ACCT-TEXT)))
|
||||
|
||||
(if (member 'no-match infobox-display)
|
||||
(gnc:html-document-add-object!
|
||||
document
|
||||
(gnc:render-options-changed options)))))
|
||||
(gnc:render-options-changed options))))
|
||||
|
||||
(begin
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user