GnuCash Daily Diff
Dave Peticolas
peticolas@linas.org
Fri, 25 May 2001 08:03:52 -0500 (CDT)
Index: gnucash/ChangeLog
diff -u gnucash/ChangeLog:1.507 gnucash/ChangeLog:1.515
--- gnucash/ChangeLog:1.507 Thu May 24 02:19:59 2001
+++ gnucash/ChangeLog Fri May 25 02:38:27 2001
@@ -1,3 +1,61 @@
+2001-05-25 Christian Stimming <stimming@tuhh.de>
+
+ * src/gnome/gnc-html-guppi.c (gnc_has_guppi_version): generalized
+ this function for arbitrary Guppi versions. Tried to enable
+ barchart axis-labels for CVS Guppi but this gives nothing but
+ segfaults. Shit.
+
+2001-05-25 Dave Peticolas <dave@krondo.com>
+
+ * src/scm/report/account-summary.scm: fix bug
+
+ * src/gnome/window-main.c: add close window button to toolbar
+
+ * doc/sgml/C/xacc-about.sgml: fix warnings
+
+ * doc/sgml/C/xacc-quickstart.sgml: fix warnings
+
+2001-05-24 Dave Peticolas <dave@krondo.com>
+
+ * doc/sgml/C/xacc-features.sgml: fix docs
+
+ * doc/sgml/C/xacc-account-summary.sgml: fix spelling
+
+ * src/gnome/new-user-funs.c (gnc_ui_show_new_user_choice_window):
+ jump to new user quickstart help when appropriate
+
+ * src/gnc-ui.h: add new help file
+
+2001-05-25 Robert Graham Merkel <rgmerk@mira.net>
+
+ * src/scm/report/average-balance.scm: catch all-zero-data
+ case, display warning message rather than let the graphing
+ code catch it.
+
+ * src/scm/html-utilities.scm: display report title
+ string in gnc:html-no-account-warning and
+ gnc:html-make-empty-data-warning. API changed.
+
+ * src/scm/report/*.scm: update to use changed
+ functions described above.
+
+ * src/scm/tip-list.scm: fix spelling mistake.
+
+2001-05-24 Christian Stimming <stimming@tuhh.de>
+
+ * po/gnc-glossary.txt: added file for all our translators.
+
+ * src/scm/report/average-balance.scm: made strings more
+ consistent.
+
+ * src/scm/options-utilities.scm: adjusted the upper bound for plot
+ size.
+
+ * src/gnome/dialog-column-view.c: use menu-name in report-list.
+
+ * src/scm/report.scm (gnc:report-menu-name),
+ (gnc:report-template-menu-name/name): added functions.
+
2001-05-24 Robert Graham Merkel <rgmerk@mira.net>
* doc/sgml/C/gnucash.sgml: add references to new files.
Index: gnucash/doc/sgml/C/xacc-about.sgml
diff -u gnucash/doc/sgml/C/xacc-about.sgml:1.39 gnucash/doc/sgml/C/xacc-about.sgml:1.40
--- gnucash/doc/sgml/C/xacc-about.sgml:1.39 Thu May 24 02:20:02 2001
+++ gnucash/doc/sgml/C/xacc-about.sgml Fri May 25 02:06:21 2001
@@ -14,10 +14,12 @@
For more information about the many features that GnuCash
offers, have a look at the <link linkend="xacc-features">Features
</link> page.
+</para>
+</sect1>
<sect1 id="xacc-versioning">
<title>Versioning</title>
-<para> </para>
+
<para>The versioning scheme for GnuCash parallels that of the
Linux kernel, where "even" sub-versions indicate versions that
are intended to be stable, only seeing maintenance to fix bugs,
Index: gnucash/doc/sgml/C/xacc-account-summary.sgml
diff -u gnucash/doc/sgml/C/xacc-account-summary.sgml:1.2 gnucash/doc/sgml/C/xacc-account-summary.sgml:1.3
--- gnucash/doc/sgml/C/xacc-account-summary.sgml:1.2 Wed May 16 02:52:45 2001
+++ gnucash/doc/sgml/C/xacc-account-summary.sgml Fri May 25 02:06:22 2001
@@ -39,7 +39,7 @@
<para>If this option is selected, the individual balances for
parent (non-leaf) accounts are shown. Many people do not use
parent accounts for transactions and thus this balance is not
-usefu.</para>
+useful.</para>
<listitem><para>Show subtotals</para>
<para>Show totals for groups of accounts including a parent and
all their children, as well as by account type.</para>
Index: gnucash/doc/sgml/C/xacc-features.sgml
diff -u gnucash/doc/sgml/C/xacc-features.sgml:1.1 gnucash/doc/sgml/C/xacc-features.sgml:1.2
--- gnucash/doc/sgml/C/xacc-features.sgml:1.1 Thu May 24 02:20:03 2001
+++ gnucash/doc/sgml/C/xacc-features.sgml Fri May 25 02:06:22 2001
@@ -67,7 +67,7 @@
<para>Support for <emphasis><link linkend="xacc-currencyhandling">multiple
currencies</link></emphasis> and <emphasis>currency trading accounts.
</emphasis>
- (partial, still broken).
+ (partial, still limited).
Bank accounts may be established in different
currencies, and trades at varying exchange rates may be
made, in much the same way stocks trade at varying
Index: gnucash/doc/sgml/C/xacc-quickstart.sgml
diff -u gnucash/doc/sgml/C/xacc-quickstart.sgml:1.1 gnucash/doc/sgml/C/xacc-quickstart.sgml:1.2
--- gnucash/doc/sgml/C/xacc-quickstart.sgml:1.1 Thu May 24 02:20:04 2001
+++ gnucash/doc/sgml/C/xacc-quickstart.sgml Fri May 25 02:06:23 2001
@@ -19,7 +19,7 @@
powerful, and reliable personal finance program. This virtually
all-new version has an extensive list of features, and if you
want to know everything GnuCash can do, check the
- <link linkend="xacc-features">features section</link of this manual.
+ <link linkend="xacc-features">features section</link> of this manual.
However, if you're like us and impatient to get some work done,
that can wait until later.</para>
@@ -39,13 +39,14 @@
</title>
<para>
- At its core, GnuCash is a tool for tracking <emph>transactions</emph>.
- A transaction is a record of money being removed from one "account"
- and placed in another. To take a simple example, say you have
- two bank accounts - a cheque account (that's checking, for the Americans
- in the audience . . .), and an investment account, and you transfer
- $500 from the cheque account to the investment account. GnuCash
- records that transfer.
+ At its core, GnuCash is a tool for tracking
+ <emphasis>transactions</emphasis>. A transaction is a record
+ of money being removed from one "account" and placed in
+ another. To take a simple example, say you have two bank
+ accounts - a cheque account (that's checking, for the
+ Americans in the audience . . .), and an investment account,
+ and you transfer $500 from the cheque account to the
+ investment account. GnuCash records that transfer.
</para>
<para>
@@ -64,21 +65,22 @@
</para>
<para>
- Now, if you're going to keep proper track of your finances, you'll
- obviously want to create a variety of expense and income
- accounts for keeping track of various transactions you'll make -
- in fact, setting up the right set of accounts is the key to
- making GnuCash work for you.
- However, if you create many different accounts, it can be a pain
- to keep track of them all. GnuCash has a way of dealing with
- this, though. It lets you create a <emph>tree</emph>of accounts.
- For instance, you can create a "Utilities" expense account, and
- then create "Utilities:Power", "Utilities:Gas", and "Utilities:Phone".
- We term "Utilities" to be the "parent" account, and the three others
- to be "subaccounts". When you produce <link linkend="xacc-reports">
- reports</link> of your financial data, you can choose whether
- to display a summary of all "utilities" accounts, or data for
- each individual account.
+ Now, if you're going to keep proper track of your finances,
+ you'll obviously want to create a variety of expense and
+ income accounts for keeping track of various transactions
+ you'll make - in fact, setting up the right set of accounts
+ is the key to making GnuCash work for you. However, if you
+ create many different accounts, it can be a pain to keep
+ track of them all. GnuCash has a way of dealing with this,
+ though. It lets you create a <emphasis>tree</emphasis>of
+ accounts. For instance, you can create a "Utilities"
+ expense account, and then create "Utilities:Power",
+ "Utilities:Gas", and "Utilities:Phone". We term "Utilities"
+ to be the "parent" account, and the three others to be
+ "subaccounts". When you produce <link
+ linkend="xacc-reports"> reports</link> of your financial
+ data, you can choose whether to display a summary of all
+ "utilities" accounts, or data for each individual account.
</para>
<para>
@@ -130,7 +132,7 @@
If you have used another personal finance program that
can export QIF files, such as Quicken or Microsoft Money,
you can import the data into GnuCash. See the instructions
- for the <link linkend="xacc-quicken">QIF importer.
+ for the <link linkend="xacc-quicken">QIF importer</link>.
</para>
<para>Once you've done that, you're ready to go - but first,
@@ -150,11 +152,11 @@
to group similar sorts of accounts - very useful
when reporting your financial data. You can
rearrange your accounts to use a more tree-like
- structure by using the <link linkend=xacc-edit-accounts">
- Account Edit Dialog.</link>
+ structure by using the <link linkend="xacc-accountedit">
+ Account Edit Dialog</link>.
</para>
</listitem>
-
+ </itemizedlist>
</sect2>
<sect2>
@@ -163,14 +165,14 @@
</title>
<para>
Once the druid has done it's thing, you'll end up
- at the GnuCash <link linkend="xacc-main-window">main
+ at the GnuCash <link linkend="xacc-mainwin">main
window.</link> To start entering transactions, select
the appropriate account and click on the "open" button
on the the toolbar. This brings up the account's
<link linkend="xacc-regwin">register</link>, so you
can enter transactions.
- You might also want to <link linkend="xacc-new-account">
- add more accounts</link> or <link linkend="xacc-edit-accounts">
+ You might also want to <link linkend="xacc-newacctwin">
+ add more accounts</link> or <link linkend="xacc-accountedit">
change something</link> about
existing accounts.
</para>
Index: gnucash/po/README
diff -u gnucash/po/README:1.2 gnucash/po/README:1.3
--- gnucash/po/README:1.2 Sun May 13 17:22:28 2001
+++ gnucash/po/README Fri May 25 00:26:38 2001
@@ -8,6 +8,14 @@
translatable strings in GnuCash are taken from scheme files and will
be missed.
+
+gnc-glossary.txt contains a glossary of the financial terms used
+inside GnuCash. To achieve a decent consistency in terminology within
+GnuCash, it is recommended to translate it and to use it during the
+translation process. The file format is a tab-delimited ASCII table
+with each table cell enclosed in double quotation marks (").
+
+
GnuCash .pot files contain some strings of the form:
sample:<some text>
@@ -25,3 +33,5 @@
Dave Peticolas
April 02, 2001
+
+Christian Stimming, May 24, 2001
Index: gnucash/po/gnc-glossary.txt
diff -u /dev/null gnucash/po/gnc-glossary.txt:1.1
--- /dev/null Fri May 25 08:02:48 2001
+++ gnucash/po/gnc-glossary.txt Fri May 25 00:26:38 2001
@@ -0,0 +1,136 @@
+"Glossary of terms for Gnucash"
+"Last edited: 2001-05-24 21:00-0700 by Christian Stimming <stimming@tuhh.de>"
+
+"Term" "Explanation" "DE currently" "DE proposed" "DA" "FR" "JA" "pt_PT"
+"account" "-" "Konto" "-" "-" "-" "-" "-"
+"account code" "-" "Kontonummer (intern)" "-" "-" "-" "-" "-"
+"account name" "-" "Kontobezeichnung" "-" "-" "-" "-" "-"
+"account type: Asset" "-" "Anlagevermögen" "(Aktiva?)" "-" "-" "-" "-"
+"account type: checking" "-" "Girokonto" "-" "-" "-" "-" "-"
+"account type: Equity" "see Equity" "Eigenkapital" "-" "-" "-" "-" "-"
+"account type: Expense" "-" "Ausgabe" "-" "-" "-" "-" "-"
+"account type: Income" "-" "Einnahme" "-" "-" "-" "-" "-"
+"account type: Liability" "-" "Verbindlichkeiten" "(Passiva?)" "-" "-" "-" "-"
+"account type: money-market" "-" "Geldmarktfonds" "-" "-" "-" "-" "-"
+"account type: Mutual fund" "-" "Investmentfonds" "-" "-" "-" "-" "-"
+"account type: saving" "-" "Sparkonto" "-" "-" "-" "-" "-"
+"account type: Stock" "-" "Depot" "-" "-" "-" "-" "-"
+"account: parent account" "-" "Hauptkonto" "-" "-" "-" "-" "-"
+"account: subaccount" "-" "Unterkonto" "-" "-" "-" "-" "-"
+"account: top level account" "-" "Top-Level-Konto" "(Oberkonto) ??" "-" "-" "-" "-"
+"Action (register)" "-" "Aktion" "-" "-" "-" "-" "-"
+"action: ATM" "automated teller machine" "Geldautomat" "-" "-" "-" "-" "-"
+"action: autoDep" "transaction was an auto deposit" "AutoDepot" "Gutschrift" "-" "-" "-" "-"
+"action: buy" "-" "Kauf" "-" "-" "-" "-" "-"
+"action: deposit" "-" "Gutschrift" "Einzahlung" "-" "-" "-" "-"
+"action: direct debit" "When people can automatically deduct money straight from your account. The reverse of Direct Deposit." "Soll" "Lastschrift" "-" "-" "-" "-"
+"action: dist" "transaction is a distribution (???)" "-" "Ausschüttung?" "-" "-" "-" "-"
+"action: div" "transaction is a dividend" "Dividende" "-" "-" "-" "-" "-"
+"action: fee" "-" "Gebühr" "-" "-" "-" "-" "-"
+"action: int" "transaction comes from interest" "Beteiligung" "Zins" "-" "-" "-" "-"
+"action: loan" "-" "Darlehen" "-" "-" "-" "-" "-"
+"action: payment" "-" "Belastung" "Rechnung" "-" "-" "-" "-"
+"action: POS" "-" "Karten-Terminal" "-" "-" "-" "-" "-"
+"action: rebate" "-" "Rabatt" "-" "-" "-" "-" "-"
+"action: sell" "-" "Verkauf" "-" "-" "-" "-" "-"
+"action: Teller" "-" "Zähler" "Bankschalter" "-" "-" "-" "-"
+"action: wire" "-" "Telegrafische Zahlung" "Überweisung" "-" "-" "-" "-"
+"action: withdraw" "-" "Abhebung" "-" "-" "-" "-" "-"
+"amount" "-" "Betrag" "-" "-" "-" "-" "-"
+"average" "-" "Durchschnitt/Durchschnittlich" "-" "-" "-" "-" "-"
+"Balance" "-" "Saldo" "Bestand?" "-" "-" "-" "-"
+"balance sheet" "One of the basic business reports." "Bilanz" "-" "-" "-" "-" "-"
+"balance, to (a transaction)" "-" "Ausgleichen " "-" "-" "-" "-" "-"
+"bank" "-" "Bank" "-" "-" "-" "-" "-"
+"Business (adjective)" "-" "Geschäftlich" "Geschäft/Geschäftlich" "-" "-" "-" "-"
+"capital gains" "-" "Kapitalertrag" "-" "-" "-" "-" "-"
+"case sensitive" "Distinguishing the uppercase and lowercase letters." "Groß-/Kleinschreibung beachten" "-" "-" "-" "-" "-"
+"cash" "-" "Bargeld" "-" "-" "-" "-" "-"
+"check" "The piece of paper that you sign and use in the US to pay everything. Note that this is not used at all anymore in a number of other countries :)" "Scheck" "-" "-" "-" "-" "-"
+"close, to" "To end an application's relationship with an open file so that the application will no longer be able to access the file without opening it again. " "Schliessen" "-" "-" "-" "-" "-"
+"commodity" "The most general term of what an account keeps track of. Can be e.g. a currency, or a stock." "Währung/Aktie, Ware, Ware/Währung" "Währung/Wertpapier" "-" "-" "-" "-"
+"commodity listing" "e.g. NASDAQ" "Börsennotierung" "Börsenplatzkürzel?" "-" "-" "-" "-"
+"commodity option: fraction" "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)" "Stückelung, Bruchteile" "Stückelung" "-" "-" "-" "-"
+"commodity option: Symbol" "e.g. USD, DEM" "Symbol" "-" "-" "-" "-" "-"
+"Credit (column in register)" "Money that came into the account." "Haben " "Gutschrift, (Eingang?)" "-" "-" "-" "-"
+"Credit Card" "-" "Kreditkarte" "-" "-" "-" "-" "-"
+"currency" "-" "Währung" "-" "-" "-" "-" "-"
+"Custom" "Custom print format as opposed to a template choice." "-" "Benutzerdefiniert" "-" "-" "-" "-"
+"database" "The backend where the data is stored." "Datei " "-" "-" "-" "-" "-"
+"Date" "each transaction happens on a date" "Datum" "-" "-" "-" "-" "-"
+"date format" "DD/MM/YY or MM/DD/YY or something else" "Datumsformat" "-" "-" "-" "-" "-"
+"date range" "A range in time that is delimited by two distinct dates." "Zeitraum" "-" "-" "-" "-" "-"
+"Debit (column in register)" "Money that went out of the account." "Soll " "Belastung, (Soll, Ausgang?)" "-" "-" "-" "-"
+"default" "Each option has a default setting that it is shipped with, until the user changes the setting." "Voreinstellung" "-" "-" "-" "-" "-"
+"depreciation" "-" "Abschreibung" "-" "-" "-" "-" "-"
+"Description (column in register)" "One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars)" "Beschreibung" "Verwendungszweck, (Buchungstext, Text?)" "-" "-" "-" "-"
+"double entry" "Important Buzzword :)" "Doppelte Buchführung" "-" "-" "-" "-" "-"
+"equity" "equity isn't debt, it's a representation of long-term capital. so combining it with liability isn't really very meaningful, except in the balance sheet." "Eigenkapital" "-" "-" "-" "-" "-"
+"exchange rate" "-" "Wechselkurs" "-" "-" "-" "-" "-"
+"field" "in the account creation dialog" "Feld" "-" "-" "-" "-" "-"
+"file" "Any piece of information (text, graphics, executable) put together and given a name. All the information you have on the hard drive is arranged as a collection of files." "Datei" "-" "-" "-" "-" "-"
+"file type" "-" "Dateityp" "-" "-" "-" "-" "-"
+"financial calculator: interest rate" "-" "Zinsrate" "Zinssatz" "-" "-" "-" "-"
+"financial calculator: payments" "-" "Raten" "-" "-" "-" "-" "-"
+"imbalance" "name of an automaticly created account to get imbalanced transactions back in balance" "unausgeglichenes Saldo" "Ausgleichskonto" "-" "-" "-" "-"
+"import" "Process of extracting data from a non-Gnucash format into a Gnucash file. E.g. QIF Import." "Import" "-" "-" "-" "-" "-"
+"interest" "The cost of borrowing money, or the gain from lending money." "Zinsen" "-" "-" "-" "-" "-"
+"invoice" "-" "Rechnung" "-" "-" "-" "-" "-"
+"liabilities/equity" "The heading for the right side of the balance sheet. See also: Equity." "Passiva" "-" "-" "-" "-" "-"
+"Lost Accounts" "name of an automatically created account" "Verlorene Konten" "?" "-" "-" "-" "-"
+"Memo" "One textfield per split that should help you remember what this split was about." "Memo" "Buchungstext, (Verwendungszweck, Text, Erklärung?)" "-" "-" "-" "-"
+"national currency" "e.g. USD, DEM, as opposed to stocks" "Nationale Währung" "-" "-" "-" "-" "-"
+"net assets" "net total of all assets" "Gesamt Anlagevermögen" "-" "-" "-" "-" "-"
+"net profit" "The total income minus the total expenses of a given time period." "-" "-" "-" "-" "-" "-"
+"net worth" "Your net worth is your assets minus your liabilities. If your accounts are balanced, your net worth should equal your equity plus your net profit." "-" "-" "-" "-" "-" "-"
+"notes (register)" "One textfield per transaction that can hold explanatory text about the transaction." "Notizen" "Bemerkung" "-" "-" "-" "-"
+"Num (column in register)" "Abbreviation for number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field." "Num " "Nr" "-" "-" "-" "-"
+"open, to" "to make accessible" "Öffnen" "-" "-" "-" "-" "-"
+"opening balance" "If an account starts with a non-zero balance, then this is called the opening balance." "Eröffnungssaldo" "(Anfangsbestand?)" "-" "-" "-" "-"
+"options" "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. " "Berichtsoptionen" "Optionen" "-" "-" "-" "-"
+"orphan" "A split whose account has been scrubbed" "Waisenkind" "?" "-" "-" "-" "-"
+"Payables/Receivables" "-" "-" "Verbindlichkeiten/Forderungen (an Lieferungen und Leistungen)" "-" "-" "-" "-"
+"payee" "the guy who gets the money" "Zahlungsempfänger" "-" "-" "-" "-" "-"
+"payer" "the guy who pays the money" "-" "Zahlungspflichtiger" "-" "-" "-" "-"
+"portfolio" "-" "Portfolio" "-" "-" "-" "-" "-"
+"preferences" "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. " "Einstellungen" "-" "-" "-" "-" "-"
+"price (in a split)" "-" "Preis" "-" "-" "-" "-" "-"
+"price type: ask" "An ask is an offer to sell, and the price you want to sell at." "Briefkurs" "Briefkurs" "-" "-" "-" "-"
+"price type: bid" "A bid is an offer to buy, and the price you want to buy at." "Gebot" "Geldkurs" "-" "-" "-" "-"
+"price: quotes" "online quotes; a snapshot of current prices" "-" "-" "-" "-" "-" "-"
+"profit" "-" "Gewinn" "-" "-" "-" "-" "-"
+"Profit & Loss" "One of the basic reports for business accounting. Lists all income and all expense accounts for a given date range." "Einnahmen-/Ausgabenrechnung" "Gewinn- und Verlustrechnung (GuV)" "-" "-" "-" "-"
+"rebalance, to (a transaction)" "-" "neu kalkulieren " "-" "-" "-" "-" "-"
+"reconcile, to" "reconcile an account, a reconciled split" "Ausgleichen, Abstimmen" "Abgleichen (In Einklang bringen, Abstimmen, Ausgleichen) ?" "-" "-" "-" "-"
+"record keeping" "-" "Buchführung" "-" "-" "-" "-" "-"
+"register" "-" "Register" "-" "-" "-" "-" "-"
+"register entry: split transaction" "-" "Split Buchung " "Mehrteilige Buchung (Teilbuchung?)" "-" "-" "-" "-"
+"register entry: stock split" "-" "Aktien Split " "Aktienteilung" "-" "-" "-" "-"
+"register: auto-split ledger" "one form of register" "-" "-" "-" "-" "-" "-"
+"register: basic ledger" "another form of register" "Hauptbuch" "-" "-" "-" "-" "-"
+"register: general ledger" "another form of register" "Hauptbuch" "-" "-" "-" "-" "-"
+"register: transaction journal" "another form of register" "Buchungsbericht" "-" "-" "-" "-" "-"
+"reload, to" "reload the current document" "Erneut laden" "-" "-" "-" "-" "-"
+"Retained Earnings" "name of an equity account (?); to be distinguished from the opening balance." "Gewinnrücklagen" "-" "-" "-" "-" "-"
+"save, to (to a file)" "To write data (typically a file) to a storage medium, such as a disk or tape." "speichern" "-" "-" "-" "-" "-"
+"scrub, to" "to scrub an account" "Ausbuchen" "-" "-" "-" "-" "-"
+"security" "-" "Wertpapier" "-" "-" "-" "-" "-"
+"Share Balance (register)" "-" "Aktiensaldo" "(Wertpapierbestand?)" "-" "-" "-" "-"
+"shares" "-" "Anteile " "-" "-" "-" "-" "-"
+"source" "of a price" "Quelle" "-" "-" "-" "-" "-"
+"split" "A transaction consists of several splits." "Split " "Teilbuchung ?" "-" "-" "-" "-"
+"style sheet" "This sets the style of a report." "Stil" "-" "-" "-" "-" "-"
+"subtotal" "-" "Zwischensumme" "-" "-" "-" "-" "-"
+"tax info" "field of an account" "Steuerrelevante Informationen" "-" "-" "-" "-" "-"
+"template" "if you create a new e.g. style sheet, you can start from a template" "Vorlage" "-" "-" "-" "-" "-"
+"Tot" "as abbreviation for Total" "Gesamt" "-" "-" "-" "-" "-"
+"total" "of some balances, of any account's running balance etc." "Gesamt" "-" "-" "-" "-" "-"
+"transaction" "-" "Buchung" "-" "-" "-" "-" "-"
+"transaction state: cleared" "-" "Abgestimmt" "(Abgeglichen?)" "-" "-" "-" "-"
+"transaction state: frozen" "-" "Eingefroren" "Fixiert?" "-" "-" "-" "-"
+"transaction state: reconciled" "-" "Ausgeglichen" "Abgeglichen?" "-" "-" "-" "-"
+"transfer, to (register toolbar)" "To move money from one account to another. Will create a transaction." "Buchen" "-" "-" "-" "-" "-"
+"type" "of an account, of a commodity etc." "Art" "-" "-" "-" "-" "-"
+"units" "e.g. millimeters, inch; for absolute positioning in the custom check format." "Einheiten" "Maßeinheiten" "-" "-" "-" "-"
+"URL" "-" "URL" "-" "-" "-" "-" "-"
+"value (in a split)" "-" "Wert " "-" "-" "-" "-" "-"
Index: gnucash/po/pt_PT.po
diff -u gnucash/po/pt_PT.po:1.13 gnucash/po/pt_PT.po:1.14
--- gnucash/po/pt_PT.po:1.13 Thu May 24 00:51:10 2001
+++ gnucash/po/pt_PT.po Thu May 24 19:37:14 2001
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 1.5.6\n"
+"Project-Id-Version: GnuCash 1.5.96\n"
"POT-Creation-Date: 2001-05-20 23:59-0700\n"
-"PO-Revision-Date: 2001-05-23 22:50-07:00\n"
+"PO-Revision-Date: 2001-05-24 17:37-07:00\n"
"Last-Translator: Duarte Loreto <dlsl@poli.org>\n"
"Language-Team: Portuguese Documentation Project (POLI) <info@poli.org>\n"
"MIME-Version: 1.0\n"
@@ -2370,9 +2370,8 @@
msgstr "Fonte de Cotações"
#: src/gnome/glade-gnc-dialogs.c:3651
-#, fuzzy
msgid "Get Online Quotes"
-msgstr "Obter Cotações"
+msgstr "Obter Cotações \"Online\""
# src/gnome/glade-gnc-dialogs.c:3613
#: src/gnome/glade-gnc-dialogs.c:3672
@@ -2889,7 +2888,8 @@
"you enter matches the ticker symbol used for the commodity on the exchange\n"
"or listing for its type."
msgstr ""
-"Nas próximas páginas, ser-lhe-á pedido que disponibilize informação sobre acções, \n"
+"Nas próximas páginas, ser-lhe-á pedido que disponibilize informação sobre "
+"acções, \n"
"fundos, e outros activos transaccionáveis que surjam no(s) ficheiro(s) QIF\n"
"que está a importar. O GnuCash necessita de mais informação sobre activos \n"
"transaccionáveis do que a que o formato QIF pode representar. \n"
@@ -2899,8 +2899,10 @@
"etc), um nome completo, e uma abreviatura.\n"
"\n"
"Verifique se já existe um Tipo que seja apropriado; caso não haja, poderá\n"
-"introduzir manualmente um novo Tipo na caixa. Certifique-se que a abreviatura\n"
-"que introduzir coincide com o símbolo do \"ticker\" utilizado para o activo na\n"
+"introduzir manualmente um novo Tipo na caixa. Certifique-se que a "
+"abreviatura\n"
+"que introduzir coincide com o símbolo do \"ticker\" utilizado para o activo "
+"na\n"
"bolsa ou listagem para o seu tipo."
# src/gnome/glade-gnc-dialogs.c:4500
@@ -7045,7 +7047,6 @@
# src/engine/Account.c:1681 src/scm/guile-strings.c:99
#: src/scm/guile-strings.c:456
-#, fuzzy
msgid "Mutual Funds"
msgstr "Fundos de Investimento"
Index: gnucash/src/gnc-ui.h
diff -u gnucash/src/gnc-ui.h:1.13 gnucash/src/gnc-ui.h:1.14
--- gnucash/src/gnc-ui.h:1.13 Thu Apr 19 04:22:03 2001
+++ gnucash/src/gnc-ui.h Fri May 25 01:46:15 2001
@@ -32,19 +32,19 @@
/** Help Files ******************************************************/
#define HH_ABOUT "xacc-about.html"
#define HH_ACC "xacc-newacctwin.html"
-#define HH_REGWIN "xacc-regwin.html"
-#define HH_RECNWIN "xacc-recnwin.html"
-#define HH_ADJBWIN "xacc-adjbwin.html"
-#define HH_MAIN "index.html"
-#define HH_GPL "xacc-gpl.html"
-#define HH_GLOBPREFS "xacc-preferences.html"
#define HH_ACCEDIT "xacc-accountedit.html"
-#define HH_QIFIMPORT "xacc-qif-import.html"
-#define HH_PRINTCHECK "xacc-print-check.html"
+#define HH_ADJBWIN "xacc-adjbwin.html"
+#define HH_COMMODITY "xacc-commodity.html"
#define HH_FIND_TRANSACTIONS "xacc-locatingtxns.html"
+#define HH_GLOBPREFS "xacc-preferences.html"
+#define HH_GPL "xacc-gpl.html"
+#define HH_MAIN "index.html"
#define HH_PRINT "xacc-print.html"
-#define HH_COMMODITY "xacc-commodity.html"
-
+#define HH_PRINTCHECK "xacc-print-check.html"
+#define HH_QIFIMPORT "xacc-qif-import.html"
+#define HH_QUICKSTART "xacc-quickstart.html"
+#define HH_RECNWIN "xacc-recnwin.html"
+#define HH_REGWIN "xacc-regwin.html"
/* Dialog windows ***************************************************/
Index: gnucash/src/gnome/dialog-column-view.c
diff -u gnucash/src/gnome/dialog-column-view.c:1.10 gnucash/src/gnome/dialog-column-view.c:1.11
--- gnucash/src/gnome/dialog-column-view.c:1.10 Thu May 10 17:30:38 2001
+++ gnucash/src/gnome/dialog-column-view.c Thu May 24 15:35:00 2001
@@ -76,19 +76,21 @@
static void
update_display_lists(gnc_column_view_edit * view) {
SCM get_names = gh_eval_str("gnc:all-report-template-names");
+ SCM template_menu_name = gh_eval_str("gnc:report-template-menu-name/name");
+ SCM report_menu_name = gh_eval_str("gnc:report-menu-name");
SCM find_report = gh_eval_str("gnc:find-report");
SCM get_options = gh_eval_str("gnc:report-options");
- SCM get_option = gh_eval_str("gnc:lookup-option");
- SCM get_value = gh_eval_str("gnc:option-value");
+ SCM report_name = gh_eval_str("gnc:report-name");
SCM names = gh_call0(get_names);
SCM contents =
gnc_option_db_lookup_option(view->odb, "__general", "report-list",
SCM_BOOL_F);
- SCM this_report, this_options, this_name;
+ SCM this_report, this_name;
SCM selection;
char * name[3];
int row, i;
+ /* Update the list of available reports (left selection box). */
row = view->available_selected;
if(gh_list_p(view->available_list) && !gh_null_p (view->available_list)) {
@@ -109,7 +111,8 @@
for(i = 0; !gh_null_p(names); names = gh_cdr(names), i++) {
if (gh_equal_p (gh_car(names), selection))
row = i;
- name[0] = gh_scm2newstr(gh_car(names), NULL);
+ name[0] = gh_scm2newstr(gh_call1(template_menu_name, gh_car(names)),
+ NULL);
gtk_clist_append(view->available, name);
free(name[0]);
}
@@ -118,6 +121,7 @@
gtk_clist_thaw(view->available);
+ /* Update the list of selected reports (right selection box). */
row = view->contents_selected;
if(gh_list_p(view->contents_list) && !gh_null_p (view->contents_list)) {
@@ -140,11 +144,8 @@
row = i;
this_report = gh_call1(find_report, gh_caar(contents));
- this_options = gh_call1(get_options, this_report);
- this_name = gh_call1(get_value,
- gh_call3(get_option, this_options,
- gh_str02scm("General"),
- gh_str02scm("Report name")));
+ /* this_name = gh_call1(report_name, this_report); */
+ this_name = gh_call1(report_menu_name, this_report);
name[0] = gh_scm2newstr(this_name, NULL);
name[1] = g_strdup_printf("%d", gh_scm2int(gh_cadr(gh_car(contents))));
name[2] = g_strdup_printf("%d", gh_scm2int(gh_caddr(gh_car(contents))));
Index: gnucash/src/gnome/gnc-html-guppi.c
diff -u gnucash/src/gnome/gnc-html-guppi.c:1.16 gnucash/src/gnome/gnc-html-guppi.c:1.17
--- gnucash/src/gnome/gnc-html-guppi.c:1.16 Sat May 12 18:03:10 2001
+++ gnucash/src/gnome/gnc-html-guppi.c Fri May 25 02:38:29 2001
@@ -384,18 +384,19 @@
}
static gboolean
-gnc_has_guppi_0_35_4 (void)
+gnc_has_guppi_version(int major, int minor, int micro)
{
- if (guppi_version_major () > 0)
+ if (guppi_version_major () > major)
return TRUE;
+ if (guppi_version_major () < major)
+ return FALSE;
- if (guppi_version_minor () > 35)
+ if (guppi_version_minor () > minor)
return TRUE;
-
- if (guppi_version_minor () < 35)
+ if (guppi_version_minor () < minor)
return FALSE;
- return (guppi_version_micro () > 3);
+ return (guppi_version_micro () >= micro);
}
/********************************************************************
@@ -621,15 +622,17 @@
argind++;
}
- /* Those are not yet implemented in libguppitank :( */
#if 0
- if((param = g_hash_table_lookup(params, "x_axis_label")) != NULL) {
+ /* These still give segfault, regardless of what you do. Shit. */
+ if(gnc_has_guppi_version(0,35,6) &&
+ (param = g_hash_table_lookup(params, "x_axis_label")) != NULL) {
arglist[argind].name = "x_axis_label";
arglist[argind].type = GTK_TYPE_POINTER;
GTK_VALUE_POINTER(arglist[argind]) = param;
argind++;
}
- if((param = g_hash_table_lookup(params, "y_axis_label")) != NULL) {
+ if(gnc_has_guppi_version(0,35,6) &&
+ (param = g_hash_table_lookup(params, "y_axis_label")) != NULL) {
arglist[argind].name = "y_axis_label";
arglist[argind].type = GTK_TYPE_POINTER;
GTK_VALUE_POINTER(arglist[argind]) = param;
@@ -755,7 +758,7 @@
datarows*datacols);
g_free(callbacks);
}
- if(gnc_has_guppi_0_35_4 () &&
+ if(gnc_has_guppi_version(0,35,4) &&
(param = g_hash_table_lookup(params, "legend_reversed")) != NULL) {
sscanf(param, "%d", &rotate);
arglist[argind].name = "legend_reversed";
@@ -763,7 +766,7 @@
GTK_VALUE_BOOL(arglist[argind]) = rotate;
argind++;
}
- if(gnc_has_guppi_0_35_4 () &&
+ if(gnc_has_guppi_version(0,35,4) &&
(param = g_hash_table_lookup(params, "stacked")) != NULL) {
sscanf(param, "%d", &stacked);
arglist[argind].name = "stacked";
@@ -771,7 +774,7 @@
GTK_VALUE_BOOL(arglist[argind]) = stacked;
argind++;
}
- if(gnc_has_guppi_0_35_4 () &&
+ if(gnc_has_guppi_version(0,35,4) &&
(param = g_hash_table_lookup(params, "normalize_stacks")) != NULL) {
sscanf(param, "%d", &normalize_stacks);
arglist[argind].name = "normalize_stacks";
Index: gnucash/src/gnome/new-user-funs.c
diff -u gnucash/src/gnome/new-user-funs.c:1.9 gnucash/src/gnome/new-user-funs.c:1.10
--- gnucash/src/gnome/new-user-funs.c:1.9 Mon May 21 16:27:33 2001
+++ gnucash/src/gnome/new-user-funs.c Fri May 25 01:46:17 2001
@@ -393,8 +393,7 @@
}
else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tutorial_button)))
{
- /* FIXME: change to tutorial */
- helpWindow (NULL, NULL, HH_ABOUT);
+ helpWindow (NULL, NULL, HH_QUICKSTART);
}
gncp_new_user_finish ();
Index: gnucash/src/gnome/window-main.c
diff -u gnucash/src/gnome/window-main.c:1.127 gnucash/src/gnome/window-main.c:1.128
--- gnucash/src/gnome/window-main.c:1.127 Mon May 21 16:42:15 2001
+++ gnucash/src/gnome/window-main.c Fri May 25 02:32:25 2001
@@ -816,6 +816,17 @@
gnc_main_window_file_close_cb(GtkWidget * widget, GnomeMDI * mdi) {
GNCMainChildInfo * inf;
+ if (!mdi)
+ {
+ GNCMainInfo *main_info;
+
+ main_info = gnc_ui_get_data ();
+ if (!main_info) return;
+
+ mdi = main_info->mdi;
+ if (!mdi) return;
+ }
+
if(mdi->active_child) {
inf = gtk_object_get_user_data(GTK_OBJECT(mdi->active_child));
if(inf->toolbar) {
@@ -1081,6 +1092,16 @@
NULL,
GNOME_APP_PIXMAP_STOCK,
GNOME_STOCK_PIXMAP_SAVE,
+ 0, 0, NULL
+ },
+ { GNOME_APP_UI_ITEM,
+ N_("Close"),
+ N_("Close the current notebook page"),
+ gnc_main_window_file_close_cb,
+ NULL,
+ NULL,
+ GNOME_APP_PIXMAP_STOCK,
+ GNOME_STOCK_PIXMAP_CLOSE,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR
Index: gnucash/src/scm/html-utilities.scm
diff -u gnucash/src/scm/html-utilities.scm:1.39 gnucash/src/scm/html-utilities.scm:1.40
--- gnucash/src/scm/html-utilities.scm:1.39 Wed May 16 02:52:46 2001
+++ gnucash/src/scm/html-utilities.scm Fri May 25 01:33:06 2001
@@ -655,20 +655,25 @@
table))
-(define (gnc:html-make-no-account-warning)
+(define (gnc:html-make-no-account-warning report-title-string)
(let ((p (gnc:make-html-text)))
(gnc:html-text-append!
p
+ (gnc:html-markup-h2 (string-append
+ report-title-string
+ ":"))
(gnc:html-markup-h2 (_ "No accounts selected"))
(gnc:html-markup-p
(_ "This report requires accounts to be selected.")))
p))
-(define (gnc:html-make-empty-data-warning)
+(define (gnc:html-make-empty-data-warning report-title-string)
(let ((p (gnc:make-html-text)))
(gnc:html-text-append!
p
+ (gnc:html-markup-h2
+ (string-append report-title-string ":"))
(gnc:html-markup-h2 (_ "No data"))
(gnc:html-markup-p
- (_ "The selected accounts contain no data (or only zeroes) for the selected time period")))
+ (_ "The selected accounts contain no data/transactions (or only zeroes) for the selected time period")))
p))
Index: gnucash/src/scm/options-utilities.scm
diff -u gnucash/src/scm/options-utilities.scm:1.13 gnucash/src/scm/options-utilities.scm:1.14
--- gnucash/src/scm/options-utilities.scm:1.13 Wed May 23 19:43:55 2001
+++ gnucash/src/scm/options-utilities.scm Thu May 24 15:35:02 2001
@@ -248,7 +248,7 @@
pagename name-width
(string-append sort-tag "a")
(N_ "Width of plot in pixels.") default-width
- 100 1000 0 1))
+ 100 20000 0 5))
(gnc:register-option
options
@@ -256,7 +256,7 @@
pagename name-height
(string-append sort-tag "b")
(N_ "Height of plot in pixels.") default-height
- 100 1000 0 1)))
+ 100 20000 0 5)))
;; A multicoice option for the marker of a scatter plot.
(define (gnc:options-add-marker-choice!
Index: gnucash/src/scm/report.scm
diff -u gnucash/src/scm/report.scm:1.50 gnucash/src/scm/report.scm:1.51
--- gnucash/src/scm/report.scm:1.50 Fri May 18 05:00:14 2001
+++ gnucash/src/scm/report.scm Thu May 24 15:35:02 2001
@@ -213,6 +213,13 @@
(gnc:report-template-new-options templ)
#f)))
+(define (gnc:report-template-menu-name/name template-name)
+ (let ((templ (hash-ref *gnc:_report-templates_* template-name)))
+ (if templ
+ (or (gnc:report-template-menu-name templ)
+ (gnc:report-template-name templ))
+ #f)))
+
(define (gnc:report-template-new-options report-template)
(let ((generator (gnc:report-template-options-generator report-template))
(namer
@@ -371,6 +378,14 @@
(gnc:report-type report))))
(if template
(gnc:report-template-export-thunk template)
+ #f)))
+
+(define (gnc:report-menu-name report)
+ (let ((template (hash-ref *gnc:_report-templates_*
+ (gnc:report-type report))))
+ (if template
+ (or (gnc:report-template-menu-name template)
+ (gnc:report-name report))
#f)))
(define (gnc:report-name report)
Index: gnucash/src/scm/tip-list.scm
diff -u gnucash/src/scm/tip-list.scm:1.12 gnucash/src/scm/tip-list.scm:1.13
--- gnucash/src/scm/tip-list.scm:1.12 Thu May 24 02:20:05 2001
+++ gnucash/src/scm/tip-list.scm Fri May 25 01:33:07 2001
@@ -94,7 +94,7 @@
(N_ "There is a theory that if ever anyone discovers what
the Universe is for and why it is here, it will instantly
-disappear and be replace with something even more bizarre and
+disappear and be replaced with something even more bizarre and
inexplicable.
There is another theory that this has already happened.
Douglas Adams, \"The Restaurant at the End of the Universe\"")
Index: gnucash/src/scm/report/account-piecharts.scm
diff -u gnucash/src/scm/report/account-piecharts.scm:1.19 gnucash/src/scm/report/account-piecharts.scm:1.20
--- gnucash/src/scm/report/account-piecharts.scm:1.19 Sat May 12 03:41:00 2001
+++ gnucash/src/scm/report/account-piecharts.scm Fri May 25 01:33:08 2001
@@ -392,11 +392,11 @@
(gnc:html-document-add-object!
document
- (gnc:html-make-empty-data-warning))))
+ (gnc:html-make-empty-data-warning report-title))))
(gnc:html-document-add-object!
document
- (gnc:html-make-no-account-warning)))
+ (gnc:html-make-no-account-warning report-title)))
document)))
Index: gnucash/src/scm/report/account-summary.scm
diff -u gnucash/src/scm/report/account-summary.scm:1.39 gnucash/src/scm/report/account-summary.scm:1.41
--- gnucash/src/scm/report/account-summary.scm:1.39 Sat May 12 03:41:01 2001
+++ gnucash/src/scm/report/account-summary.scm Fri May 25 02:32:27 2001
@@ -151,10 +151,13 @@
(gnc:date-option-absolute-time
(get-option gnc:pagename-general
optname-date))))
+ (report-title (get-option gnc:pagename-general
+ gnc:optname-reportname))
(doc (gnc:make-html-document))
(txt (gnc:make-html-text)))
- (gnc:html-document-set-title! doc (_ "Account Summary"))
+ (gnc:html-document-set-title! doc report-title)
+
(if (not (null? accounts))
;; if no max. tree depth is given we have to find the
;; maximum existing depth
@@ -192,7 +195,8 @@
;; error condition: no accounts specified
(gnc:html-document-add-object!
doc
- (gnc:html-make-no-account-warning)))
+ (gnc:html-make-no-account-warning report-title)))
+
doc))
(gnc:define-report
Index: gnucash/src/scm/report/average-balance.scm
diff -u gnucash/src/scm/report/average-balance.scm:1.58 gnucash/src/scm/report/average-balance.scm:1.60
--- gnucash/src/scm/report/average-balance.scm:1.58 Sun May 13 18:30:37 2001
+++ gnucash/src/scm/report/average-balance.scm Fri May 25 02:12:36 2001
@@ -36,7 +36,7 @@
options gnc:pagename-general optname-from-date optname-to-date "a")
(gnc:options-add-interval-choice!
- options gnc:pagename-general optname-stepsize "b" 'TwoWeekDelta)
+ options gnc:pagename-general optname-stepsize "b" 'MonthDelta)
;; Report currency
(gnc:options-add-currency!
@@ -88,12 +88,10 @@
(gnc:make-list-option
gnc:pagename-display (N_ "Plot Type")
"c" (N_ "The type of graph to generate") (list 'AvgBalPlot)
- (list (list->vector
- (list 'AvgBalPlot (N_ "Average") (N_ "Average Balance")))
- (list->vector
- (list 'GainPlot (N_ "Net Gain") (N_ "Net Gain")))
- (list->vector
- (list 'GLPlot (N_ "Gain/Loss") (N_ "Gain And Loss"))))))
+ (list
+ (vector 'AvgBalPlot (N_ "Average") (N_ "Average Balance"))
+ (vector 'GainPlot (N_ "Profit") (N_ "Profit (Gain minus Loss)"))
+ (vector 'GLPlot (N_ "Gain/Loss") (N_ "Gain And Loss")))))
(gnc:options-add-plot-size!
options gnc:pagename-display (N_ "Plot Width") (N_ "Plot Height")
@@ -109,9 +107,11 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
(define columns
- (list (_ "Period start") (_ "Period end") (_ "Avg Bal")
- (_ "Max Bal") (_ "Min Bal") (_ "Total In")
- (_ "Total Out") (_ "Net Change") ))
+ ;; Watch out -- these names should be consistent with the display
+ ;; option where you choose them, otherwise users are confused.
+ (list (_ "Period start") (_ "Period end") (_ "Average")
+ (_ "Maximum") (_ "Minimum") (_ "Gain")
+ (_ "Loss") (_ "Profit") ))
;; analyze-splits crunches a split list into a set of period
;; summaries. Each summary is a list of (start-date end-date
@@ -293,9 +293,16 @@
(beforebegindate (gnc:timepair-end-day-time
(gnc:timepair-previous-day begindate)))
+ (all-zeros? #t)
;; startbal will be a commodity-collector
(startbal '()))
+ (define (list-all-zeros? alist)
+ (if (null? alist) #t
+ (if (not (= 0.0 (car alist)))
+ #f
+ (list-all-zeros? (cdr alist)))))
+
(define (monetary->double foreign-monetary date)
(gnc:numeric-to-double
(gnc:gnc-monetary-amount
@@ -378,61 +385,87 @@
(col-labels '())
(col-colors '()))
(if (memq 'AvgBalPlot plot-type)
- (begin
- (gnc:html-barchart-append-column!
- barchart
- (map (lambda (row) (list-ref row 2)) data))
- (set! col-labels
- (append col-labels
- (list (list-ref columns 2))))
- (set! col-colors
- (append col-colors (list "blue")))))
+ (let
+ ((number-data
+ (map
+ (lambda (row) (list-ref row 2)) data)))
+ (if (not (list-all-zeros? number-data))
+ (begin
+ (gnc:html-barchart-append-column!
+ barchart
+ (map (lambda (row) (list-ref row 2)) data))
+ (set! col-labels
+ (append col-labels
+ (list (list-ref columns 2))))
+ (set! col-colors
+ (append col-colors (list "blue")))
+ (set! all-zeros? #f)))))
+
(if (memq 'GainPlot plot-type)
- (begin
- (gnc:html-barchart-append-column!
- barchart
- (map (lambda (row) (list-ref row 7)) data))
- (set! col-labels
- (append col-labels
- (list (list-ref columns 7))))
- (set! col-colors
- (append col-colors (list "green")))))
+ (let ((number-data
+ (map (lambda (row) (list-ref row 7)) data)))
+ (if (not (list-all-zeros? number-data))
+ (begin
+ (gnc:html-barchart-append-column!
+ barchart
+ (map (lambda (row) (list-ref row 7)) data))
+ (set! col-labels
+ (append col-labels
+ (list (list-ref columns 7))))
+ (set! col-colors
+ (append col-colors (list "green")))
+ (set! all-zeros? #f)))))
+
(if (memq 'GLPlot plot-type)
- (begin
+ (let ((debit-data
+ (map (lambda (row) list-ref row 5) data))
+ (credit-data
+ (map (lambda (row) list-ref row 6) data)))
;; debit column
- (gnc:html-barchart-append-column!
- barchart
- (map (lambda (row) (list-ref row 5)) data))
- (set! col-labels
- (append col-labels
- (list (list-ref columns 5))))
- (set! col-colors
- (append col-colors (list "black")))
-
- ;; credit
- (gnc:html-barchart-append-column!
- barchart
- (map (lambda (row) (list-ref row 6)) data))
- (set! col-labels
- (append col-labels
- (list (list-ref columns 6))))
- (set! col-colors
- (append col-colors (list "red")))))
-
- (gnc:html-barchart-set-col-labels!
- barchart col-labels)
- (gnc:html-barchart-set-col-colors!
- barchart col-colors)
- (gnc:html-barchart-set-row-labels!
- barchart (map car data))
- (gnc:html-barchart-set-row-labels-rotated?! barchart #t)
-
- (gnc:html-barchart-set-width! barchart width)
- (gnc:html-barchart-set-height! barchart height)
- (gnc:html-barchart-set-height! barchart height)
- (gnc:html-document-add-object! document barchart)))
-
+ (if (not (and
+ (list-all-zeros? debit-data)
+ (list-all-zeros? credit-data)))
+ (begin
+ (gnc:html-barchart-append-column!
+ barchart
+ number-data)
+ (set! col-labels
+ (append col-labels
+ (list (list-ref columns 5))))
+ (set! col-colors
+ (append col-colors (list "black")))
+
+ ;; credit
+ (gnc:html-barchart-append-column!
+ barchart
+ (map (lambda (row) (list-ref row 6)) data))
+ (set! col-labels
+ (append col-labels
+ (list (list-ref columns 6))))
+ (set! col-colors
+ (append col-colors (list "red")))
+ (set all-zeros? #f)))))
+
+ (if (not all-zeros?)
+ (begin
+ (gnc:html-barchart-set-col-labels!
+ barchart col-labels)
+ (gnc:html-barchart-set-col-colors!
+ barchart col-colors)
+ (gnc:html-barchart-set-row-labels!
+ barchart (map car data))
+ (gnc:html-barchart-set-row-labels-rotated?! barchart #t)
+
+ (gnc:html-barchart-set-width! barchart width)
+ (gnc:html-barchart-set-height! barchart height)
+ (gnc:html-barchart-set-height! barchart height)
+ (gnc:html-document-add-object! document barchart))
+ (gnc:html-document-add-object!
+ document
+ (gnc:html-make-empty-data-warning
+ (_ "Average Balance"))))))
+
;; make a table (optionally)
(if show-table?
(let ((table (gnc:make-html-table)))
Index: gnucash/src/scm/report/balance-sheet.scm
diff -u gnucash/src/scm/report/balance-sheet.scm:1.23 gnucash/src/scm/report/balance-sheet.scm:1.24
--- gnucash/src/scm/report/balance-sheet.scm:1.23 Sat May 12 03:41:01 2001
+++ gnucash/src/scm/report/balance-sheet.scm Fri May 25 01:33:09 2001
@@ -325,7 +325,7 @@
;; error condition: no accounts specified
(gnc:html-document-add-object!
- doc (gnc:html-make-no-account-warning)))
+ doc (gnc:html-make-no-account-warning (_ "Balance Sheet"))))
doc))
(gnc:define-report
Index: gnucash/src/scm/report/category-barchart.scm
diff -u gnucash/src/scm/report/category-barchart.scm:1.26 gnucash/src/scm/report/category-barchart.scm:1.27
--- gnucash/src/scm/report/category-barchart.scm:1.26 Tue May 15 01:27:15 2001
+++ gnucash/src/scm/report/category-barchart.scm Fri May 25 01:33:10 2001
@@ -468,12 +468,12 @@
;; else if empty data
(gnc:html-document-add-object!
document
- (gnc:html-make-empty-data-warning))))
+ (gnc:html-make-empty-data-warning report-title))))
;; else if no accounts selected
(gnc:html-document-add-object!
document
- (gnc:html-make-no-account-warning)))
+ (gnc:html-make-no-account-warning report-title)))
document))
Index: gnucash/src/scm/report/net-barchart.scm
diff -u gnucash/src/scm/report/net-barchart.scm:1.6 gnucash/src/scm/report/net-barchart.scm:1.7
--- gnucash/src/scm/report/net-barchart.scm:1.6 Sat May 12 18:03:13 2001
+++ gnucash/src/scm/report/net-barchart.scm Fri May 25 01:33:11 2001
@@ -172,7 +172,8 @@
gnc:timepair-end-day-time) from-date-tp)
(gnc:timepair-end-day-time to-date-tp)
(eval interval)))
-
+ (report-title (if inc-exp? (_ "Income/Expense Chart")
+ (_ "Net Worth Chart")))
(classified-accounts (gnc:decompose-accountlist accounts))
(document (gnc:make-html-document))
(chart (gnc:make-html-barchart))
@@ -245,8 +246,7 @@
dates-list)))
(gnc:html-barchart-set-title!
- chart (if inc-exp? (_ "Income/Expense Chart")
- (_ "Net Worth Chart")))
+ chart report-title)
(gnc:html-barchart-set-subtitle!
chart (sprintf #f
(_ "%s to %s")
@@ -335,12 +335,12 @@
(gnc:html-document-add-object! document chart)
(gnc:html-document-add-object!
document
- (gnc:html-make-empty-data-warning))))
+ (gnc:html-make-empty-data-warning report-title))))
;; else no accounts selected
(gnc:html-document-add-object!
document
- (gnc:html-make-no-account-warning)))
+ (gnc:html-make-no-account-warning report-title)))
document))
Index: gnucash/src/scm/report/pnl.scm
diff -u gnucash/src/scm/report/pnl.scm:1.23 gnucash/src/scm/report/pnl.scm:1.24
--- gnucash/src/scm/report/pnl.scm:1.23 Sat May 12 03:41:01 2001
+++ gnucash/src/scm/report/pnl.scm Fri May 25 01:33:11 2001
@@ -122,7 +122,7 @@
(gnc:report-options report-obj) pagename optname)))
;; get all option's values
- (let ((display-depth (get-option gnc:pagename-accounts
+ (let* ((display-depth (get-option gnc:pagename-accounts
optname-display-depth))
(show-subaccts? (get-option gnc:pagename-accounts
optname-show-subaccounts))
@@ -151,13 +151,14 @@
(gnc:date-option-absolute-time
(get-option gnc:pagename-general
optname-from-date))))
+ (report-title (sprintf #f
+ (_ "Profit and Loss - %s to %s")
+ (gnc:timepair-to-datestring from-date-tp)
+ (gnc:timepair-to-datestring to-date-tp)))
(doc (gnc:make-html-document)))
(gnc:html-document-set-title!
- doc (sprintf #f
- (_ "Profit and Loss - %s to %s")
- (gnc:timepair-to-datestring from-date-tp)
- (gnc:timepair-to-datestring to-date-tp)))
+ doc report-title)
(if (not (null? accounts))
;; if no max. tree depth is given we have to find the
;; maximum existing depth
@@ -195,7 +196,7 @@
;; error condition: no accounts specified
(gnc:html-document-add-object!
- doc (gnc:html-make-no-account-warning)))
+ doc (gnc:html-make-no-account-warning report-title)))
doc))
(gnc:define-report
Index: gnucash/src/scm/report/portfolio.scm
diff -u gnucash/src/scm/report/portfolio.scm:1.14 gnucash/src/scm/report/portfolio.scm:1.15
--- gnucash/src/scm/report/portfolio.scm:1.14 Tue May 15 02:34:15 2001
+++ gnucash/src/scm/report/portfolio.scm Fri May 25 01:33:11 2001
@@ -217,7 +217,7 @@
;if no accounts selected.
(gnc:html-document-add-object!
- document (gnc:html-make-no-account-warning)))
+ document (gnc:html-make-no-account-warning report-title)))
document))
Index: gnucash/src/scm/report/transaction-report.scm
diff -u gnucash/src/scm/report/transaction-report.scm:1.67 gnucash/src/scm/report/transaction-report.scm:1.68
--- gnucash/src/scm/report/transaction-report.scm:1.67 Wed May 23 13:03:08 2001
+++ gnucash/src/scm/report/transaction-report.scm Fri May 25 01:33:11 2001
@@ -1052,7 +1052,7 @@
(gnc:html-document-add-object!
document
- (gnc:html-make-no-account-warning)))
+ (gnc:html-make-no-account-warning report-title)))
document))