r16136 - gnucash/trunk/src/report/locale-specific/us - In tax report, do not set to start and end of month if from-to mode is selected, #435329.

Andreas Köhler andi5 at cvs.gnucash.org
Wed May 30 11:56:28 EDT 2007


Author: andi5
Date: 2007-05-30 11:56:27 -0400 (Wed, 30 May 2007)
New Revision: 16136
Trac: http://svn.gnucash.org/trac/changeset/16136

Modified:
   gnucash/trunk/src/report/locale-specific/us/taxtxf.scm
Log:
In tax report, do not set to start and end of month if from-to mode is selected, #435329.


Modified: gnucash/trunk/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/taxtxf.scm	2007-05-29 16:24:38 UTC (rev 16135)
+++ gnucash/trunk/src/report/locale-specific/us/taxtxf.scm	2007-05-30 15:56:27 UTC (rev 16136)
@@ -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



More information about the gnucash-changes mailing list