IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[trep-engine] new option "Date Filter" to specify dates to filter by

Browse Source
This commit is contained in:
Christopher Lam 2021-11-05 23:26:22 +08:00
parent 16f5be80f9
commit 9bbbeab271
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnucash/report/trep-engine.scm
View File

@ -94,6 +94,7 @@
;;General
(define optname-startdate (N_ "Start Date"))
(define optname-enddate (N_ "End Date"))
(define optname-date-source (N_ "Date Filter"))
(define optname-table-export (N_ "Table for Exporting"))
(define optname-infobox-display (N_ "Add options summary"))
@ -511,6 +512,15 @@ in the Options panel."))
(gnc:options-add-date-interval!
options gnc:pagename-general optname-startdate optname-enddate "a")
(gnc:register-trep-option
(gnc:make-multichoice-option
gnc:pagename-general optname-date-source
"a5" (G_ "Specify date to filter by...")
'posted
(list (vector 'posted (G_ "Date Posted"))
(vector 'reconciled (G_ "Reconciled Date"))
(vector 'entered (G_ "Date Entered")))))
(gnc:register-trep-option
(gnc:make-complex-boolean-option
pagename-currency optname-common-currency
@ -1933,7 +1943,8 @@ be excluded from periodic reporting.")
;; #:empty-report-message - a str or html-object displayed at the initial run
;; #:custom-split-filter - a split->bool function to add to the split filter
;; #:split->date - a split->time64 which overrides the default posted date filter
;; (see reconcile report)
;; if a derived report specifies this, the Date Filter option
;; becomes unused and should be hidden via gnc:option-make-internal!
;; #:split->date-include-false? - addendum to above, specifies filter behaviour if
;; split->date returns #f. useful to include unreconciled splits in reconcile
;; report. it can be useful for alternative date filtering, e.g. filter by
@ -1990,6 +2001,9 @@ warning will be removed in GnuCash 5.0"))
(enddate (gnc:time64-end-day-time
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general optname-enddate))))
(date-source (if split->date
'custom
(opt-val gnc:pagename-general optname-date-source)))
(transaction-matcher (opt-val pagename-filter optname-transaction-matcher))
(transaction-filter-case-insensitive?
(opt-val pagename-filter optname-transaction-matcher-caseinsensitive))
@ -2132,7 +2146,7 @@ warning will be removed in GnuCash 5.0"))
(qof-query-set-book query (gnc-get-current-book))
(xaccQueryAddAccountMatch query c_account_1 QOF-GUID-MATCH-ANY QOF-QUERY-AND)
(xaccQueryAddClearedMatch query cleared-filter QOF-QUERY-AND)
(unless split->date
(when (eq? date-source 'posted)
(xaccQueryAddDateMatchTT query #t begindate #t enddate QOF-QUERY-AND))
(when (boolean? closing-match)
(xaccQueryAddClosingTransMatch query closing-match QOF-QUERY-AND))
@ -2161,11 +2175,19 @@ warning will be removed in GnuCash 5.0"))
(filter
(lambda (split)
(let* ((trans (xaccSplitGetParent split)))
(and (or (not split->date)
(let ((date (split->date split)))
(and (case date-source
((posted) #t)
((reconciled)
(if (char=? (xaccSplitGetReconcile split) #\y)
(<= begindate (xaccSplitGetDateReconciled split) enddate)
#t))
((entered) (<= begindate (xaccTransRetDateEntered trans) enddate))
((custom)
(let ((date (split->date split)))
(if date
(<= begindate date enddate)
split->date-include-false?)))
(else (gnc:warn "invalid date-source" date-source) #t))
(case filter-mode
((none) #t)
((include) (is-filter-member split c_account_2))