Robert Graham Merkel's balance sheet patch.

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

ChangeLog

@@ -1,3 +1,14 @@
+2001-04-05  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/scm/report/balance-sheet.scm: Relabel summary rows, fix
+	asset calculation bugs.
+
+2001-04-04  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/scm/report/balance-sheet.scm: calculate retained profits
+	explicitly, display (liabilities + equity) to allow people
+	to check balances.
+
 2001-04-04  Dave Peticolas  <dave@krondo.com>
 
 	* src/register/gnome/gnucash-sheet.c

src/scm/report/balance-sheet.scm

@@ -133,7 +133,7 @@
                                commodity amount))))
 		     #f))
 	  (gnc:html-table-append-row!
-           table (list (_ "Retained Earnings") 
+           table (list (_ "Net Profit") 
                        (gnc:sum-collector-commodity 
                         balance report-commodity exchange-fn)))))
 				   
@@ -271,7 +271,10 @@
 	    (total-equity-balance 'minusmerge equity-balance #f)
 	    (total-equity-balance 'merge
 				  retained-profit-balance
-				  #f)
+				  #f)	    
+	    (sign-reversed-liability-balance 'minusmerge
+					     liability-balance
+					     #f)
 	    (equity-plus-liability 'merge
 				   sign-reversed-liability-balance
 				   #f)
@@ -280,9 +283,7 @@
 				   #f)
 				  
 			       
-	    (sign-reversed-liability-balance 'minusmerge
-					     liability-balance
-					     #f)
+
 	    
 	    ;; add the tables
 	    (gnc:html-table-prepend-row! asset-table (list "Assets"))	    
@@ -298,13 +299,13 @@
              asset-table retained-profit-balance
              show-fcur? exchange-fn report-currency)
 	    (add-subtotal-line
-             asset-table "Equity" total-equity-balance show-fcur?
+             asset-table "Total Equity" total-equity-balance show-fcur?
              exchange-fn report-currency)
 	    (add-subtotal-line
 	     asset-table "Liabilities & Equity" equity-plus-liability
 	     show-fcur? exchange-fn report-currency)
 	    (gnc:html-document-add-object! doc asset-table)
-;	    (gnc:free-account-group income-expense-accounts-group)
+
 	    ;; add currency information
 ;	    (gnc:html-document-add-object! 
 ;	     doc ;;(gnc:html-markup-p