mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
In tax report, do not set to start and end of month if from-to mode is selected, #435329.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16136 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
949e3d5779
commit
d9808804d5
@ -473,7 +473,8 @@
|
|||||||
'(last-year 1st-last 2nd-last
|
'(last-year 1st-last 2nd-last
|
||||||
3rd-last 4th-last))
|
3rd-last 4th-last))
|
||||||
(set-tm:year bdtm (- (tm:year bdtm) 1)))
|
(set-tm:year bdtm (- (tm:year bdtm) 1)))
|
||||||
(set-tm:mday bdtm 1)
|
(or (eq? alt-period 'from-to)
|
||||||
|
(set-tm:mday bdtm 1))
|
||||||
(if (< (gnc:date-get-year bdtm)
|
(if (< (gnc:date-get-year bdtm)
|
||||||
tax-qtr-real-qtr-year)
|
tax-qtr-real-qtr-year)
|
||||||
(case alt-period
|
(case alt-period
|
||||||
@ -512,7 +513,8 @@
|
|||||||
'(last-year 1st-last 2nd-last
|
'(last-year 1st-last 2nd-last
|
||||||
3rd-last 4th-last))
|
3rd-last 4th-last))
|
||||||
(set-tm:year bdtm (+ (tm:year bdtm) 1)))
|
(set-tm:year bdtm (+ (tm:year bdtm) 1)))
|
||||||
(set-tm:mday bdtm 31)
|
(or (eq? alt-period 'from-to)
|
||||||
|
(set-tm:mday bdtm 31))
|
||||||
(if (< (gnc:date-get-year bdtm) tax-qtr-real-qtr-year)
|
(if (< (gnc:date-get-year bdtm) tax-qtr-real-qtr-year)
|
||||||
(case alt-period
|
(case alt-period
|
||||||
((1st-est 1st-last) ; Mar 31
|
((1st-est 1st-last) ; Mar 31
|
||||||
|
Loading…
Reference in New Issue
Block a user