From d9808804d5e9d4f78a1e119510797865693fd7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Wed, 30 May 2007 15:56:27 +0000 Subject: [PATCH] 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 --- src/report/locale-specific/us/taxtxf.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm index f229ba1036..808820b1c0 100644 --- a/src/report/locale-specific/us/taxtxf.scm +++ b/src/report/locale-specific/us/taxtxf.scm @@ -473,7 +473,8 @@ '(last-year 1st-last 2nd-last 3rd-last 4th-last)) (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) tax-qtr-real-qtr-year) (case alt-period @@ -512,7 +513,8 @@ '(last-year 1st-last 2nd-last 3rd-last 4th-last)) (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) (case alt-period ((1st-est 1st-last) ; Mar 31