gnucash maint: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Mon Jun 4 08:09:48 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/06808469 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/aeb25313 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5093a8fb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0dc9a115 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5532de04 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7927597b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/39e97604 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/03b57e51 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/879ec75f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e9535bfa (commit)
	 via  https://github.com/Gnucash/gnucash/commit/aafd46a4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/98964f7a (commit)
	from  https://github.com/Gnucash/gnucash/commit/eb67baba (commit)



commit 06808469d0a1c2483f18760a7b025abd4d57fdba
Merge: aeb2531 5093a8f
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jun 4 13:44:42 2018 +0200

    Merge branch 'maint-eradicate-gtkhtml' of https://github.com/christopherlam/gnucash into maint

commit aeb2531350b296bf6a4b8215915aba58062a5cf6
Merge: eb67bab 0dc9a11
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jun 4 11:46:46 2018 +0200

    Merge branch 'maint-scheme-more-progress' of https://github.com/christopherlam/gnucash into maint

commit 5093a8fb141e4df3bf2fad3b7757047b992d1693
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Jun 4 11:01:23 2018 +0800

    [webkit] eradicate gtkhtml in .scm
    
    This commit does away with anything gtkhtml related. Some variables eg
    css? must remain because they're used later on.

commit 0dc9a115017b4608e87ffb9a36734ac01079cb8a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Jun 2 16:46:05 2018 +0800

    [html-table] compact html-table-append-row!

commit 5532de0481888701432d592d396fbcc8a3138855
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Jun 2 16:43:31 2018 +0800

    [html-table] use srfi-1

commit 7927597b3a7e043a9993f5af5d33222f09886f82
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Jun 2 16:25:58 2018 +0800

    [html-table] gnc:html-table-set-row-style! uses cons*
    
    This cons* call creates a pair-terminated list.

commit 39e976045b72e6d3cac178dc9db970b08b13bdb7
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Jun 2 16:25:41 2018 +0800

    [html-table] unused gnc:html-table-merge
    
    This function is not used through code.

commit 03b57e515386039b3231c9a12f5674232c8ab972
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Jun 1 17:44:09 2018 +0800

    [hello-world] amend comment from timepair to time64

commit 879ec75f20ea72cf8860e4a732c3df900ecace19
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu May 24 11:16:23 2018 +0800

    [TR] [ENH] grid can easily display averages
    
    The subtotal-grid can easily calculate average amounts per *row*. I
    think this is useful enough to be set as default. Enable if number of
    secondary-key groups > 1. Upgrade test suite as well.
    
    The subtotal collectors do not calculate overall secondary-key
    subtotals, therefore, we cannot easily calculate average amounts per
    *column*.

commit e9535bfab6da71a31aa99962e42878e5b6634f64
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun May 20 20:54:58 2018 +0800

    [TR] [bugfix] disable grid if primary-key doesn't have subtotal
    
    Formerly the logic would allow grid if secondary-subtotal enabled but
    primary-subtotal disabled. This would produce a single-row grid. This
    is now known to be inaccurate.
    
    This is because there will be multiple secondary subtotals spread out
    in the main table but no primary subtotal grouping to separate
    them. This would make every subsequent secondary subtotal overwrite
    the previous one. I think it is best to disable grid altogether if
    primary-subtotal is not enabled.
    
    The converse i.e. primary-subtotal enabled but secondary-subtotal
    disabled, is handled correctly. It produces a single-column grid.

commit aafd46a44281aecf0d140f97a15d0b7a4d546658
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon May 21 21:58:25 2018 +0800

    [TR] [bugfix] upgrade add-subtotal-row & grid for >1 commodities.
    
    This aims to handle multiple commodities correctly. If a row contains
    subtotals with more than one commodity, the row is duplicated so that
    every commodity gets its own line in the grid.
    
    This is accompanied by an upgrade to the test suite.
    
    Sample output if prime-sortkey = accounts, sec-sortkey = monthly dates
    
            Jan-17  Feb-17  Mar-17   Total
    Food    $22.00  $23.00  $35.00  $80.00
    Books    $8.50   $9.55  $15.00  $33.05
    Apps     £2.55   £5.00   £9.60  £17.15
    Total                          $113.05
                                    £17.15
    
    (note monthly totals are not displayed because they're not actually
    generated with the above sorting options)

commit 98964f7a6d50107331a5eed70ddada7250d5108c
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon May 21 21:56:31 2018 +0800

    [TR] refactor add-subtotal-row
    
    Schemify to use (append) rather than (set!) calls to build
    list-of-cells. This is (IMHO) neater and definitely favoured by
    seasoned schemers.



Summary of changes:
 .../report/business-reports/balsheet-eg.eguile.scm |   7 -
 gnucash/report/business-reports/balsheet-eg.scm    |  13 +-
 gnucash/report/business-reports/receipt.scm        |  16 +-
 gnucash/report/business-reports/taxinvoice.scm     |  16 +-
 gnucash/report/locale-specific/us/taxtxf.scm       |  86 +--------
 gnucash/report/report-system/html-document.scm     |   6 +-
 gnucash/report/report-system/html-table.scm        |  44 +----
 gnucash/report/report-system/report-system.scm     |   1 -
 .../standard-reports/test/test-transaction.scm     |  61 +++++--
 gnucash/report/standard-reports/transaction.scm    | 163 ++++++++++-------
 gnucash/report/stylesheets/stylesheet-easy.scm     | 203 +++++++--------------
 gnucash/report/stylesheets/stylesheet-fancy.scm    | 203 +++++++--------------
 gnucash/report/stylesheets/stylesheet-footer.scm   | 203 +++++++--------------
 .../report/stylesheets/stylesheet-head-or-tail.scm | 203 +++++++--------------
 gnucash/report/stylesheets/stylesheet-plain.scm    | 203 +++++++--------------
 gnucash/report/utility-reports/hello-world.scm     |   4 +-
 16 files changed, 493 insertions(+), 939 deletions(-)



More information about the gnucash-patches mailing list