gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Tue Aug 1 08:54:51 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/0bb972cd (commit)
via https://github.com/Gnucash/gnucash/commit/54f9cd69 (commit)
from https://github.com/Gnucash/gnucash/commit/53e4e057 (commit)
commit 0bb972cd0206791932bf5ad4dff871aa6f1788ff
Author: christopherlam <christopher.lck at gmail.com>
Date: Tue Aug 1 19:34:46 2017 +0800
Fix income statement when trading accounts not used
Fix cosmetic bug
http://gnucash.1415818.n4.nabble.com/unknown-column-in-Income-Statement-Profit-amp-Loss-td4680661.html#a4692940
Insert empty-cell instead of #unspecified result of (if predicate? result-if-true) where predicate? is #false
diff --git a/src/report/standard-reports/income-statement.scm b/src/report/standard-reports/income-statement.scm
index 5b2c352..da4579f 100644
--- a/src/report/standard-reports/income-statement.scm
+++ b/src/report/standard-reports/income-statement.scm
@@ -647,14 +647,16 @@
(if standard-order?
(list
(gnc:make-html-table-cell inc-table)
- (if (not (null? trading-accounts))
+ (if (null? trading-accounts)
+ (gnc:html-make-empty-cell)
(gnc:make-html-table-cell tra-table))
(gnc:make-html-table-cell exp-table)
)
(list
(gnc:make-html-table-cell exp-table)
(gnc:make-html-table-cell inc-table)
- (if (not (null? trading-accounts))
+ (if (null? trading-accounts)
+ (gnc:html-make-empty-cell)
(gnc:make-html-table-cell tra-table))
)
)
commit 54f9cd69af643a5f2b4c04e3022629e32d27497a
Author: christopherlam <christopher.lck at gmail.com>
Date: Tue Aug 1 17:17:32 2017 +0800
Add vertical-align:top to default text fields.
Add vertical-align top.
Previously, text fields would have vertical-align:default = centre. This means long transaction descriptions would cause all other fields to be vertically centred. This amendment will ensure the transactional report text are aligned from the top.
diff --git a/src/report/report-system/html-fonts.scm b/src/report/report-system/html-fonts.scm
index 3ee4ccf..c769f94 100644
--- a/src/report/report-system/html-fonts.scm
+++ b/src/report/report-system/html-fonts.scm
@@ -157,7 +157,7 @@
(string-append
"h3 { " title-font-info " }\n"
"a { " account-link-font-info " }\n"
- "body, p, table, tr, td { text-align: left; " text-cell-font-info " }\n"
+ "body, p, table, tr, td { text-align: left; vertical-align: top; " text-cell-font-info " }\n"
"tr.alternate-row { background: " alternate-row-color " }\n"
"th.column-heading-left { text-align: left; " number-header-font-info " }\n"
"th.column-heading-center { text-align: center; " number-header-font-info " }\n"
Summary of changes:
src/report/report-system/html-fonts.scm | 2 +-
src/report/standard-reports/income-statement.scm | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list