From 0f526a786c17928df35c32909db067c8ca699462 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 4 Nov 2011 13:43:53 +0000 Subject: [PATCH] Bug #639082 - General Journal report reports an error BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21518 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/report/standard-reports/register.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/report/standard-reports/register.scm b/src/report/standard-reports/register.scm index 52908c5678..c7c36db870 100644 --- a/src/report/standard-reports/register.scm +++ b/src/report/standard-reports/register.scm @@ -562,7 +562,13 @@ (rest (cdr splits)) (next (if (null? rest) #f (car rest))) - (split-value (add-split-row table + ;; The general ledger has a split that doesn't have an account + ;; set yet (the new entry transaction). + ;; This split should be skipped or the report errors out. + ;; See bug #639082 + (valid-split? (not (null? (xaccSplitGetAccount current)))) + (split-value (if valid-split? + (add-split-row table current used-columns current-row-style @@ -570,13 +576,13 @@ (not multi-rows?) double? (opt-val "Display" "Memo") - (opt-val "Display" "Description")))) + (opt-val "Display" "Description"))))) - (if multi-rows? + (if (and multi-rows? valid-split?) (add-other-split-rows current table used-columns "alternate-row")) - (if multi-rows? + (if (and multi-rows? valid-split?) (for-each (lambda (split) (if (string=? (gncAccountGetGUID (xaccSplitGetAccount current))