From 23572f7c0611e9fdffc66b1d40f20aa8f0599949 Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Sun, 3 Jun 2001 00:24:38 +0000 Subject: [PATCH] 2001-06-02 Dave Peticolas * src/scm/report/register.scm: fix bugs * src/scm/html-utilities.scm: fix bugs * src/gnome/window-register.c: fix bugs git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4378 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 6 ++++++ src/gnome/window-register.c | 4 ++++ src/scm/html-utilities.scm | 16 ++++++++++------ src/scm/report/register.scm | 4 +++- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf056fad89..1a8a30a985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-06-02 Dave Peticolas + * src/scm/report/register.scm: fix bugs + + * src/scm/html-utilities.scm: fix bugs + + * src/gnome/window-register.c: fix bugs + * src/scm/report/price-scatter.scm: same as below * src/scm/prefs.scm: same as below diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c index 42ad1c7604..af08c35b90 100644 --- a/src/gnome/window-register.c +++ b/src/gnome/window-register.c @@ -232,6 +232,8 @@ gnc_register_jump_to_split(RegWindow *regData, Split *split) VirtualCellLocation vcell_loc; SplitRegister *reg; + if (!regData) return; + trans = xaccSplitGetParent(split); if (trans != NULL) if (gnc_register_include_date(regData, xaccTransGetDate(trans))) @@ -261,6 +263,8 @@ gnc_register_jump_to_split_amount(RegWindow *regData, Split *split) VirtualLocation virt_loc; SplitRegister *reg; + if (!regData) return; + trans = xaccSplitGetParent(split); if (trans != NULL) if (gnc_register_include_date(regData, xaccTransGetDate(trans))) diff --git a/src/scm/html-utilities.scm b/src/scm/html-utilities.scm index b7215b8d90..fbb8fb752c 100644 --- a/src/scm/html-utilities.scm +++ b/src/scm/html-utilities.scm @@ -79,14 +79,18 @@ ;; returns the account name as html-text and anchor to the register. (define (gnc:html-account-anchor acct) - (gnc:make-html-text (gnc:html-markup-anchor - (gnc:account-anchor-text acct) - (gnc:account-get-name acct)))) + (gnc:make-html-text (if acct + (gnc:html-markup-anchor + (gnc:account-anchor-text acct) + (gnc:account-get-name acct)) + ""))) (define (gnc:html-split-anchor split text) - (gnc:make-html-text (gnc:html-markup-anchor - (gnc:split-anchor-text split) - text))) + (gnc:make-html-text (if (gnc:split-get-account split) + (gnc:html-markup-anchor + (gnc:split-anchor-text split) + text) + text))) (define (gnc:html-transaction-anchor trans text) (gnc:make-html-text (gnc:html-markup-anchor diff --git a/src/scm/report/register.scm b/src/scm/report/register.scm index f7eaefdcfb..a0518ea473 100644 --- a/src/scm/report/register.scm +++ b/src/scm/report/register.scm @@ -122,7 +122,9 @@ (let* ((row-contents '()) (parent (gnc:split-get-parent split)) (account (gnc:split-get-account split)) - (currency (gnc:account-get-commodity account)) + (currency (if account + (gnc:account-get-commodity account) + (gnc:default-currency))) (damount (gnc:split-get-share-amount split)) (split-value (gnc:make-gnc-monetary currency damount)))