2001-05-02 Dave Peticolas <dave@krondo.com>

* src/scm/report/net-barchart.scm: same as below

	* src/scm/report/category-barchart.scm: same as below

	* src/scm/report/average-balance.scm: same as below

	* src/scm/report/account-piecharts.scm: don't combine liabilities
	& equity together.


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

ChangeLog

@@ -1,5 +1,14 @@
 2001-05-02  Dave Peticolas  <dave@krondo.com>
 
+	* src/scm/report/net-barchart.scm: same as below
+
+	* src/scm/report/category-barchart.scm: same as below
+
+	* src/scm/report/average-balance.scm: same as below
+
+	* src/scm/report/account-piecharts.scm: don't combine liabilities
+	& equity together.
+
 	* src/gnome/dialog-column-view.c: work on gui
 
 	* src/gnome/dialog-utils.c (gnc_clist_columns_autosize): new func

src/scm/report/account-piecharts.scm

@@ -41,7 +41,7 @@
       (menutip-assets 
        (N_ "Shows a piechart with the Assets balance at a given time"))
       (menutip-liabilities 
-       (N_ "Shows a piechart with the Liabilities and Equity \
+       (N_ "Shows a piechart with the Liabilities \
 balance at a given time"))
 
       ;; The names here are used 1. for internal identification, 2. as
@@ -50,7 +50,7 @@ balance at a given time"))
       (reportname-income (N_ "Income Accounts"))
       (reportname-expense (N_ "Expense Accounts"))
       (reportname-assets (N_ "Assets"))
-      (reportname-liabilities (N_ "Liabilities/Equity"))
+      (reportname-liabilities (N_ "Liabilities"))
 
       (optname-from-date (N_ "From"))
       (optname-to-date (N_ "To"))
@@ -417,5 +417,5 @@ the global Preference \"Display Tip of the Day\".")))))
 		  stock mutual-fund currency)
 	  #f menuname-assets menutip-assets)
     (list reportname-liabilities 
-	  '(liability credit credit-line equity)
+	  '(liability credit credit-line)
 	  #f menuname-liabilities menutip-liabilities))))

src/scm/report/average-balance.scm

@@ -44,7 +44,7 @@
 		   ;; otherwise get some accounts -- here as an
 		   ;; example we get the asset and liability stuff
                    (gnc:filter-accountlist-type
-		    '(bank cash credit asset liability equity) 
+		    '(bank cash credit asset liability) 
 		    ;; or: '(bank cash checking savings stock
 		    ;; mutual-fund money-market)
 		    (gnc:group-get-account-list (gnc:get-current-group)))))))

src/scm/report/category-barchart.scm

@@ -46,7 +46,7 @@ developing over time"))
       (menutip-assets 
        (N_ "Shows a barchart with the Assets developing over time"))
       (menutip-liabilities 
-       (N_ "Shows a barchart with the Liability and Equity balance \
+       (N_ "Shows a barchart with the Liabilities \
 developing over time"))
 
       ;; The names here are used 1. for internal identification, 2. as
@@ -55,7 +55,7 @@ developing over time"))
       (reportname-income (N_ "Income Over Time"))
       (reportname-expense (N_ "Expense Over Time"))
       (reportname-assets (N_ "Assets Over Time"))
-      (reportname-liabilities (N_ "Liabilities/Equity Over Time"))
+      (reportname-liabilities (N_ "Liabilities Over Time"))
 
       ;; Option names
       (optname-from-date (N_ "From"))
@@ -477,5 +477,5 @@ the global Preference \"Display Tip of the Day\".")))))
 		  stock mutual-fund currency)
 	  #f menuname-assets menutip-assets)
     (list reportname-liabilities 
-	  '(liability credit credit-line equity)
+	  '(liability credit credit-line)
 	  #f menuname-liabilities menutip-liabilities))))

src/scm/report/net-barchart.scm

@@ -90,7 +90,7 @@
         "a" 
 	(if inc-exp? 
 	    (N_ "Show Income and Expenses?")
-	    (N_ "Show the Asset and the Liability/Equity bars?"))
+	    (N_ "Show the Asset and the Liability bars?"))
 	#t))
 
       (add-option
@@ -216,9 +216,7 @@
 	    (collector-fn 
 	     (if inc-exp?
 		 accounts
-		 (append
+                 (assoc-ref classified-accounts 'liability))
-		  (assoc-ref classified-accounts 'liability)
-		  (assoc-ref classified-accounts 'equity)))
 	     dates-list #f))
 	   (net-collector-list
             (map collector-combine assets-collector-list
@@ -276,7 +274,7 @@
 	      (if show-sep?
 		  (if inc-exp?
 		      (list (_ "Income") (_ "Expense"))
-		      (list (_ "Assets") (_ "Liabilities/Equity")))
+		      (list (_ "Assets") (_ "Liabilities")))
 		  '())
 	      (if show-net?
 		  (if inc-exp?
@@ -309,7 +307,7 @@
 		  (gnc:make-report-anchor
 		   (if inc-exp?
 		       "Expense Over Time"
-		       "Liabilities/Equity Over Time")
+		       "Liabilities Over Time")
 		   report-obj
 		   (list 
 		    (list gnc:pagename-display
@@ -318,7 +316,7 @@
 			  gnc:optname-reportname
 			  (if inc-exp?
 			      (_ "Expense Chart")
-			      (_ "Liability/Equity Chart"))))))))
+			      (_ "Liability Chart"))))))))
 	    (gnc:html-barchart-set-button-1-bar-urls! 
 	     chart urls)
 	    (gnc:html-barchart-set-button-1-legend-urls!