diff --git a/src/business/business-reports/aging.scm b/src/business/business-reports/aging.scm index dde1e37d2b..470ff60d28 100644 --- a/src/business/business-reports/aging.scm +++ b/src/business/business-reports/aging.scm @@ -183,8 +183,7 @@ (temp-owner (gncOwnerCreate)) (owner (gnc:owner-from-split split temp-owner))) - (if - owner + (if (not (null? owner)) (let* ((guid (gncOwnerReturnGUID owner)) (this-currency (xaccTransGetCurrency transaction)) (this-date (gnc-transaction-get-date-posted transaction)) diff --git a/src/business/business-reports/invoice.scm b/src/business/business-reports/invoice.scm index 2853565a33..05d344303c 100644 --- a/src/business/business-reports/invoice.scm +++ b/src/business/business-reports/invoice.scm @@ -437,7 +437,7 @@ (add-subtotal-row table used-columns tax-collector "grand-total" (_ "Tax"))) - (if (and show-payments lot) + (if (and show-payments (not (null? lot))) (let ((splits (sort-list! (gnc-lot-get-split-list lot) (lambda (s1 s2) @@ -488,7 +488,7 @@ (gnc:gnc-monetary-amount (cdr entry-values))) (let ((order (gncEntryGetOrder current))) - (if order (add-order order))) + (if (not (null? order)) (add-order order))) (do-rows-with-subtotals rest table diff --git a/src/import-export/qif-import/qif-file.scm b/src/import-export/qif-import/qif-file.scm index 611c5a97e0..00c244cc36 100644 --- a/src/import-export/qif-import/qif-file.scm +++ b/src/import-export/qif-import/qif-file.scm @@ -40,16 +40,13 @@ (tag #f) (value #f) (heinous-error #f) - (start-time #f) - (end-time #f) (delimiters (string #\cr #\nl)) - (progress-dialog #f) + (progress-dialog '()) (file-stats (stat path)) (file-size (stat:size file-stats)) (bytes-read 0)) (qif-file:set-path! self path) - (set! start-time (gettimeofday)) (if (> file-size 10000) (begin diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm index f398ab09f3..e18c0219e1 100644 --- a/src/report/report-system/report.scm +++ b/src/report/report-system/report.scm @@ -434,19 +434,13 @@ ;; marks the cursor busy during rendering; returns the html (define (gnc:report-run id) (let ((report (gnc-report-find id)) - (start-time (gettimeofday)) (html #f)) (gnc-set-busy-cursor '() #t) (gnc:backtrace-if-exception (lambda () (if report (begin - (set! html (gnc:report-render-html report #t)) -;; (display "total time to run report: ") -;; (display (gnc:time-elapsed start-time (gettimeofday))) -;; (newline) -;; (display html) (newline) - )))) + (set! html (gnc:report-render-html report #t)))))) (gnc-unset-busy-cursor '()) html))