From f7a3e9fb6a8ea2ee29ad273e59d296f38523e5e4 Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Tue, 28 Mar 2000 01:50:06 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2126 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                             |  6 ++++++
 src/scm/report/budget-report.scm      | 31 +++++++--------------------
 src/scm/report/transaction-report.scm | 14 ------------
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a53c7af92d..5cab15a5e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-27  Dave Peticolas  <peticola@cs.ucdavis.edu>
+
+	* src/scm/report/budget-report.scm: removed use of transaction
+ 	report function. This was generating a value that was not
+ 	subsequently used.
+
 2000-03-26  Dave Peticolas  <peticola@cs.ucdavis.edu>
 
 	* src/scm/report/transaction-report.scm: i18n the report
diff --git a/src/scm/report/budget-report.scm b/src/scm/report/budget-report.scm
index e99d6ed26c..506b7f2dae 100644
--- a/src/scm/report/budget-report.scm
+++ b/src/scm/report/budget-report.scm
@@ -16,18 +16,12 @@
 (gnc:depend "html-generator.scm")
 (gnc:depend "date-utilities.scm")
 
-;; time values
-					;(define gnc:budget-day 1)
-					;(define gnc:budget-week 2)
-					;(define gnc:budget-month 3)
-					;(define gnc:budget-year 4)
-
 ;; budget types
-					;(define gnc:budget-recurring 1) ; regular, recurring budget expenses
-					; that happen once per period
-					;(define gnc:budget-contingency 2) ; a budget item where you estimate a
-					; value over a long period for
-					; unexpected expenses.
+;(define gnc:budget-recurring 1) ; regular, recurring budget expenses
+; that happen once per period
+;(define gnc:budget-contingency 2) ; a budget item where you estimate a
+; value over a long period for
+; unexpected expenses.
 
 ;; convert a date to a defined fraction
 (define (gnc:date-to-N-fraction caltime type)
@@ -273,7 +267,7 @@
 (define (budget-calculate-expected! budget-line)
   (let ((brep (budget-line-get-report budget-line))
 	(entry (budget-line-get-entry budget-line)))
-					; fixme: contingency type budget entries may have a lower minimum
+    ; fixme: contingency type budget entries may have a lower minimum
     ((record-modifier budget-report-structure 'minimum-expected) brep
      (* (budget-entry-get-amount entry)		    
 	(floor (budget-report-get-num-periods brep))))
@@ -383,20 +377,15 @@
  (lambda (options)
    (let* ((begindate (gnc:lookup-option options "Report Options" "From"))
 	  (enddate (gnc:lookup-option options "Report Options" "To"))
-	  (date-filter-pred (gnc:tr-report-make-filter-predicate
-			     (gnc:option-value begindate) 
-			     (gnc:option-value enddate)))
 	  (begin-date-secs (car (gnc:timepair-canonical-day-time 
-				 (gnc:option-value begindate))))
+                                 (gnc:option-value begindate))))
 	  (end-date-secs (car (gnc:timepair-canonical-day-time
-			       (gnc:option-value enddate))))
+                               (gnc:option-value enddate))))
 	  (budget-list (map 
 			(lambda (entry)
 			  (make-budget-line entry (make-empty-budget-report)))
 			gnc:budget-entries)))
 
-     (gnc:debug "a")
-     
      (let loop ((group (gnc:get-current-group)))
        (if (not (pointer-token-null? group))
 	   (gnc:group-map-accounts
@@ -414,8 +403,6 @@
 		(loop (gnc:account-get-children account))))
 	    group)))
 
-     (gnc:debug "b")
-
      (for-each 
       (lambda (line)
 	(begin
@@ -426,8 +413,6 @@
 	  (budget-calculate-num-triggers! line begin-date-secs end-date-secs)))
       budget-list)
      
-     (gnc:debug "c")
-     
      (let ((report-headers '())
 	   (report-procs '()))
        (case (gnc:option-value 
diff --git a/src/scm/report/transaction-report.scm b/src/scm/report/transaction-report.scm
index d2547548e6..d326534dda 100644
--- a/src/scm/report/transaction-report.scm
+++ b/src/scm/report/transaction-report.scm
@@ -86,20 +86,6 @@
       (cond ((= (length other-splits) 0) "-")
             (else  (caar other-splits)))))
 
-  ;; get transactions date from split - needs to be done indirectly
-  ;; as it's stored in the parent transaction
-
-  (define (gnc:split-get-transaction-date split)
-    (gnc:transaction-get-date-posted (gnc:split-get-parent split)))
-
-  ;; ditto descriptions
-  (define (gnc:split-get-description-from-parent split)
-    (gnc:transaction-get-description (gnc:split-get-parent split)))
-
-  ;; get the account name of a split
-  (define (gnc:split-get-account-name split)  
-    (gnc:account-get-full-name (gnc:split-get-account split)))
-
   ;; builds a list of the account name and values for the other
   ;; splits in a transaction
   (define (gnc:split-get-corresponding-account-name-and-values