gnucash maint: Multiple changes pushed

Christopher Lam clam at code.gnucash.org
Fri Sep 13 06:55:02 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/26a9ccc1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/da655cfa (commit)
	from  https://github.com/Gnucash/gnucash/commit/41c58ec0 (commit)



commit 26a9ccc1810ef6fe5baf042d1e7893c22e16d13f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Sep 13 18:29:52 2019 +0800

    Bug 797408 - Find Transaction Window -> Search Criteria Section -> Add Search Criteria -> Section does not expand to new size to include a newly added Search Criteria

diff --git a/gnucash/gtkbuilder/dialog-search.glade b/gnucash/gtkbuilder/dialog-search.glade
index 37631aee4..2f46d8cfd 100644
--- a/gnucash/gtkbuilder/dialog-search.glade
+++ b/gnucash/gtkbuilder/dialog-search.glade
@@ -302,7 +302,7 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>

commit da655cfaa9091e5922453129873f401ab0975310
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Sep 12 22:32:01 2019 +0800

    [balsheet-pnl] ensure txns on last report-date are processed
    
    bugfix. after writing commit message to 23d0fa132, I had to verify the
    strong statement regarding txns on last report-date, and found that I
    was incorrect. ensure txns are previously accounted for.

diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/standard-reports/balsheet-pnl.scm
index 76a878228..6f9b3b8d6 100644
--- a/gnucash/report/standard-reports/balsheet-pnl.scm
+++ b/gnucash/report/standard-reports/balsheet-pnl.scm
@@ -706,12 +706,14 @@ also show overall period profit & loss."))
 
   ;; get all options values
   (let* ((report-title (get-option gnc:pagename-general gnc:optname-reportname))
-         (startdate (gnc:date-option-absolute-time
-                     (get-option gnc:pagename-general
-                                 optname-startdate)))
-         (enddate (gnc:date-option-absolute-time
-                   (get-option gnc:pagename-general
-                               optname-enddate)))
+         (startdate ((if (eq? report-type 'pnl)
+                         gnc:time64-start-day-time
+                         gnc:time64-end-day-time)
+                     (gnc:date-option-absolute-time
+                      (get-option gnc:pagename-general optname-startdate))))
+         (enddate (gnc:time64-end-day-time
+                   (gnc:date-option-absolute-time
+                    (get-option gnc:pagename-general optname-enddate))))
          (disable-account-indent? (get-option gnc:pagename-display
                                               optname-account-full-name))
          (incr (get-option gnc:pagename-general optname-period))
@@ -761,15 +763,13 @@ also show overall period profit & loss."))
                                     common-currency)))))
          (price-source (and common-currency
                             (get-option pagename-commodities optname-price-source)))
-         (report-dates (map (if (eq? report-type 'balsheet)
-                                gnc:time64-end-day-time
-                                gnc:time64-start-day-time)
-                            (if incr
-                                (gnc:make-date-list
-                                 startdate enddate (gnc:deltasym-to-delta incr))
-                                (if (eq? report-type 'balsheet)
-                                    (list enddate)
-                                    (list startdate enddate)))))
+
+         (report-dates
+          (cond
+           (incr (gnc:make-date-list startdate enddate (gnc:deltasym-to-delta incr)))
+           ((eq? report-type 'pnl) (list startdate enddate))
+           (else (list enddate))))
+
          (accounts-balances (map
                              (lambda (acc)
                                (cons acc



Summary of changes:
 gnucash/gtkbuilder/dialog-search.glade           |  2 +-
 gnucash/report/standard-reports/balsheet-pnl.scm | 30 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)



More information about the gnucash-changes mailing list