diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/src/report/business-reports/taxinvoice.eguile.scm
index caa9d40d0d..6358bb9198 100644
--- a/src/report/business-reports/taxinvoice.eguile.scm
+++ b/src/report/business-reports/taxinvoice.eguile.scm
@@ -76,8 +76,7 @@
(car (gnc-transaction-get-date-posted t2))))))))
; pre-scan invoice entries to look for discounts and taxes
- (for-each
- (lambda (entry)
+ (for entry in entries do
(let ((action (gncEntryGetAction entry))
(qty (gncEntryGetQuantity entry))
(discount (gncEntryGetInvDiscount entry))
@@ -96,15 +95,12 @@
; error in SWIG binding -- disable display of tax details
; (see http://bugzilla.gnome.org/show_bug.cgi?id=573645)
(set! taxtables? #f))))))) ; hack required until Swig is fixed
- entries)
; pre-scan invoice splits to see if any payments have been made
- (for-each
- (lambda (split)
+ (for split in splits do
(let* ((t (xaccSplitGetParent split)))
(if (not (equal? t txn))
(set! payments? #t))))
- splits)
?>
@@ -285,8 +281,7 @@
(sub-total (gnc:make-commodity-collector))
(dsc-total (gnc:make-commodity-collector))
(inv-total (gnc:make-commodity-collector)))
- (for-each ; entry in entries
- (lambda (entry)
+ (for entry in entries do
(let ((qty (gncEntryGetQuantity entry))
(each (gncEntryGetInvPrice entry))
(action (gncEntryGetAction entry))
@@ -333,7 +328,7 @@
|
-
+
@@ -354,8 +349,7 @@
">
|
-
+
diff --git a/src/report/business-reports/taxinvoice.scm b/src/report/business-reports/taxinvoice.scm
index da750ddff1..4c1957fac3 100644
--- a/src/report/business-reports/taxinvoice.scm
+++ b/src/report/business-reports/taxinvoice.scm
@@ -55,8 +55,7 @@
(entries (gncTaxTableGetEntries taxtable))
(amt? #f) ; becomes #t if any entries are amounts
(pc? #f)) ; becomes #t if any entries are percentages
- (for-each
- (lambda (entry)
+ (for entry in entries do
(let ((tttype (gncTaxTableEntryGetType entry))
(ttamt (gncTaxTableEntryGetAmount entry)))
(if (equal? tttype GNC-AMT-TYPE-VALUE)
@@ -66,7 +65,6 @@
(begin
(set! pc? #t)
(pctot 'add ttamt)))))
- entries)
(if pc? (begin (display (fmtnumeric (pctot 'total #f))) (display "%")))
(if (and amt? pc?) (display " + ")) ; both - this seems unlikely in practice
(if amt?
diff --git a/src/report/standard-reports/balsheet-eg.eguile.scm b/src/report/standard-reports/balsheet-eg.eguile.scm
index eb7cae38c7..c04f7f1c29 100644
--- a/src/report/standard-reports/balsheet-eg.eguile.scm
+++ b/src/report/standard-reports/balsheet-eg.eguile.scm
@@ -76,8 +76,7 @@
onedepth1)
;; Recursively display the accounts table from the given tree
;; (as returned by process-acc-list)
- (for-each
- (lambda (accrec)
+ (for accrec in tree do
(let ((rshift2 0) ; adjust the amount column by this much
(showamt? #t)) ; whether to show the amount (e.g. not if zero)
(if (and (accrec-sublist accrec)
@@ -122,8 +121,7 @@
(format-comm-coll-total (accrec-subtotal-cc accrec))
(<= (accrec-depth accrec) 1) ; total?
(> (accrec-depth accrec) 0))))))) ; leftoverrule?
- tree
- ))
+ )
?>
@@ -288,8 +286,7 @@
Exchange Rates used for this report") ?>
")
- (for-each
- (lambda (sub-accrec)
+ (for sub-accrec in (accrec-sublist accrec) do
(display "\n")
(accrec-printer sub-accrec port)
(display ""))
- (accrec-sublist accrec))
(display ""))
(display "#f")))
(define accrectype (make-record-type "accrecc"
|