mirror of
https://github.com/Gnucash/gnucash.git
synced 2026-11-02 20:30:45 -06:00
Fix three incorrect tests for swig-wrapped objects and one
initialization as #f instead of '(), the latter making qif imports work again. Remove also a few lines of old commented cruft. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15102 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
1 parent
554c03d055
commit
c94218b42c
4 files changed
+5
-15
No files matched your search
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
|
||||
Reference in new issue
Block a user