diff --git a/src/engine/engine-interface.scm b/src/engine/engine-interface.scm index 2fd398f64f..7654f9ecf4 100644 --- a/src/engine/engine-interface.scm +++ b/src/engine/engine-interface.scm @@ -219,7 +219,7 @@ (define (gnc:transaction->transaction-scm trans use-cut-semantics?) (define (trans-splits i) (let ((split (xaccTransGetSplit trans i))) - (if (not split) + (if (null? split) '() (cons (gnc:split->split-scm split use-cut-semantics?) (trans-splits (+ i 1)))))) diff --git a/src/report/standard-reports/register.scm b/src/report/standard-reports/register.scm index eeea8bf9b3..0b73e1018a 100644 --- a/src/report/standard-reports/register.scm +++ b/src/report/standard-reports/register.scm @@ -374,7 +374,7 @@ (define (add-other-split-rows split table used-columns row-style) (define (other-rows-driver split parent table used-columns i) (let ((current (xaccTransGetSplit parent i))) - (if current + (if (not (null? current)) (begin (add-split-row table current used-columns row-style #f #t #f) (other-rows-driver split parent table @@ -564,7 +564,7 @@ (qof-query-set-book query (gnc-get-current-book)) (set! splits (if journal? - (qof-query-run-unique-trans query) + (xaccQueryGetSplitsUniqueTrans query) (qof-query-run query))) (set! table (make-split-table splits diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm index 5c31d91121..d999cfc86d 100644 --- a/src/report/standard-reports/transaction.scm +++ b/src/report/standard-reports/transaction.scm @@ -923,7 +923,7 @@ Credit Card, and Income accounts"))))) row-style account-types-to-reverse) (define (other-rows-driver split parent table used-columns i) (let ((current (xaccTransGetSplit parent i))) - (cond ((not current) #f) + (cond ((null? current) #f) ((equal? current split) (other-rows-driver split parent table used-columns (+ i 1))) (else (begin @@ -1142,7 +1142,7 @@ Credit Card, and Income accounts"))))) #f #f #f)) (cons 'corresponding-acc-name (vector - (list SPLIT-CORR-ACCT-FULLNAME) + (list SPLIT-CORR-ACCT-NAME) split-same-corr-account-full-name-p render-corresponding-account-subheading render-corresponding-account-subtotal))