Robert Graham Merkel's report patch.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2348 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,8 @@
+2000-05-18  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/scm/report/transaction-report-2.scm: Fixed *some* of the
+	bugs with two-column balance displays.
+
 2000-05-17  Dave Peticolas  <peticola@cs.ucdavis.edu>
 
 	* src/gnome/window-reconcile.c (gnc_recn_create_tool_bar): add a

src/scm/report/transaction-report-2.scm

@@ -144,51 +144,64 @@
 	(lambda (value) 
 	  (html-right-cell (html-ital (html-currency value)))))
        #f)
-
+      
       (if
         (eq? (gnc:option-value
-  	(gnc:lookup-option options "Display" "Amount")) 'double)
+ 	(gnc:lookup-option options "Display" "Amount")) 'double)
         (make-report-spec
-	 (string-db 'lookup 'credit-string)
-	 (lambda (split) (max 0 (gnc:split-get-value split)))
+ 	(string-db 'lookup 'debit-string)
+ 	(lambda (split)
+	  (max 0 (gnc:split-get-value split)))
  	(lambda (value)
- 	  (if (> value 0) (html-right-cell (html-currency value))
- 	      (html-right-cell (html-string " "))))
+ 	  (cond ((> value 0.0) (html-right-cell (html-currency value)))
+	  (else (html-right-cell (html-ital (html-string " "))))))
+;	(lambda (value)
+; 	  (if (> value 0) (html-right-cell (html-currency value)))
+;	  (html-right-cell (html-ital (html-string " "))))  
  	+ ; total-proc
  	(lambda (value)
- 	  (html-right-cell (html-strong (html-currency value))))	
+ 	  (html-right-cell (html-strong (html-currency value))))
  	(lambda (value)
  	  (html-right-cell (html-strong (html-currency value))))
  	#t ; first-last-preference
  	(lambda (split)
  	  (map gnc:split-get-value (gnc:split-get-other-splits split)))
- 	(lambda (value)
- 	  (if (> value 0) (html-right-cell (html-ital (html-currency value)))
- 	      (html-right-cell (html-ital (html-string " "))))))
+ ;	(lambda (value)
+; 	  (if (> value 0) (html-right-cell (html-ital (html-currency value)))
+; 	      (html-right-cell (html-ital (html-string " ")))))
+	(lambda (value)
+ 	  (cond ((> value 0.0) (html-right-cell (html-ital(html-currency value))))
+	  (else (html-right-cell (html-ital (html-string " ")))))))
         #f)
 
-       (if
+      (if
         (eq? (gnc:option-value
- 	(gnc:lookup-option options "Display" "Amount")) 'double)
+  	(gnc:lookup-option options "Display" "Amount")) 'double)
         (make-report-spec
- 	(string-db 'lookup 'debit-string)
- 	(lambda (split) (max 0 (- (gnc:split-get-value split))))
+	 (string-db 'lookup 'credit-string)
+	 (lambda (split)
+	   (max  0 (- (gnc:split-get-value split))))
+;	 (lambda (value) (html-right-cell (html-currency value)))
  	(lambda (value)
- 	  (if (> value 0) (html-right-cell (html-currency value))
- 	      (html-right-cell (html-string " "))))
+;	  (display value)
+;	  (display (> value 0.0))
+;	  (display "\n")
+ 	  (cond ((> value 0.0) (html-right-cell (html-currency value)))
+	  (else (html-right-cell (html-ital (html-string " "))))))
  	+ ; total-proc
  	(lambda (value)
- 	  (html-right-cell (html-strong (html-currency value))))
+ 	  (html-right-cell (html-strong (html-currency value))))	
  	(lambda (value)
  	  (html-right-cell (html-strong (html-currency value))))
  	#t ; first-last-preference
  	(lambda (split)
  	  (map gnc:split-get-value (gnc:split-get-other-splits split)))
  	(lambda (value)
- 	  (if (> value 0) (html-right-cell (html-ital (html-currency value)))
- 	      (html-right-cell (html-ital (html-string " "))))))
+ 	  (cond  ((< value 0) (html-right-cell (html-ital (html-currency (- value)))))
+ 	      (else (html-right-cell (html-ital (html-string " ")))))))
         #f)
 
+       
        (if 
        (eq? (gnc:option-value
 	(gnc:lookup-option options "Display" "Amount")) 'double)