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
This commit is contained in:
Dave Peticolas 2001-05-02 20:14:19 +00:00
parent aa777e7cc8
commit f1eba8217c
5 changed files with 21 additions and 14 deletions

View File

@ -1,5 +1,14 @@
2001-05-02 Dave Peticolas <dave@krondo.com> 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-column-view.c: work on gui
* src/gnome/dialog-utils.c (gnc_clist_columns_autosize): new func * src/gnome/dialog-utils.c (gnc_clist_columns_autosize): new func

View File

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

View File

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

View File

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

View File

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