gnucash-docs maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Mon Apr 2 12:15:07 EDT 2018
Updated via https://github.com/Gnucash/gnucash-docs/commit/5d546c0a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/1c6d6736 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/5598832d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/7f951fca (commit)
via https://github.com/Gnucash/gnucash-docs/commit/0aa3512d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/27eb3606 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/6c7cad27 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ba7ca7a8 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ed448048 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3b07d4ba (commit)
via https://github.com/Gnucash/gnucash-docs/commit/7cb12e64 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4e9072d6 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d553796f (commit)
via https://github.com/Gnucash/gnucash-docs/commit/09c85eeb (commit)
via https://github.com/Gnucash/gnucash-docs/commit/1afa19ea (commit)
via https://github.com/Gnucash/gnucash-docs/commit/dd91e512 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d1a80db0 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/62b0a0cd (commit)
via https://github.com/Gnucash/gnucash-docs/commit/1248daf8 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/fffa817c (commit)
via https://github.com/Gnucash/gnucash-docs/commit/b9a2721b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/7a0077d7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ab2539fc (commit)
via https://github.com/Gnucash/gnucash-docs/commit/8bb6d01a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/98692dea (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ab268fcd (commit)
via https://github.com/Gnucash/gnucash-docs/commit/9afce47d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/e5b343a0 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/50ed4eb3 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/e85643b9 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/04d21916 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/36650325 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/0602cc7b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/21af0e3a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f332e997 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/6ac6de00 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d649fb74 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/430feccc (commit)
via https://github.com/Gnucash/gnucash-docs/commit/dc8ecbd4 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ab6dab8a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/cf669822 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d10b1d31 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/bd8d9fb3 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/675ca9e6 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3c6247ea (commit)
via https://github.com/Gnucash/gnucash-docs/commit/91be847a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/06637366 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/7117731a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f31dd150 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4e33c3f8 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/42f42f90 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/672dcdff (commit)
via https://github.com/Gnucash/gnucash-docs/commit/21797f1b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/b99c5701 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/8fb47e8f (commit)
via https://github.com/Gnucash/gnucash-docs/commit/2cd20446 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3ae473b6 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4d5307a6 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/27459473 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d78c9804 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/930d4204 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/252d5af8 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/5fc6ad9b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/6633dc6b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/37d79858 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/6a4395f0 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d1c7da46 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/01eb36b7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/719cd6ee (commit)
via https://github.com/Gnucash/gnucash-docs/commit/959ec94f (commit)
via https://github.com/Gnucash/gnucash-docs/commit/0ef8a4af (commit)
via https://github.com/Gnucash/gnucash-docs/commit/5fb2de8e (commit)
via https://github.com/Gnucash/gnucash-docs/commit/b85a1273 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/17f13dcc (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3fe72357 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3e3c6bd9 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3849d0a3 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/10de2a23 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/91e14b60 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/0db4bd9c (commit)
via https://github.com/Gnucash/gnucash-docs/commit/58af6237 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ef88bb0a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/cae33665 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/5df1ffae (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ec46eebb (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4d677136 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/fef3a81d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/85eb4bd4 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/590a69cc (commit)
via https://github.com/Gnucash/gnucash-docs/commit/bf117a60 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/24eb5bff (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f1c65980 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/80f4fd8a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/70713d9d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/75231c1d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/59fd368b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/874ac13b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/39888bb0 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4a9ea1c3 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/8602edf4 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/5e976a38 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/34252dce (commit)
via https://github.com/Gnucash/gnucash-docs/commit/b3005534 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/062389db (commit)
via https://github.com/Gnucash/gnucash-docs/commit/538d99d5 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4c545ebf (commit)
via https://github.com/Gnucash/gnucash-docs/commit/bcabd189 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/32ea7d72 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/80eed8cc (commit)
via https://github.com/Gnucash/gnucash-docs/commit/0002d877 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/dcbd5097 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/0bd0bc4c (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f3dbb107 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/6a5083c3 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/37f6a51c (commit)
from https://github.com/Gnucash/gnucash-docs/commit/561df8de (commit)
commit 5d546c0a39dbe28718c7175090020df9474d6f1f
Merge: 1c6d673 561df8d
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 2 09:14:18 2018 -0700
Merge branch 'maint'
commit 1c6d673667ad190c8f2eb07d2cb7741e5fa5b659
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 1 14:09:20 2018 -0700
Release Documentation for Gnucash 3.0.
diff --git a/NEWS b/NEWS
index f368392..19fb8be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,36 @@
Version History
---------------
+ 3.0 - 1 April 2018
+ o Correct field format in python-import-fields.
+ o German translation of Transactions chapter.
+ o Bug 122895 - general ledger should be named journal
+ o Bug 634181 - Inserting Part designations overall
+ o Bug 608098 - Document Transaction Rpt, including how to handle splits
+ o Clarify that creating a postponed SX will use the original date.
+ o Remove 'Remainder To' from loan assistant page 2.
+ o Bug 760407 - Note account separator isn't always a colon.
+ o Update partial date entry documentation based on new default behaviour
+ o Bug 762088 - Remove Section 9.4.3 From Guide
+ o New Russian translation o fthe guide.
+ o Fix chm mapfile target and cleanfiles.
+ The mapfile target would fail if the directory was already built,
+ apparently not recognizing that its target was complete.
+ Cleanfiles was missing several build targets.
+ o New Transaction Report section in Guide
+ o Replace some screenshots with new ones reflecting Gtk3.
+ 2.6.20 - 1 April 2018
+ o Bug 793844 - GnuCash Tutorial and Concepts Guide 13.4.5. Process
+ Payment says Accounts Receivable, should be Payable
+ o Link the referenced 'Simple Transaction Example' in Transactions
+ 'Opening Balances'
+ o Add a link from '8.5.1. Loan Specifications' to '8.3. Calculations'
+ o Add required F::Q version for Bug 770132 - Price editor does not
+ find ASX:XRO
+ o Add note from bugzilla to ASX in appendix
+ https://bugzilla.gnome.org/show_bug.cgi?id=770132#c12
+ o Add Preference Online Quotes
+ o Bug 792756 - Help Manual 8.10 incorrect lin
+
2.6.19 - 16 December 2017
o Bug 782423 - Help 10.2. Setting Preferences is outdated #105
o Changing text in Help to reflect changes in Preferences dialogs.
diff --git a/configure.ac b/configure.ac
index feb1f28..9af6c1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# copyright (c) 2003-2016 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gnucash-docs], [2.6.99], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/])
+AC_INIT([gnucash-docs], [3.0], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/])
AC_CANONICAL_HOST
dnl ==========================================================================
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index b8e548b..9fb4108 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -39,12 +39,12 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -73,7 +73,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -152,6 +152,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.20</revnumber>
<date>1 April 2018</date>
<revdescription>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 7908873..6041385 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -45,12 +45,12 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -82,7 +82,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -178,6 +178,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.20</revnumber>
<date>1 April 2018</date>
<revdescription>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index bc08bc3..842df3e 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -36,12 +36,12 @@
NOTE: The underlying it.po file needs to be brought up to date so
that xml2po can make a new gnucash-guide.xml. Until that time this
file is frozen; do not update revisions or copyrights.
---><!ENTITY manrevision "2.6.20">
+--><!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -68,7 +68,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -80,7 +80,7 @@
<!-- appropriate code -->
<bookinfo>
<title>Guida ai concetti e manuale di <application>&app;</application></title>
- <edition>V2.6.20</edition>
+ <edition>v3.0</edition>
<copyright>
<year>2009-2018</year>
@@ -163,6 +163,14 @@
<revhistory>
<revision>
+ <revnumber>GnuCash Tutorial and Concepts Guide v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Autori multipli</para>
+ <para role="publisher">Gruppo della documentazione di &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>GnuCash Tutorial and Concepts Guide v2.6.20</revnumber>
<date>1 April 2018</date>
<revdescription>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index c4410b4..d7ab9c1 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -37,12 +37,12 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.14">
+<!ENTITY manrevision "2.4.1">
<!ENTITY date "17 September 2016">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.14">
+<!ENTITY vers-stable "3.0">
<!ENTITY series-unstable "master">
-<!ENTITY series-stable "2.6">
+<!ENTITY series-stable "3.0">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -61,11 +61,11 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.13
- Last modified: 26 June 2016
+ Version: 2.2.1
+ Last modified: September 26, 2010
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
- Translators:
+ Translators: Yasuaki Taniguchi
(translators put your name and email here)
-->
<book id="index" lang="ja-JP">
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 3c13009..c7c06ac 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -41,12 +41,12 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 de abril de 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3.0">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -75,7 +75,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -155,7 +155,15 @@
<revhistory>
<revision>
- <revnumber>&app;Tutorial e guia de conceitos v2.6.16</revnumber>
+ <revnumber>&app;Tutorial e guia de conceitos v3.0</revnumber>
+ <date>1 de abril de 2018</date>
+ <revdescription>
+ <para role="author">Múltiplos autores</para>
+ <para role="publisher">Equipa de documentação do &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>&app;Tutorial e guia de conceitos v2.6.20</revnumber>
<date>1 de abril de 2018</date>
<revdescription>
<para role="author">Múltiplos autores</para>
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index 32d8d80..852569e 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -39,12 +39,12 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -73,7 +73,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -163,6 +163,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.20</revnumber>
<date>1 April 2018</date>
<revdescription>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index b5f8cce..581fddc 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -31,12 +31,12 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
-<!ENTITY vers-unstable "2.7.8">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-unstable "master">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -58,7 +58,7 @@
]>
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -103,6 +103,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Help Manual v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Help Manual v2.6.20</revnumber>
<date>1 April 2018</date>
<revdescription>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index b203af0..896b2b1 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -28,12 +28,12 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
-<!ENTITY vers-unstable "2.7.8">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-unstable "master">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master.7">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -63,7 +63,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -132,6 +132,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Hilfe v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple Authors </para>
+ <para role="publisher">&app; Development Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Hilfe v2.6.20</revnumber>
<date>1 April 2018</date>
<revdescription>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index c6c2e2c..c0c4b23 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -28,12 +28,12 @@
NOTE: The underlying it.po file needs to be brought up to date so
that xml2po can make a new gnucash-help.xml. Until that time this
file is frozen; do not update revisions or copyrights.
---><!ENTITY manrevision "2.6.20">
+--><!ENTITY manrevision "3.0">
<!ENTITY date "1 April 2018">
-<!ENTITY vers-unstable "2.7.8">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-unstable "master">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -60,7 +60,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -73,7 +73,7 @@
<bookinfo>
<title>Manuale di aiuto di <application>&app;</application></title>
- <edition>v2.6.14</edition>
+ <edition>v3.0</edition>
<copyright>
<year>2002-2018</year>
@@ -227,6 +227,14 @@
<revhistory>
<revision>
+ <revnumber>GnuCash Help Manual v3.0</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Vari autori</para>
+ <para role="publisher">Gruppo della documentazione di &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>GnuCash Help Manual v2.6.11</revnumber>
<date>11 January 2016</date>
<revdescription>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index f875957..f3fe04f 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -29,12 +29,12 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.20">
+<!ENTITY manrevision "3.0">
<!ENTITY date "1 de abril de 2018">
-<!ENTITY vers-unstable "2.7.8">
-<!ENTITY vers-stable "2.6.20">
-<!ENTITY series-unstable "2.7">
-<!ENTITY series-stable "2.6">
+<!ENTITY vers-unstable "master">
+<!ENTITY vers-stable "3.0">
+<!ENTITY series-unstable "master">
+<!ENTITY series-stable "3">
<!--
Translators:
"&app;" replaces all occurences of "GnuCash" in the guide, so
@@ -64,7 +64,7 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.20
+ Version: 3.0
Last modified: 2 de abril de 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
@@ -110,6 +110,14 @@
<revhistory>
<revision>
+ <revnumber>Manual de ajuda do &app; v3.0</revnumber>
+ <date>1 de abril de 2018</date>
+ <revdescription>
+ <para role="author">Múltiplos autores</para>
+ <para role="publisher">Equipa de documentação do &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>Manual de ajuda do &app; v2.6.20</revnumber>
<date>1 de abril de 2018</date>
<revdescription>
commit 5598832dba14c42ed785c57be4cc598143d8053c
Merge: 7f951fc 27eb360
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 31 18:09:03 2018 -0700
Merge branch 'maint'
commit 7f951fca4d58cf73e4feb43f7decc4f42c83fbc0
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 29 14:26:29 2018 -0700
Replace the easy screenshots with Gtk3 ones.
Most of the screenshots in the Guide require setting up an empty book and
then following the process in the section, snapping illustrations as you
go. I didn't have time for that, but this is at least a start.
diff --git a/guide/C/figures/accts_CreateAssetsAccount.png b/guide/C/figures/accts_CreateAssetsAccount.png
index 5f9be29..794cdd5 100644
Binary files a/guide/C/figures/accts_CreateAssetsAccount.png and b/guide/C/figures/accts_CreateAssetsAccount.png differ
diff --git a/guide/C/figures/accts_DefaultExpenseAccounts.png b/guide/C/figures/accts_DefaultExpenseAccounts.png
index cabb724..bf02655 100644
Binary files a/guide/C/figures/accts_DefaultExpenseAccounts.png and b/guide/C/figures/accts_DefaultExpenseAccounts.png differ
diff --git a/guide/C/figures/accts_DefaultIncomeAccounts.png b/guide/C/figures/accts_DefaultIncomeAccounts.png
index 00d5f5e..261c37c 100644
Binary files a/guide/C/figures/accts_DefaultIncomeAccounts.png and b/guide/C/figures/accts_DefaultIncomeAccounts.png differ
diff --git a/guide/C/figures/accts_toplevel.png b/guide/C/figures/accts_toplevel.png
index 926d887..8a5d94e 100644
Binary files a/guide/C/figures/accts_toplevel.png and b/guide/C/figures/accts_toplevel.png differ
diff --git a/guide/C/figures/accts_tree.png b/guide/C/figures/accts_tree.png
index 8bc705c..1ed4633 100644
Binary files a/guide/C/figures/accts_tree.png and b/guide/C/figures/accts_tree.png differ
diff --git a/guide/C/figures/basics_Accounts.png b/guide/C/figures/basics_Accounts.png
index 3e5d2db..223ca6b 100644
Binary files a/guide/C/figures/basics_Accounts.png and b/guide/C/figures/basics_Accounts.png differ
diff --git a/guide/C/figures/basics_NewAccountHierarchySetup.png b/guide/C/figures/basics_NewAccountHierarchySetup.png
index 302d1c2..8111c6f 100644
Binary files a/guide/C/figures/basics_NewAccountHierarchySetup.png and b/guide/C/figures/basics_NewAccountHierarchySetup.png differ
diff --git a/guide/C/figures/basics_NewAccountHierarchySetup_Accounts.png b/guide/C/figures/basics_NewAccountHierarchySetup_Accounts.png
index 8786b3c..16fce29 100644
Binary files a/guide/C/figures/basics_NewAccountHierarchySetup_Accounts.png and b/guide/C/figures/basics_NewAccountHierarchySetup_Accounts.png differ
diff --git a/guide/C/figures/basics_NewAccountHierarchySetup_Finish.png b/guide/C/figures/basics_NewAccountHierarchySetup_Finish.png
index c7d3656..2a39327 100644
Binary files a/guide/C/figures/basics_NewAccountHierarchySetup_Finish.png and b/guide/C/figures/basics_NewAccountHierarchySetup_Finish.png differ
diff --git a/guide/C/figures/basics_NewAccountHierarchySetup_Setup.png b/guide/C/figures/basics_NewAccountHierarchySetup_Setup.png
index 6ed93d3..d7035c3 100644
Binary files a/guide/C/figures/basics_NewAccountHierarchySetup_Setup.png and b/guide/C/figures/basics_NewAccountHierarchySetup_Setup.png differ
diff --git a/guide/C/figures/basics_NewAccountHierarchySetup_currency.png b/guide/C/figures/basics_NewAccountHierarchySetup_currency.png
index 9571f2c..3197963 100644
Binary files a/guide/C/figures/basics_NewAccountHierarchySetup_currency.png and b/guide/C/figures/basics_NewAccountHierarchySetup_currency.png differ
diff --git a/guide/C/figures/basics_NewBookOpts.png b/guide/C/figures/basics_NewBookOpts.png
index eb5ffb0..d7d3e2a 100644
Binary files a/guide/C/figures/basics_NewBookOpts.png and b/guide/C/figures/basics_NewBookOpts.png differ
diff --git a/guide/C/figures/basics_SaveSQL.png b/guide/C/figures/basics_SaveSQL.png
index 218d397..d71fbc3 100755
Binary files a/guide/C/figures/basics_SaveSQL.png and b/guide/C/figures/basics_SaveSQL.png differ
diff --git a/guide/C/figures/basics_SaveXML.png b/guide/C/figures/basics_SaveXML.png
index fedecf3..52826c0 100755
Binary files a/guide/C/figures/basics_SaveXML.png and b/guide/C/figures/basics_SaveXML.png differ
diff --git a/guide/C/figures/basics_TipOfDay.png b/guide/C/figures/basics_TipOfDay.png
index 7cebb75..a43143b 100644
Binary files a/guide/C/figures/basics_TipOfDay.png and b/guide/C/figures/basics_TipOfDay.png differ
diff --git a/guide/C/figures/loans_fcalc.png b/guide/C/figures/loans_fcalc.png
index 67a0737..95c1897 100644
Binary files a/guide/C/figures/loans_fcalc.png and b/guide/C/figures/loans_fcalc.png differ
diff --git a/help/C/figures/Help_Pref_AccntPeriod.png b/help/C/figures/Help_Pref_AccntPeriod.png
index 6dbdb66..d86872e 100644
Binary files a/help/C/figures/Help_Pref_AccntPeriod.png and b/help/C/figures/Help_Pref_AccntPeriod.png differ
diff --git a/help/C/figures/Help_Pref_Accnts.png b/help/C/figures/Help_Pref_Accnts.png
index 47fec77..b355351 100644
Binary files a/help/C/figures/Help_Pref_Accnts.png and b/help/C/figures/Help_Pref_Accnts.png differ
diff --git a/help/C/figures/Help_Pref_Business.png b/help/C/figures/Help_Pref_Business.png
index 4325de2..f42bd95 100644
Binary files a/help/C/figures/Help_Pref_Business.png and b/help/C/figures/Help_Pref_Business.png differ
diff --git a/help/C/figures/Help_Pref_DateTime.png b/help/C/figures/Help_Pref_DateTime.png
index 226ab85..0c3f822 100644
Binary files a/help/C/figures/Help_Pref_DateTime.png and b/help/C/figures/Help_Pref_DateTime.png differ
diff --git a/help/C/figures/Help_Pref_General.png b/help/C/figures/Help_Pref_General.png
index 20face2..3fbb6b6 100755
Binary files a/help/C/figures/Help_Pref_General.png and b/help/C/figures/Help_Pref_General.png differ
diff --git a/help/C/figures/Help_Pref_OnlineBanking.png b/help/C/figures/Help_Pref_OnlineBanking.png
index 7591870..0cc816b 100755
Binary files a/help/C/figures/Help_Pref_OnlineBanking.png and b/help/C/figures/Help_Pref_OnlineBanking.png differ
diff --git a/help/C/figures/Help_Pref_Printing.png b/help/C/figures/Help_Pref_Printing.png
index 6b1853c..efc4428 100755
Binary files a/help/C/figures/Help_Pref_Printing.png and b/help/C/figures/Help_Pref_Printing.png differ
diff --git a/help/C/figures/Help_Pref_Register.png b/help/C/figures/Help_Pref_Register.png
index 2c42788..557fe24 100755
Binary files a/help/C/figures/Help_Pref_Register.png and b/help/C/figures/Help_Pref_Register.png differ
diff --git a/help/C/figures/Help_Pref_RegisterDefaults.png b/help/C/figures/Help_Pref_RegisterDefaults.png
index ff21732..6cea834 100755
Binary files a/help/C/figures/Help_Pref_RegisterDefaults.png and b/help/C/figures/Help_Pref_RegisterDefaults.png differ
diff --git a/help/C/figures/Help_Pref_Reports.png b/help/C/figures/Help_Pref_Reports.png
index 4c95830..4cc23b2 100755
Binary files a/help/C/figures/Help_Pref_Reports.png and b/help/C/figures/Help_Pref_Reports.png differ
diff --git a/help/C/figures/Help_Pref_Sched.png b/help/C/figures/Help_Pref_Sched.png
old mode 100755
new mode 100644
index 87f338b..a301c3e
Binary files a/help/C/figures/Help_Pref_Sched.png and b/help/C/figures/Help_Pref_Sched.png differ
diff --git a/help/C/figures/Help_Pref_Windows.png b/help/C/figures/Help_Pref_Windows.png
index e7f8bca..9efce8e 100755
Binary files a/help/C/figures/Help_Pref_Windows.png and b/help/C/figures/Help_Pref_Windows.png differ
diff --git a/help/C/figures/Help_TxRptOpt_Screen.png b/help/C/figures/Help_TxRptOpt_Screen.png
index 3f37b92..b770ce8 100644
Binary files a/help/C/figures/Help_TxRptOpt_Screen.png and b/help/C/figures/Help_TxRptOpt_Screen.png differ
diff --git a/help/C/figures/Report_Screen.png b/help/C/figures/Report_Screen.png
index cdcf1e6..0886580 100644
Binary files a/help/C/figures/Report_Screen.png and b/help/C/figures/Report_Screen.png differ
commit 0aa3512d8e824d96f22f88f769911f756b88c416
Merge: 6c7cad2 09c85ee
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 29 11:06:11 2018 -0700
Merge Chris Lam's "Newbie Guide to the Transaction Report" into master.
commit 27eb360610711fcae354641af06c586591edacf4
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 29 10:37:45 2018 -0700
Release 2.6.20
diff --git a/ChangeLog b/ChangeLog
index 3528811..c834fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2018-03-17 fell
+
+ * minor fixes in guide de currency (HEAD -> maint, origin/maint)
+
+2018-03-17 fell
+
+ * Emphasise methods & fix a few typos in guide currency (de, en)
+
+2018-03-16 fell
+
+ * Minor improvements of FQ appendix
+
+2018-03-16 fell
+
+ * German translation of changes in FQ appendix
+
+2018-03-15 fell
+
+ * Apple stopped calling MacOS 'Mac OS X' at 10.12
+
+2017-10-05 fell
+
+ * Bug 784638 - sect1 Help-Window in Help_ch_GettingHelp describes an outdated version of yelp's GUI
+
+2018-03-15 fell
+
+ * Replace outdated online quote sources by link to Help Tips
+
+2018-03-15 fell
+
+ * Update Help Tips to commit c0fd3b3, which was adjusted for Finance::Quote 1.47
+
+2018-03-04 fell
+
+ * Cleanup of Improve screenshots of ch_bus_features: Fix image resizing Remove obsolete captions
+
+2018-02-27 fell
+
+ * Improve screenshots of ch_bus_features:
+
+2018-02-27 fell
+
+ * Bug 793844 - GnuCash Tutorial and Concepts Guide 13.4.5. Process Payment says Accounts Receivable, should be Payable
+
+2018-02-24 Geert Janssens
+
+ * Revert "Fix remaining references to General Ledger as per David Carlson's suggestion"
+
+2018-02-14 fell
+
+ * Link the referenced 'Simple Transaction Example' in Transactions 'Opening Balances'
+
+2018-02-14 fell
+
+ * Add a link from '8.5.1. Loan Specifications' to '8.3. Calculations'
+
+2018-02-10 fell
+
+ * Add required F::Q version for Bug 770132 - Price editor does not find ASX:XRO
+
+2018-02-10 fell
+
+ * Add note from bugzilla to ASX in appendix
+
+2018-02-03 fell
+
+ * Add Preference Online Quotes
+
+2018-02-03 fell
+
+ * Add a note about sort order of tabs in preferences
+
+2018-01-21 John Ralls
+
+ * Bug 792756 - Help Manual 8.10 incorrect link
+
2017-12-03 fell
* Bug 782423 - Help 10.2. Setting Preferences is outdated #105 (HEAD -> maint, origin/maint)
diff --git a/configure.ac b/configure.ac
index 00b6f50..4a28019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# copyright (c) 2003-2016 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gnucash-docs], [2.6.19], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/])
+AC_INIT([gnucash-docs], [2.6.20], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/])
dnl ==========================================================================
dnl
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index b2d412a..b8e548b 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -39,11 +39,11 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.19">
-<!ENTITY date "16 December 2017">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.19">
-<!ENTITY series-unstable "master">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -73,8 +73,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.19
- Last modified: 16 December 2017
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -88,7 +88,7 @@
<edition>V&manrevision;</edition>
<copyright>
- <year>2009-2017</year>
+ <year>2009-2018</year>
<holder>&app; Documentation Team</holder>
</copyright>
@@ -152,6 +152,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.20</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.19</revnumber>
<date>16 December 2017</date>
<revdescription>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 235f905..7908873 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -45,11 +45,11 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.19">
-<!ENTITY date "16 December 2017">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.19">
-<!ENTITY series-unstable "master">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -82,8 +82,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.19
- Last modified: 16 December 2017
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -100,7 +100,7 @@
<edition>V&manrevision;</edition>
<copyright>
- <year>2009-2017</year>
+ <year>2009-2018</year>
<holder>&app; Documentation Team</holder>
</copyright>
@@ -178,6 +178,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.20</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.19</revnumber>
<date>16 December 2017</date>
<revdescription>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index ead86ae..534a42f 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -36,11 +36,11 @@
NOTE: The underlying it.po file needs to be brought up to date so
that xml2po can make a new gnucash-guide.xml. Until that time this
file is frozen; do not update revisions or copyrights.
---><!ENTITY manrevision "2.6.14">
-<!ENTITY date "17 September 2016">
+--><!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.14">
-<!ENTITY series-unstable "master">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -68,8 +68,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.11
- Last modified: 11 January 2016
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -80,10 +80,10 @@
<!-- appropriate code -->
<bookinfo>
<title>Guida ai concetti e manuale di <application>&app;</application></title>
- <edition>V2.6.14</edition>
+ <edition>V2.6.20</edition>
<copyright>
- <year>2009-2016</year>
+ <year>2009-2018</year>
<holder>Gruppo della documentazione di &app;</holder>
</copyright>
@@ -163,6 +163,14 @@
<revhistory>
<revision>
+ <revnumber>GnuCash Tutorial and Concepts Guide v2.6.20</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Autori multipli</para>
+ <para role="publisher">Gruppo della documentazione di &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>GnuCash Tutorial and Concepts Guide v2.6.15</revnumber>
<date>18 December 2016</date>
<revdescription>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 3548fa0..3c13009 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -41,11 +41,11 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.16">
-<!ENTITY date "26 de marcha de 2016">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 de abril de 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.16">
-<!ENTITY series-unstable "master">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -75,8 +75,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.16
- Last modified: 26 March 2017
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -90,7 +90,7 @@
<edition>V&manrevision;</edition>
<copyright>
- <year>2009-2017</year>
+ <year>2009-2018</year>
<holder>Equipa de documentação do &app;</holder>
</copyright>
@@ -156,6 +156,14 @@
<revhistory>
<revision>
<revnumber>&app;Tutorial e guia de conceitos v2.6.16</revnumber>
+ <date>1 de abril de 2018</date>
+ <revdescription>
+ <para role="author">Múltiplos autores</para>
+ <para role="publisher">Equipa de documentação do &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>&app;Tutorial e guia de conceitos v2.6.16</revnumber>
<date>26 de marcha de 2017</date>
<revdescription>
<para role="author">Múltiplos autores</para>
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index 364a34d..32d8d80 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -39,11 +39,11 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.16">
-<!ENTITY date "26 March 2017">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.16">
-<!ENTITY series-unstable "master">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -73,8 +73,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.16
- Last modified: 02 July 2017
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -89,7 +89,7 @@
<edition>V&manrevision;</edition>
<copyright>
- <year>2009-2017</year>
+ <year>2009-2018</year>
<holder>&app; Documentation Team</holder>
</copyright>
@@ -163,6 +163,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.20</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.15</revnumber>
<date>26 March 2017</date>
<revdescription>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 45f2587..b5f8cce 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -31,11 +31,11 @@
Some global declarations which are used in the files. For easier
maintenance they should be collected here.
-->
-<!ENTITY manrevision "2.6.19">
-<!ENTITY date "16 December 2017">
-<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.19">
-<!ENTITY series-unstable "master">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
+<!ENTITY vers-unstable "2.7.8">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -58,8 +58,8 @@
]>
<!--
(Do not remove this comment block.)
- Version: 2.6.19
- Last modified: 24 September 2017
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -75,7 +75,7 @@
<edition>v&manrevision;</edition>
<copyright>
- <year>2002-2017</year>
+ <year>2002-2018</year>
<holder>GnuCash Documentation Team</holder>
</copyright>
@@ -103,6 +103,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Help Manual v2.6.20</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Help Manual v2.6.19</revnumber>
<date>16 December 2017</date>
<revdescription>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 75979ed..b203af0 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -28,11 +28,11 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.19">
-<!ENTITY date "16 December 2017">
-<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.19">
-<!ENTITY series-unstable "master">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
+<!ENTITY vers-unstable "2.7.8">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -63,8 +63,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.16
- Last modified: 26 March 2017
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -87,7 +87,7 @@
<edition>v&manrevision;</edition>
<copyright>
- <year>2014-2017</year>
+ <year>2014-2018</year>
<holder>&app; Documentation Team</holder>
</copyright>
@@ -132,6 +132,15 @@
<revhistory>
<revision>
+ <revnumber>&app; Hilfe v2.6.20</revnumber>
+ <date>1 April 2018</date>
+ <revdescription>
+ <para role="author">Multiple Authors </para>
+ <para role="publisher">&app; Development Team</para>
+ </revdescription>
+ </revision>
+
+ <revision>
<revnumber>&app; Hilfe v2.6.16</revnumber>
<date>26 March 2017</date>
<revdescription>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index e5a7213..f301194 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -28,11 +28,11 @@
NOTE: The underlying it.po file needs to be brought up to date so
that xml2po can make a new gnucash-help.xml. Until that time this
file is frozen; do not update revisions or copyrights.
---><!ENTITY manrevision "2.6.14">
-<!ENTITY date "17 September 2016">
-<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.14">
-<!ENTITY series-unstable "master">
+--><!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 April 2018">
+<!ENTITY vers-unstable "2.7.8">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -60,8 +60,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.13
- Last modified: 26 June 2016
+ Version: 2.6.20
+ Last modified: 1 April 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -76,7 +76,7 @@
<edition>v2.6.14</edition>
<copyright>
- <year>2002-2016</year>
+ <year>2002-2018</year>
<holder>Gruppo della documentazione di &app;</holder>
</copyright><copyright><year>2011</year><holder>Cristian Marchi</holder></copyright>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index 6ce05d1..f875957 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -29,11 +29,11 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.14">
-<!ENTITY date "17 de setembre de 2016">
-<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.14">
-<!ENTITY series-unstable "master">
+<!ENTITY manrevision "2.6.20">
+<!ENTITY date "1 de abril de 2018">
+<!ENTITY vers-unstable "2.7.8">
+<!ENTITY vers-stable "2.6.20">
+<!ENTITY series-unstable "2.7">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -64,8 +64,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.8
- Last modified: 27 de setembro de 2015
+ Version: 2.6.20
+ Last modified: 2 de abril de 2018
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -81,7 +81,7 @@
<edition>v&manrevision;</edition>
<copyright>
- <year>2002-2015</year>
+ <year>2002-2018</year>
<holder>Equipa de documentação do GnuCash</holder>
</copyright>
@@ -110,6 +110,14 @@
<revhistory>
<revision>
+ <revnumber>Manual de ajuda do &app; v2.6.20</revnumber>
+ <date>1 de abril de 2018</date>
+ <revdescription>
+ <para role="author">Múltiplos autores</para>
+ <para role="publisher">Equipa de documentação do &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>Manual de ajuda do &app; v2.6.8</revnumber>
<date>27 de setembro de 2015</date>
<revdescription>
commit 6c7cad2726d169a8d860e2a10723cd81a85eeb78
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Mar 17 16:29:59 2018 +0100
Update README
diff --git a/README b/README
index fa5019b..96c73be 100644
--- a/README
+++ b/README
@@ -2,13 +2,23 @@
GnuCash Docs README file
------------------------------------------------------------
-This is the docs module for GnuCash. The docs can be accessed
-from Yelp (the Gnome help browser) directly without any conversion.
-If you wish to obtain a copy of the documentation in another format,
-like html, pdf or others, see below under Other Formats.
+This is the user documentation (docs) module for GnuCash. Written in DocBook
+ they can be accessed under
+* directly without any conversion:
+** Linux: from Yelp (the Gnome help browser)
+
+* after conversion:
+** MacOs: html
+** Windows: chm
+** mobile devices: mobi, epub
+** paper: pdf
+
+If you wish to obtain a copy of the documentation in one of the latter formats,
+see below under Other Formats.
Requirements
############
+* autotools
* libxml2
* libxslt [Debian packed the required xsltproc in a separate package,
@@ -21,6 +31,15 @@ Requirements
Optional:
* gnome-doc-utils (contains xml2po for the use of po editors like in the it translation)
+Additional Requirements for Generating Mobipocket:
+
+* Calibre (https://www.calibre-ebook.com/)
+
+Additional Requirements for Generating chm:
+
+* Mingw (http://www.mingw.org)
+* Html Help Workshop (https://www.microsoft.com/en-us/download/details.aspx?id=21138 for Win XP - 8)
+
Additonal Requirements for Generating PDF:
* Apache fop >= 0.95
@@ -31,16 +50,12 @@ other Japanese fonts you can use the with-japanese-fonts-dir,
options to select them. fop's TTFReader can't, as of version 1.1
anyway, handle OpenType fonts.
-Additional Requirements for Generating Mobipocket:
-
-* Calibre (http://www.calibre-ebook.com/)
-
Notes
#####
The GnuCash docs team is actively seeking contributors. Even if you
only have time for reviewing, editing or translating the existing docs this
-can help. PLEASE let us know via the gnucash-devel mailing list what
+can help. PLEASE let us know via IRC or the gnucash-devel mailing list what
you can work on or help with.
See also:
@@ -176,11 +191,17 @@ hints or suggestions with the docs. There are a few known problems.
- Guide needs some updates still.
-That's it for now! Please report any problems to the Gnome bugzilla at
+- Full list:
+https://bugzilla.gnome.org/buglist.cgi?product=GnuCash&component=Documentation
+
+That's it for now! Please report any new problems to the Gnome bugzilla at
https://bugzilla.gnome.org/browse.cgi?product=GnuCash. Then choose the
component Documentation.
-Feel free to append your updates also there.
+Feel free to append your updates also there or open a pull request.
+Only docs about future features should go in branch master.
+So here is the link for branch stable:
+https://github.com/Gnucash/gnucash-docs/pull/new/maint.
With any problems you have, you can contact us in the following ways:
@@ -193,6 +214,7 @@ With any problems you have, you can contact us in the following ways:
** es: https://lists.gnucash.org/mailman/listinfo/gnucash-es
** fr: https://lists.gnucash.org/mailman/listinfo/gnucash-fr
** it: https://lists.gnucash.org/mailman/listinfo/gnucash-it
+** nl: https://lists.gnucash.org/mailman/listinfo/gnucash-nl
** pt: https://lists.gnucash.org/mailman/listinfo/gnucash-br
: or your recent translator
commit ba7ca7a8f455c2e58043e18afe5aa1f88eab0a63
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Mar 17 15:52:37 2018 +0100
Add guide/ja/fop.xconf to .gitignore
diff --git a/.gitignore b/.gitignore
index 08f503e..773c9fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ omf_timestamp
*/*.html
*/*/*/*.html
*/*/*.html
+guide/ja/fop.xconf
guide/*/gnucash-guide
help/*/gnucash-help
/.settings/
commit ed4480486bfd02b88b1b5a7abc08fb5e70c54f92
Merge: 3b07d4b 0bc5a63
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Mar 17 13:52:00 2018 +0100
Merge branch 'maint'
commit 3b07d4bab29f59b00f38d97735728c3d3d54aa12
Merge: 7cb12e6 e14445d
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Mar 17 07:08:19 2018 +0100
Merge branch 'maint'
commit 7cb12e64d48d25bd609f30a07145e16457378de4
Merge: 4e9072d bae9194
Author: fell <frank.h.ellenberger at gmail.com>
Date: Fri Mar 16 05:13:16 2018 +0100
Merge branch 'maint'
commit 4e9072d60b0ecfb735a289d18b848a4ea4acc6ea
Merge: d553796 b7850d3
Author: fell <frank.h.ellenberger at gmail.com>
Date: Thu Mar 15 12:28:53 2018 +0100
Merge branch 'maint'
commit d553796fe818b19cdb96b763335e8196b1715896
Merge: 9afce47 5cbccec
Author: fell <frank.h.ellenberger at gmail.com>
Date: Thu Mar 15 10:41:25 2018 +0100
Merge branch 'maint'
commit 09c85eebaba63cdd89493a029388bfffdf8f91a3
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Mar 9 17:24:48 2018 +0800
Clarify <emphasis> and add version info
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 4860869..4774274 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -111,7 +111,7 @@ Configuration.</para>
<listitem>
<para>Indenting of columns will indent the report columns for
easier understanding of grouping and sorting. (This is now
- enabled by default)</para>
+ enabled by default for Gnucash 3.0 onwards)</para>
</listitem>
<listitem>
<para>Subtotal table is useful to understand the relationship
@@ -757,24 +757,24 @@ an empty report will be generated.</para>
<orderedlist>
<listitem>
<para>Open the report options, from the
- <emphasis>Accounts</emphasis> tab, click the Expense
- placeholder account and <emphasis>Select
- Children</emphasis>.</para>
+ <guilabel>Accounts</guilabel> tab, click the Expense
+ placeholder account and <guibutton>Select
+ Children</guibutton>.</para>
</listitem>
<listitem>
- <para>From the <emphasis>General</emphasis> tab, Choose
+ <para>From the <guilabel>General</guilabel> tab, Choose
relative dates “Start of Previous Year†and “End of Previous
Yearâ€.</para>
</listitem>
<listitem>
- <para>From the <emphasis>Sorting</emphasis> tab, set
- <emphasis>Primary Key</emphasis> to Accounts, and enable
- <emphasis>Primary Key Subtotal</emphasis>.
+ <para>From the <guilabel>Sorting</guilabel> tab, set
+ <guilabel>Primary Key</guilabel> to Accounts, and enable
+ <guilabel>Primary Key Subtotal</guilabel>.
</para>
</listitem>
<listitem>
- <para>Set the <emphasis>Secondary Key</emphasis> to Date,
- and set the <emphasis>Secondary Key Subtotal</emphasis> to
+ <para>Set the <guilabel>Secondary Key</guilabel> to Date,
+ and set the <guilabel>Secondary Key Subtotal</guilabel> to
None. </para>
</listitem>
</orderedlist>
@@ -789,8 +789,8 @@ an empty report will be generated.</para>
also calculate monthly sums within each account.</para>
<orderedlist>
<listitem><para>Select options as above</para></listitem>
- <listitem><para>From the <emphasis>Sorting</emphasis> tab,
- set <emphasis>Secondary Key Subtotal</emphasis> to Monthly
+ <listitem><para>From the <guilabel>Sorting</guilabel> tab,
+ set <guilabel>Secondary Key Subtotal</guilabel> to Monthly
</para></listitem>
</orderedlist>
</sect3>
@@ -803,8 +803,8 @@ an empty report will be generated.</para>
</para>
<orderedlist>
<listitem><para>Select options as above</para></listitem>
- <listitem><para>From the <emphasis>Display</emphasis> tab,
- enable the <emphasis>Subtotal Table</emphasis>.</para>
+ <listitem><para>From the <guilabel>Display</guilabel> tab,
+ enable the <guilabel>Subtotal Table</guilabel>.</para>
</listitem>
</orderedlist>
</sect3>
@@ -818,9 +818,9 @@ an empty report will be generated.</para>
The filtering text may be either a standard string, or a POSIX regular
expression.</para>
<orderedlist>
- <listitem><para>From the <emphasis>Filter</emphasis> tab,
- complete the <emphasis>Account Name Filter</emphasis>, or
- <emphasis>Transaction Filter</emphasis>. Optionally toggle the
+ <listitem><para>From the <guilabel>Filter</guilabel> tab,
+ complete the <guilabel>Account Name Filter</guilabel>, or
+ <guilabel>Transaction Filter</guilabel>. Optionally toggle the
regular expression check boxes to toggle full POSIX regex
matching. Regular expressions will allow more complex
queries e.g. the transaction filter can be set to
@@ -836,20 +836,20 @@ an empty report will be generated.</para>
<para>This sortkey 'reconcile status' will separate reconciled,
cleared and unreconciled transactions. This report may be useful
in producing a printable reconciliation report.</para>
- <para>Alternatively, the <emphasis>Reconciliation Report
- </emphasis> will preset these defaults and requires only the
+ <para>Alternatively, the <guilabel>Reconciliation Report
+ </guilabel> will preset these defaults and requires only the
Accounts selection.
</para>
<orderedlist>
- <listitem><para>From the <emphasis>Accounts</emphasis> tab,
+ <listitem><para>From the <guilabel>Accounts</guilabel> tab,
select the relevant bank or credit card account</para></listitem>
- <listitem><para>From the <emphasis>General</emphasis> tab,
+ <listitem><para>From the <guilabel>General</guilabel> tab,
choose an appropriate date range e.g. past 3 months</para></listitem>
- <listitem><para>From the <emphasis>Sorting</emphasis> tab,
- set the <emphasis>Primary Key</emphasis> to Reconcile
- Status, <emphasis>Primary Key Subtotal</emphasis> to enabled,
- and set the <emphasis>Secondary Key</emphasis> to Date. The
- <emphasis>Secondary Date Subtotal</emphasis> is left to None
+ <listitem><para>From the <guilabel>Sorting</guilabel> tab,
+ set the <guilabel>Primary Key</guilabel> to Reconcile
+ Status, <guilabel>Primary Key Subtotal</guilabel> to enabled,
+ and set the <guilabel>Secondary Key</guilabel> to Date. The
+ <guilabel>Secondary Date Subtotal</guilabel> is left to None
</para></listitem>
</orderedlist>
</sect3>
commit 1afa19ea117a26553141fb3b51fd6a9e41ff4890
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Mar 6 06:42:51 2018 +0800
Finalise guide and help to document features in Gnucash 3.0
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 0635b44..4860869 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -82,21 +82,24 @@ Configuration.</para>
<sect2 id="rpt_txnrept">
<title>Transaction Report</title>
<para>The Transaction Report is a fundamental report that allows
- users to retrieve a wide variety of useful information from the
- financial records. The report includes many features that allow
- powerful and flexible reporting from the single basic report.</para>
+ users to retrieve a wide variety of useful information from the
+ financial records. The report includes many features that allow
+ powerful and flexible reporting from the single basic
+ report.</para>
<itemizedlist>
- <listitem><para>Debit and Credit subtotals can be displayed, and
- within a grouping section, if debit totals > credit totals, the
- group subtotal will be displayed in the debit column.</para>
- </listitem>
<listitem>
- <para>Multiple data columns enable display of foreign currency
- and original currency in separate columns.</para>
+ <para>Debit and Credit subtotals can be displayed, and within
+ a grouping section, if debit totals > credit totals, the group
+ subtotal will be displayed in the debit column.</para>
+ </listitem>
+ <listitem>
+ <para>Multiple data columns enable display of transaction
+ amounts in report currency and original currency in separate
+ columns.</para>
</listitem>
<listitem>
<para>Additional sortkeys e.g. sort by reconcile status
- (unreconciled -> cleared -> reconciled), sort by weekday, allow
+ (unreconciled -> cleared -> reconciled), sort by weeks, allow
additional views into the financial records.</para>
</listitem>
<listitem>
@@ -107,18 +110,15 @@ Configuration.</para>
</listitem>
<listitem>
<para>Indenting of columns will indent the report columns for
- easier understanding of grouping and sorting. (This
- is now enabled by default)</para>
+ easier understanding of grouping and sorting. (This is now
+ enabled by default)</para>
</listitem>
<listitem>
<para>Subtotal table is useful to understand the relationship
- in the data e.g. account values in time series.</para>
- </listitem>
- <listitem>
- <para>Filter by Closing Transactions will disallow closing
- transactions (i.e. income & expense accounts to
- equity) which should not routinely be included in transaction reports.
- (This is now enabled by default.)</para>
+ in the data. This feature compiles the primary and secondary
+ subtotals into a table view, allowing additional insight into
+ financial records, e.g. account subtotals in different time
+ series.</para>
</listitem>
</itemizedlist>
<para>For further ideas on how to use the Transaction Report to produce
@@ -755,29 +755,38 @@ an empty report will be generated.</para>
basic transaction report format. To create this report:
</para>
<orderedlist>
- <listitem><para>Open the report options, from the
- <emphasis>Accounts</emphasis> tab, click the Expense
- placeholder account and <emphasis>Select Children</emphasis>.</para></listitem>
- <listitem><para>From the <emphasis>General</emphasis> tab,
- Choose relative dates “Start of Previous Year†and “End of
- Previous Yearâ€.</para></listitem>
- <listitem><para>From the <emphasis>Sorting</emphasis> tab,
- set <emphasis>Primary Key</emphasis> to Accounts, and enable
- <emphasis>Primary Key Subtotal</emphasis>.
- </para></listitem>
- <listitem><para>Set the <emphasis>Secondary Key</emphasis> to
- Date, and set the <emphasis>Secondary Key Subtotal</emphasis>
- to None. </para></listitem>
+ <listitem>
+ <para>Open the report options, from the
+ <emphasis>Accounts</emphasis> tab, click the Expense
+ placeholder account and <emphasis>Select
+ Children</emphasis>.</para>
+ </listitem>
+ <listitem>
+ <para>From the <emphasis>General</emphasis> tab, Choose
+ relative dates “Start of Previous Year†and “End of Previous
+ Yearâ€.</para>
+ </listitem>
+ <listitem>
+ <para>From the <emphasis>Sorting</emphasis> tab, set
+ <emphasis>Primary Key</emphasis> to Accounts, and enable
+ <emphasis>Primary Key Subtotal</emphasis>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Set the <emphasis>Secondary Key</emphasis> to Date,
+ and set the <emphasis>Secondary Key Subtotal</emphasis> to
+ None. </para>
+ </listitem>
</orderedlist>
</sect3>
<sect3>
<title>Secondary level grouping</title>
- <para>The following will modify the above Transaction Report to use
- a secondary grouping strategy. The first grouping (i.e. Primary Key =
- Accounts, Subtotal = enabled) will group transactions from the same
- accounts, whereas the secondary grouping (i.e. Secondary Key = Date,
- Subtotal = Monthly) will also calculate monthly sums within each
- account.</para>
+ <para>The following will modify the above Transaction Report to
+ use a secondary grouping strategy. The first grouping
+ (i.e. Primary Key = Accounts, Subtotal = enabled) will group
+ transactions from the same accounts, whereas the secondary
+ grouping (i.e. Secondary Key = Date, Subtotal = Monthly) will
+ also calculate monthly sums within each account.</para>
<orderedlist>
<listitem><para>Select options as above</para></listitem>
<listitem><para>From the <emphasis>Sorting</emphasis> tab,
@@ -787,15 +796,15 @@ an empty report will be generated.</para>
</sect3>
<sect3>
<title>Using secondary grouping for periodic comparison</title>
- <para>The Display / Subtotal Summary Grid adds a subtotal summary
- table, which will ease comparison of accounts across date periods.
- This displays the same subtotal calculations as the main table,
- presented in a grid structure.
+ <para>The Display / Subtotal Table adds a subtotal summary
+ table, which will ease comparison of accounts across date
+ periods. This displays the same subtotal calculations as the
+ main table, presented in a grid structure.
</para>
<orderedlist>
<listitem><para>Select options as above</para></listitem>
<listitem><para>From the <emphasis>Display</emphasis> tab,
- enable the <emphasis>Subtotal Summary Grid</emphasis>.</para>
+ enable the <emphasis>Subtotal Table</emphasis>.</para>
</listitem>
</orderedlist>
</sect3>
@@ -822,24 +831,6 @@ an empty report will be generated.</para>
</orderedlist>
</sect3>
<sect3>
- <title>I want a list of transactions showing income transactions,
- grouped by day of week</title>
- <para>This report may be pertinent to businesses operating with
- variable daily income, e.g. food industry. The weekday sortkey will
- allow subtotal comparisons according to day of week.</para>
- <orderedlist>
- <listitem><para>From the <emphasis>Accounts</emphasis> tab,
- click Income, and Select Children</para></listitem>
- <listitem><para>From <emphasis>General</emphasis> tab,
- choose appropriate dates.</para></listitem>
- <listitem><para>From the <emphasis>Sorting</emphasis> tab,
- set <emphasis>Primary Key</emphasis> to Accounts, and
- <emphasis>Secondary Key</emphasis> to Date</para></listitem>
- <listitem><para>From the <emphasis>Sorting</emphasis> tab,
- set <emphasis>Secondary Key Subtotal</emphasis> to Weekday</para></listitem>
- </orderedlist>
- </sect3>
- <sect3>
<title>Using the Transaction Report to generate a
reconciliation statement.</title>
<para>This sortkey 'reconcile status' will separate reconciled,
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 75fa84b..3ffcb48 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -491,6 +491,9 @@
</informaltable>
</listitem>
+ <listitem><para><guilabel>Subtotal Table</guilabel> will add a summary table
+ for the various subtotals generated in the report. It lists the same subtotals
+ generated in tabular form.</para></listitem>
<listitem><para><guilabel>Running Balance</guilabel> refers to the running balance
of the account holding the transaction.</para></listitem>
<listitem><para><guilabel>Totals</guilabel> will add a 'Grand Total' line
commit dd91e512fd77670740d4b46300174d41569a3843
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jan 28 21:22:28 2018 +0800
Further WIP TR help & guide.
Move the TR guide to be last section of Standard Reports.
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index a59bbde..0635b44 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -121,7 +121,7 @@ Configuration.</para>
(This is now enabled by default.)</para>
</listitem>
</itemizedlist>
- <para>For further ideas on how to use the Transaction to produce
+ <para>For further ideas on how to use the Transaction Report to produce
common reports, see <link linkend='rpt_transaction'>Using the
Transaction Report</link>.</para>
</sect2>
@@ -654,9 +654,8 @@ However, this report only lists transactions that have been selected
an empty report will be generated.</para>
</sect3>
</sect2>
-</sect1>
-<sect1 id="rpt_transaction">
+<sect2 id="rpt_transaction">
<title>Using the Transaction Report</title>
<para>The Transaction Report can be heavily customised to produce most
reports appropriate for personal finance and business bookkeeping purposes.
@@ -746,8 +745,6 @@ an empty report will be generated.</para>
salary, paying utility bill), or transfers between assets and liability
accounts (representing movements between loans and assets, e.g. paying
credit card bill, receiving a loan).</para>
- <sect2>
- <title>Common scenarios</title>
<para>The following use cases will be illustrated, and the options to be
selected explained:</para>
<sect3>
@@ -819,7 +816,7 @@ an empty report will be generated.</para>
matching. Regular expressions will allow more complex
queries e.g. the transaction filter can be set to
(#gift|#travel) which will filter transactions with either
- #gift or #travel. They can be complex and are best learned
+ #gift or #travel. They can be complicated and are best learned
from external guides.</para>
</listitem>
</orderedlist>
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 2a3e356..75fa84b 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -474,7 +474,8 @@
</listitem>
<listitem><para><guilabel>Use Full Other Account Name</guilabel> will enable
display of full corresponding account name.</para></listitem>
- <listitem><para><guilabel>Other Account Code</guilabel></para></listitem>
+ <listitem><para><guilabel>Other Account Code</guilabel> will enable display of corresponding
+ account code.</para></listitem>
<listitem><para><guilabel>Shares:</guilabel> Display number of shares</para></listitem>
<listitem><para><guilabel>Price:</guilabel> Display share prices</para></listitem>
@@ -517,11 +518,13 @@
<listitem><para><guilabel>Account Name Filter</guilabel> will include only selected accounts
containing the substring. Alternatively, if the next option is checked, the account name
filter will be matched according to full POSIX regular expressions.</para></listitem>
- <listitem><para><guilabel>Use regular expressions for account name filter</guilabel></para></listitem>
+ <listitem><para><guilabel>Use regular expressions for account name filter</guilabel> toggles
+ regular expressions for account name filter.</para></listitem>
<listitem><para><guilabel>Transaction Filter</guilabel> will include only transactions
which contain this substring in the description, notes, or memo. Alternatively if the
next option is checked, the filter will be matched using full POSIX regular expressions.</para></listitem>
- <listitem><para><guilabel>Use regular expressions for transaction filter</guilabel></para></listitem>
+ <listitem><para><guilabel>Use regular expressions for transaction filter</guilabel> toggles
+ regular expressions for the transaction filter.</para></listitem>
<listitem><para><guilabel>Reconcile Status</guilabel></para>
<informaltable>
<tgroup cols="2">
@@ -545,6 +548,7 @@
</tgroup>
</informaltable>
</listitem>
+ <listitem><para><guilabel>Reset defaults button:</guilabel> Reset all values to their defaults</para></listitem>
</itemizedlist>
</listitem>
@@ -629,8 +633,8 @@
<row><entry>Account Name</entry><entry>Sort and subtotal by account name</entry></row>
<row><entry>Account Code</entry><entry>Sort and subtotal by account code</entry></row>
<row><entry>Date</entry><entry>Sort by date</entry></row>
- <row><entry>Exact Time</entry><entry>Sort by exact time</entry></row>
<row><entry>Reconciled Date</entry><entry>Sort by the reconciled date</entry></row>
+ <row><entry>Reconciled Status</entry><entry>Sort by the reconciled status</entry></row>
<row><entry>Register Order</entry><entry>Sort as within the register</entry></row>
<row><entry>Other Account Name</entry><entry>Sort by account transferred from/to's name</entry></row>
<row><entry>Other Account Code</entry><entry>Sort by account transferred from/to's code</entry></row>
@@ -644,7 +648,7 @@
</listitem>
<listitem><para><guilabel>Primary Subtotal:</guilabel> Subtotal according to the primary key</para></listitem>
- <listitem><para><guilabel>Primary Subtotal for Date Key:</guilabel> Do a date subtotal. Only configurable if primary key is date, exact time or register order.
+ <listitem><para><guilabel>Primary Subtotal for Date Key:</guilabel> Do a date subtotal. Only configurable if primary key is date or reconciled date.
One of None, weekly, monthly, quarterly or yearly</para>
</listitem>
@@ -661,7 +665,7 @@
<listitem><para><guilabel>Secondary Key:</guilabel> Secondary Sort Key. Same options as Primary Key</para></listitem>
<listitem><para><guilabel>Secondary Subtotal:</guilabel> Subtotal according to the secondary key</para></listitem>
- <listitem><para><guilabel>Secondary Subtotal for Date Key:</guilabel> Do a date subtotal. Only configurable if primary key is date, exact time or register order.
+ <listitem><para><guilabel>Secondary Subtotal for Date Key:</guilabel> Do a date subtotal. Only configurable if primary key is date or reconciled date.
One of None, weekly, monthly, quarterly or yearly</para>
</listitem>
@@ -679,7 +683,7 @@
<listitem><para><guilabel>Show Account Code:</guilabel> Show the account code for subtotals and subtitles</para></listitem>
<listitem><para><guilabel>Show Account Description:</guilabel> Show the account description for subtitles</para></listitem>
<listitem><para><guilabel>Show Informal Debit/Credit Headers:</guilabel> Show informal names for debit/credit
- in the report. This requires that subtotal is enabled, and the primary or sortkey is account or account code.</para></listitem>
+ in the subtitles. This requires that subtotal is enabled, and the primary or sortkey is account or account code.</para></listitem>
<listitem><para><guilabel>Add indenting columns:</guilabel> Add columns to align transactions within the same
grouping together, and can be useful to highlight groups.</para></listitem>
<listitem><para><guilabel>Show subtotals only (hide transactional data):</guilabel> Will hide transactions.
commit d1a80db05d072ecc37e375e9c4b11d6620d7d95c
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jan 28 19:24:33 2018 +0800
Work in progress. Augment Help for Transaction Report.
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 790bb0d..2a3e356 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -424,18 +424,6 @@
</informaltable>
</listitem>
- <listitem><para><guilabel>Void Transactions:</guilabel> One of</para>
- <informaltable>
- <tgroup cols="2">
- <tbody>
- <row><entry>Non-void only</entry><entry>Show only non-voided transactions</entry></row>
- <row><entry>Void only</entry><entry>Show only voided transactions</entry></row>
- <row><entry>Both</entry><entry>Show both and include voided transactions in totals</entry></row>
- </tbody>
- </tgroup>
- </informaltable>
- </listitem>
-
<listitem><para><guilabel>Reset defaults button:</guilabel> Reset all values to their defaults</para>
</listitem>
</itemizedlist>
@@ -445,15 +433,23 @@
<listitem><para><emphasis>Display tab</emphasis></para>
<itemizedlist>
- <listitem><para><guilabel>Date</guilabel></para></listitem>
- <listitem><para><guilabel>Reconciled Date</guilabel></para></listitem>
- <listitem><para><guilabel>Num</guilabel></para></listitem>
- <listitem><para><guilabel>Description</guilabel></para></listitem>
- <listitem><para><guilabel>Memo</guilabel></para></listitem>
+ <listitem><para><guilabel>Date</guilabel> refers to the 'posted date' i.e.
+ effective date of a transaction.</para></listitem>
+ <listitem><para><guilabel>Reconciled Date</guilabel> refers to the 'date of
+ reconciliation' of a transaction.</para></listitem>
+ <listitem><para><guilabel>Num</guilabel> is commonly used for check
+ numbers.</para></listitem>
+ <listitem><para><guilabel>Description</guilabel> is a description of the transaction
+ </para></listitem>
+ <listitem><para><guilabel>Memo</guilabel> is the memo field of a transaction. This
+ can be used as a secondary description of a transaction.</para></listitem>
<listitem><para><guilabel>Notes:</guilabel> Display the notes if the memo is unavailable</para></listitem>
- <listitem><para><guilabel>Account Name</guilabel></para></listitem>
- <listitem><para><guilabel>Use Full Account Name</guilabel></para></listitem>
- <listitem><para><guilabel>Account Code</guilabel></para></listitem>
+ <listitem><para><guilabel>Account Name</guilabel> will print the account name
+ containing the transaction.</para></listitem>
+ <listitem><para><guilabel>Use Full Account Name</guilabel> if the account name is
+ enabled, this option will display the full account name hierarchy.</para></listitem>
+ <listitem><para><guilabel>Account Code</guilabel> this refers to the 'account code'
+ related to the account.</para></listitem>
<listitem><para><guilabel>Detail Level</guilabel>— One of</para>
<informaltable>
<tgroup cols="2">
@@ -476,7 +472,8 @@
<listitem><para><guilabel>Other Account Name:</guilabel> For multi-split transactions, this parameter should be unticked. See below for more details.</para>
</listitem>
- <listitem><para><guilabel>Use Full Other Account Name</guilabel></para></listitem>
+ <listitem><para><guilabel>Use Full Other Account Name</guilabel> will enable
+ display of full corresponding account name.</para></listitem>
<listitem><para><guilabel>Other Account Code</guilabel></para></listitem>
<listitem><para><guilabel>Shares:</guilabel> Display number of shares</para></listitem>
<listitem><para><guilabel>Price:</guilabel> Display share prices</para></listitem>
@@ -493,13 +490,16 @@
</informaltable>
</listitem>
- <listitem><para><guilabel>Running Balance</guilabel></para></listitem>
- <listitem><para><guilabel>Totals</guilabel></para></listitem>
+ <listitem><para><guilabel>Running Balance</guilabel> refers to the running balance
+ of the account holding the transaction.</para></listitem>
+ <listitem><para><guilabel>Totals</guilabel> will add a 'Grand Total' line
+ adding all transactions in the report.</para></listitem>
<listitem><para><guilabel>Sign Reverses:</guilabel> One of</para>
<informaltable>
<tgroup cols="2">
<tbody>
+ <row><entry>Global Preference</entry><entry>Use reversing option specified in global preference.</entry></row>
<row><entry>None</entry><entry>Do not display signs reversed</entry></row>
<row><entry>Credit Accounts</entry><entry>Reverse amount display for Liability, Payable, Equity, Credit Card and Income accounts</entry></row>
<row><entry>Income and Expense</entry><entry>Reverse amount display for Income and Expense accounts</entry></row>
@@ -508,10 +508,46 @@
</informaltable>
</listitem>
- <listitem><para><guilabel>Reset defaults button Reset all values to their defaults</guilabel></para></listitem>
+ <listitem><para><guilabel>Reset defaults button</guilabel> Reset all values to their defaults</para></listitem>
</itemizedlist>
</listitem>
+ <listitem><para><emphasis>Filter tab</emphasis></para>
+ <itemizedlist>
+ <listitem><para><guilabel>Account Name Filter</guilabel> will include only selected accounts
+ containing the substring. Alternatively, if the next option is checked, the account name
+ filter will be matched according to full POSIX regular expressions.</para></listitem>
+ <listitem><para><guilabel>Use regular expressions for account name filter</guilabel></para></listitem>
+ <listitem><para><guilabel>Transaction Filter</guilabel> will include only transactions
+ which contain this substring in the description, notes, or memo. Alternatively if the
+ next option is checked, the filter will be matched using full POSIX regular expressions.</para></listitem>
+ <listitem><para><guilabel>Use regular expressions for transaction filter</guilabel></para></listitem>
+ <listitem><para><guilabel>Reconcile Status</guilabel></para>
+ <informaltable>
+ <tgroup cols="2">
+ <tbody>
+ <row><entry>All</entry><entry>Show all transactions</entry></row>
+ <row><entry>Unreconciled</entry><entry>Unreconciled only</entry></row>
+ <row><entry>Cleared</entry><entry>Cleared only</entry></row>
+ <row><entry>Reconciled</entry><entry>Reconciled only</entry></row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </listitem>
+ <listitem><para><guilabel>Void Transactions:</guilabel> One of</para>
+ <informaltable>
+ <tgroup cols="2">
+ <tbody>
+ <row><entry>Non-void only</entry><entry>Show only non-voided transactions</entry></row>
+ <row><entry>Void only</entry><entry>Show only voided transactions</entry></row>
+ <row><entry>Both</entry><entry>Show both and include voided transactions in totals</entry></row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem><para><emphasis>General tab</emphasis></para>
<itemizedlist>
<listitem><para><guilabel>Report name:</guilabel> Enter a descriptive name for this report</para></listitem>
@@ -537,7 +573,8 @@
</listitem>
<listitem><para><guilabel>End Date:</guilabel> Enter or select a specific End Date,</para>
- <para>or select one of the following named end date options which will be used to determine the end date each time the report is run
+ <para>or select one of the following named end date options which will be used to
+ determine the end date each time the report is run
</para>
<informaltable>
<tgroup cols="2">
@@ -571,12 +608,17 @@
<listitem><para><guilabel>Common Currency:</guilabel> Convert all transactions into a common currency</para></listitem>
<listitem><para><guilabel>Report's currency:</guilabel> Select the currency to display values</para></listitem>
+ <listitem><para><guilabel>Show original currency amount</guilabel> Also show original currency amounts</para></listitem>
<listitem><para><guilabel>Table for Exporting:</guilabel> Formats the table for cut & paste exporting with extra cells</para></listitem>
+ <listitem><para><guilabel>Add options summary:</guilabel> Adds an informative text
+ describing options that were changed by user. This is mainly useful for
+ troubleshooting reports.</para></listitem>
<listitem><para><guilabel>Reset defaults button:</guilabel> Reset all values to their defaults</para></listitem>
</itemizedlist>
</listitem>
- <listitem><para><emphasis>Sorting tab</emphasis></para>
+
+ <listitem><para><emphasis>Sorting tab</emphasis></para>
<itemizedlist>
<listitem><para><guilabel>Primary Key:</guilabel> Primary Sort Key. One of</para>
@@ -601,8 +643,6 @@
</informaltable>
</listitem>
- <listitem><para><guilabel>Show Full Account Name:</guilabel> Show the full account name for subtotals and subtitles</para></listitem>
- <listitem><para><guilabel>Show Account Code:</guilabel> Show the account code for subtotals and subtitles</para></listitem>
<listitem><para><guilabel>Primary Subtotal:</guilabel> Subtotal according to the primary key</para></listitem>
<listitem><para><guilabel>Primary Subtotal for Date Key:</guilabel> Do a date subtotal. Only configurable if primary key is date, exact time or register order.
One of None, weekly, monthly, quarterly or yearly</para>
@@ -635,7 +675,15 @@
</tgroup>
</informaltable>
</listitem>
-
+ <listitem><para><guilabel>Show Full Account Name:</guilabel> Show the full account name for subtotals and subtitles</para></listitem>
+ <listitem><para><guilabel>Show Account Code:</guilabel> Show the account code for subtotals and subtitles</para></listitem>
+ <listitem><para><guilabel>Show Account Description:</guilabel> Show the account description for subtitles</para></listitem>
+ <listitem><para><guilabel>Show Informal Debit/Credit Headers:</guilabel> Show informal names for debit/credit
+ in the report. This requires that subtotal is enabled, and the primary or sortkey is account or account code.</para></listitem>
+ <listitem><para><guilabel>Add indenting columns:</guilabel> Add columns to align transactions within the same
+ grouping together, and can be useful to highlight groups.</para></listitem>
+ <listitem><para><guilabel>Show subtotals only (hide transactional data):</guilabel> Will hide transactions.
+ This may be useful for reports whereby only subtotals are required.</para></listitem>
<listitem><para><guilabel>Reset defaults button:</guilabel> Reset all values to their defaults</para></listitem>
</itemizedlist>
</listitem>
commit 62b0a0cd0eb50b26199a83a969818ec96dcc7a20
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jan 28 18:10:27 2018 +0800
Add link from introduction to scenarios.
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 7da420f..a59bbde 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -121,6 +121,9 @@ Configuration.</para>
(This is now enabled by default.)</para>
</listitem>
</itemizedlist>
+ <para>For further ideas on how to use the Transaction to produce
+ common reports, see <link linkend='rpt_transaction'>Using the
+ Transaction Report</link>.</para>
</sect2>
<sect2 id="rpt_grp_assetsliabs">
<title>Assets & Liabilities Group</title>
commit 1248daf8c49038e4b6b84dd1a1b922af981c6b43
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Jan 24 22:12:15 2018 +0800
Rewrite introduction to TR and move Q&A to a separate section
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 54c86ae..7da420f 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -72,11 +72,56 @@ Configuration.</para>
<sect1 id="rpt_standardrpts">
<title>Standard Reports Overview</title>
- <para>The standard reports that are included in <application>&app;</application> are presented here
- in the order that they appear in the <guimenu>Reports</guimenu> menu. In each section, a short
- description for each report is given, which explains what the report is
- intended to show, and its primary purpose.</para>
-
+ <para>The standard reports that are included in <application>&app;</application> are presented
+ in this chapter. For each report, a short description is given, which
+ explains what the report is intended to show and its primary purpose.
+ We begin with a description of the Transaction Report, which is an
+ all-purpose report with many features and settings that allow
+ sophisticated examination of the data in a file. </para>
+
+ <sect2 id="rpt_txnrept">
+ <title>Transaction Report</title>
+ <para>The Transaction Report is a fundamental report that allows
+ users to retrieve a wide variety of useful information from the
+ financial records. The report includes many features that allow
+ powerful and flexible reporting from the single basic report.</para>
+ <itemizedlist>
+ <listitem><para>Debit and Credit subtotals can be displayed, and
+ within a grouping section, if debit totals > credit totals, the
+ group subtotal will be displayed in the debit column.</para>
+ </listitem>
+ <listitem>
+ <para>Multiple data columns enable display of foreign currency
+ and original currency in separate columns.</para>
+ </listitem>
+ <listitem>
+ <para>Additional sortkeys e.g. sort by reconcile status
+ (unreconciled -> cleared -> reconciled), sort by weekday, allow
+ additional views into the financial records.</para>
+ </listitem>
+ <listitem>
+ <para>Full text filter enabled for description, notes and
+ memo, and for account full names. This allows easier selection
+ of source account names and tailored reporting. Filters
+ can optionally use full POSIX regular expressions.</para>
+ </listitem>
+ <listitem>
+ <para>Indenting of columns will indent the report columns for
+ easier understanding of grouping and sorting. (This
+ is now enabled by default)</para>
+ </listitem>
+ <listitem>
+ <para>Subtotal table is useful to understand the relationship
+ in the data e.g. account values in time series.</para>
+ </listitem>
+ <listitem>
+ <para>Filter by Closing Transactions will disallow closing
+ transactions (i.e. income & expense accounts to
+ equity) which should not routinely be included in transaction reports.
+ (This is now enabled by default.)</para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
<sect2 id="rpt_grp_assetsliabs">
<title>Assets & Liabilities Group</title>
<para>Reports in this group provide general information about assets and liabilities.</para>
@@ -579,13 +624,6 @@ form the taxing authority uses for each income or expense account. Note that
you can see but not modify the "Tax related" checkbox in Edit --> Edit Account.</para>
</sect3>
-<sect3 id="rpt_txnrept">
-<title>Transaction Report</title>
-<para>This report lists the transactions in selected accounts during a
-specified financial period. When first run, this report loads no data,
-and the report options must be changed to retrieve information from the file.</para>
-</sect3>
-
<sect3 id="rpt_savedrpts">
<title>Saved Report Configurations</title>
<para>Selecting this will open a dialog with a list of available Saved Report
@@ -616,295 +654,214 @@ an empty report will be generated.</para>
</sect1>
<sect1 id="rpt_transaction">
- <title>Transaction Report</title>
- <sect2 id="rpt_TR_new">
- <title>New in Gnucash 3.0</title>
- <para>The Transaction Report has undergone several major upgrades, bug
- fixes, and new features. It aims to be the most versatile report to retrieve
- useful information from the financial records.</para>
- <itemizedlist>
- <listitem>
- <para><emphasis>New!</emphasis> Debit and Credit subtotals are now
- displayed in the appropriate columns. Within a grouping section, if
- debit totals > credit totals, the group subtotal will be displayed in
- the debit column.</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Multiple data columns enable display of
- foreign currency and original currency in separate columns.</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Additional sortkeys e.g. sort by
- reconcile status (unreconciled -> cleared -> reconciled), sort by
- weekday, allow additional views into the financial records.</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Full text filter enabled for
- description, notes and memo, and for account full names. This allows
- easier selection of source account names and tailored reporting. Filters
- can optionally use full POSIX regular expressions.</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Indenting of columns will indent the
- report columns for easier understanding of grouping and sorting. (This
- is now enabled by default)</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Subtotal table is useful to understand
- the relationship in the data e.g. account values in time series.</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Filter by Closing Transactions will
- disallow closing transactions (i.e. income & expense accounts to
- equity) which should not routinely be included in transaction reports.
- (This is now enabled by default.)</para>
- </listitem>
- <listitem>
- <para><emphasis>New!</emphasis> Options Summary will print a list of
- report options that were changed by the user. This is mainly useful to
- troubleshoot reports.</para>
- </listitem>
- <listitem>
- <para>Bugs fixed - numerous bugs identified were fixed; e.g. sign
- display was fixed, correct grouping of periodic dates.</para>
- </listitem>
- </itemizedlist>
- </sect2>
- <sect2 id="rpt_TR_newbie">
- <title>The Newbie Guide to the Transaction Report</title>
- <para>The Transaction Report can be heavily customised to produce most
- reports appropriate for personal finance and business bookkeeping purposes.
- It aims to retrieve and filter information from the database, and present
- transactions and totals, useful for the user and the accountant.</para>
- <para>The following newbie guide to the Transaction Report will assume the
- user has set up the chart of accounts according to conventional bookkeeping
- practice. For example, the following describes a typical household book with
- skeleton accounts. Further accounts will undoubtedly be necessary.</para>
- <table>
- <title>CHART OF ACCOUNTS</title>
- <tgroup cols='2' align='left' colsep='1' rowsep='1'>
- <thead>
- <row>
- <entry>Account Name</entry>
- <entry>Account Type</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>Asset</entry>
- <entry>ASSET (placeholder)</entry>
- </row>
- <row>
- <entry>Asset:Bank</entry>
- <entry>BANK</entry>
- </row>
- <row>
- <entry>Asset:Property</entry>
- <entry>ASSET</entry>
- </row>
- <row>
- <entry>Liability</entry>
- <entry>LIABILITY (placeholder)</entry>
- </row>
- <row>
- <entry>Liability:Credit Card</entry>
- <entry>CREDIT CARD</entry>
- </row>
- <row>
- <entry>Liability:Home Loan</entry>
- <entry>LIABILITY</entry>
- </row>
- <row>
- <entry>Income</entry>
- <entry>INCOME (placeholder)</entry>
- </row>
- <row>
- <entry>Income:Salary</entry>
- <entry>INCOME</entry>
- </row>
- <row>
- <entry>Income:Interest</entry>
- <entry>INCOME</entry>
- </row>
- <row>
- <entry>Expense</entry>
- <entry>EXPENSE (placeholder)</entry>
- </row>
- <row>
- <entry>Expense:Groceries</entry>
- <entry>EXPENSE</entry>
- </row>
- <row>
- <entry>Expense:Auto</entry>
- <entry>EXPENSE</entry>
- </row>
- <row>
- <entry>Expense:Medical</entry>
- <entry>EXPENSE</entry>
- </row>
- <row>
- <entry>Equity</entry>
- <entry>EQUITY (placeholder)</entry>
- </row>
- <row>
- <entry>Equity:Opening Balances</entry>
- <entry>EQUITY</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para>Conventionally, the oldest transaction would be equity transfers from
- Equity:Opening Balances to Asset and Liability Accounts. Most subsequent
- transactions would be transfers from Income/Expense accounts to
- Assets/Liability accounts (representing day-to-day activity e.g. receiving
- salary, paying utility bill), or transfers between assets and liability
- accounts (representing movements between loans and assets, e.g. paying
- credit card bill, receiving a loan).</para>
+ <title>Using the Transaction Report</title>
+ <para>The Transaction Report can be heavily customised to produce most
+ reports appropriate for personal finance and business bookkeeping purposes.
+ It aims to retrieve and filter information from the database, and present
+ transactions and totals, useful for the user and the accountant.</para>
+ <para>The following guide to the Transaction Report will assume the
+ user has set up the chart of accounts according to conventional bookkeeping
+ practice. For example, the following describes a typical household book with
+ skeleton accounts. Further accounts will undoubtedly be necessary.</para>
+ <table>
+ <title>Sample Chart of Accounts</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <thead>
+ <row>
+ <entry>Account Name</entry>
+ <entry>Account Type</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Asset</entry>
+ <entry>ASSET (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Asset:Bank</entry>
+ <entry>BANK</entry>
+ </row>
+ <row>
+ <entry>Asset:Property</entry>
+ <entry>ASSET</entry>
+ </row>
+ <row>
+ <entry>Liability</entry>
+ <entry>LIABILITY (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Liability:Credit Card</entry>
+ <entry>CREDIT CARD</entry>
+ </row>
+ <row>
+ <entry>Liability:Home Loan</entry>
+ <entry>LIABILITY</entry>
+ </row>
+ <row>
+ <entry>Income</entry>
+ <entry>INCOME (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Income:Salary</entry>
+ <entry>INCOME</entry>
+ </row>
+ <row>
+ <entry>Income:Interest</entry>
+ <entry>INCOME</entry>
+ </row>
+ <row>
+ <entry>Expense</entry>
+ <entry>EXPENSE (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Expense:Groceries</entry>
+ <entry>EXPENSE</entry>
+ </row>
+ <row>
+ <entry>Expense:Auto</entry>
+ <entry>EXPENSE</entry>
+ </row>
+ <row>
+ <entry>Expense:Medical</entry>
+ <entry>EXPENSE</entry>
+ </row>
+ <row>
+ <entry>Equity</entry>
+ <entry>EQUITY (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Equity:Opening Balances</entry>
+ <entry>EQUITY</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>Conventionally, the oldest transaction would be equity transfers from
+ Equity:Opening Balances to Asset and Liability Accounts. Most subsequent
+ transactions would be transfers from Income/Expense accounts to
+ Assets/Liability accounts (representing day-to-day activity e.g. receiving
+ salary, paying utility bill), or transfers between assets and liability
+ accounts (representing movements between loans and assets, e.g. paying
+ credit card bill, receiving a loan).</para>
+ <sect2>
+ <title>Common scenarios</title>
<para>The following use cases will be illustrated, and the options to be
selected explained:</para>
- <qandaset defaultlabel='none'>
- <qandaentry>
- <question>
- <para>How much did I spend on various expense accounts last year?</para>
- </question>
- <answer>
- <para>The following sequence will select all subaccounts from the
- parent Expense account, select appropriate dates, and sort by account
- and date. This will usually be the most useful basic transaction
- report format.
- </para>
- <orderedlist>
- <listitem><para><emphasis>Accounts</emphasis>: click Expense, and
- Select Children</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose relative dates
- “Start of Previous Year†and “End of Previous Yearâ€</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts,
- Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal:
- Enabled, Secondary Key Subtotal: None </para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- <qandaentry>
- <question>
- <para>How much did I spend on various expenses, grouped by month?</para>
- </question>
- <answer>
- <para>The following will modify the above Transaction Report to use
- a secondary grouping strategy. The first grouping (i.e. Primary Key =
- Accounts, Subtotal = enabled) will group transactions from the same
- accounts, whereas the secondary grouping (i.e. Secondary Key = Date,
- Subtotal = Monthly) will also calculate monthly sums within each
- account.</para>
- <orderedlist>
- <listitem><para>Select options as above</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Secondary Key
- Subtotal: Monthly</para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- <qandaentry>
- <question>
- <para>How much did I spend on various expenses, with monthly
- comparison?</para>
- </question>
- <answer>
- <para>The Display / Subtotal Summary Grid adds a subtotal summary
- table, which will ease comparison of accounts across date periods.
- This displays the same subtotal calculations as the main table,
- presented in a grid structure.
- </para>
- <orderedlist>
- <listitem><para>As above</para></listitem>
- <listitem><para><emphasis>Display</emphasis>: Subtotal Summary Grid</para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- <qandaentry>
- <question>
- <para>Can I select tagged accounts or transactions for reporting?</para>
- </question>
- <answer>
- <para>New to Gnucash 3.0, accounts and transactions can be filtered
- for reporting according to account full name (e.g. ":Business:" will
- select account structure Income:Business:Sales, Income:Business:Grants,
- Expenses:Business:Rent, Expenses:Business:Utilities) or transaction
- description/notes/memo (select transactions tagged #gift or #travel).
- The filtering text may be either a standard string, or a POSIX regular
- expression.
- </para>
- <orderedlist>
- <listitem><para><emphasis>Filter</emphasis>: Select either Account
- Name Filter, or Transaction Filter. Optionally toggle the regular
- expression check boxes to toggle full POSIX regex matching.</para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- <qandaentry>
- <question>
- <para>I want a list of transactions showing my income for the year 1
- July 2015 to 30 June 2016, grouped by quarter</para>
- </question>
- <answer>
- <para>Generally, the Accounts selection box will be used to specify
- the source accounts containing transactions that require reporting.
- Selecting Income, then "Select Children" will include all
- subaccounts from the Income account, e.g. Income:Freelance,
- Income:Salary, Income:Interest can all be included. Please
- note the account list is saved between <application>&app;</application>
- sessions. If the account structure is modified (e.g. moving
- accounts, deleting/adding new accounts), the account selection
- must usually be recreated.</para>
- <orderedlist>
- <listitem><para><emphasis>Accounts</emphasis>: click Income, and
- Select Children</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose absolute dates
- “01/07/2015†to “30/06/2016â€</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts,
- Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal:
- Enabled, Secondary Date Subtotal: Quarter</para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- <qandaentry>
- <question>
- <para>I want a list of transactions showing income transactions,
- grouped by day of week</para>
- </question>
- <answer>
- <para>This report may be pertinent to businesses operating with
- variable daily income, e.g. food industry. The weekday sortkey will
- allow subtotal comparisons according to day of week.</para>
- <orderedlist>
- <listitem><para>As above</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Secondary Key
- Subtotal: Weekday</para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- <qandaentry>
- <question>
- <para>I want to print my bank account or credit card transactions,
- similar to the reconciliation report.</para>
- </question>
- <answer>
- <para>This sortkey 'reconcile status' will separate reconciled,
- cleared and unreconciled transactions. This report may be useful in
- producing a printable reconciliation report.</para>
- <orderedlist>
- <listitem><para><emphasis>Accounts</emphasis>: select the relevant
- bank or credit card account</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose appropriate dates
- e.g. past 3 months</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Reconcile
- Status, Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis> Secondary Date
- Subtotal: None</para></listitem>
- </orderedlist>
- </answer>
- </qandaentry>
- </qandaset>
+ <sect3>
+ <title>Using the Transaction Report to show previous year
+ expenses</title>
+ <para>The Transaction Report can show how much was spent on
+ expense accounts last year. This will usually be the most useful
+ basic transaction report format. To create this report:
+ </para>
+ <orderedlist>
+ <listitem><para>Open the report options, from the
+ <emphasis>Accounts</emphasis> tab, click the Expense
+ placeholder account and <emphasis>Select Children</emphasis>.</para></listitem>
+ <listitem><para>From the <emphasis>General</emphasis> tab,
+ Choose relative dates “Start of Previous Year†and “End of
+ Previous Yearâ€.</para></listitem>
+ <listitem><para>From the <emphasis>Sorting</emphasis> tab,
+ set <emphasis>Primary Key</emphasis> to Accounts, and enable
+ <emphasis>Primary Key Subtotal</emphasis>.
+ </para></listitem>
+ <listitem><para>Set the <emphasis>Secondary Key</emphasis> to
+ Date, and set the <emphasis>Secondary Key Subtotal</emphasis>
+ to None. </para></listitem>
+ </orderedlist>
+ </sect3>
+ <sect3>
+ <title>Secondary level grouping</title>
+ <para>The following will modify the above Transaction Report to use
+ a secondary grouping strategy. The first grouping (i.e. Primary Key =
+ Accounts, Subtotal = enabled) will group transactions from the same
+ accounts, whereas the secondary grouping (i.e. Secondary Key = Date,
+ Subtotal = Monthly) will also calculate monthly sums within each
+ account.</para>
+ <orderedlist>
+ <listitem><para>Select options as above</para></listitem>
+ <listitem><para>From the <emphasis>Sorting</emphasis> tab,
+ set <emphasis>Secondary Key Subtotal</emphasis> to Monthly
+ </para></listitem>
+ </orderedlist>
+ </sect3>
+ <sect3>
+ <title>Using secondary grouping for periodic comparison</title>
+ <para>The Display / Subtotal Summary Grid adds a subtotal summary
+ table, which will ease comparison of accounts across date periods.
+ This displays the same subtotal calculations as the main table,
+ presented in a grid structure.
+ </para>
+ <orderedlist>
+ <listitem><para>Select options as above</para></listitem>
+ <listitem><para>From the <emphasis>Display</emphasis> tab,
+ enable the <emphasis>Subtotal Summary Grid</emphasis>.</para>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ <sect3>
+ <title>Use filtering to limit accounts and transactions</title>
+ <para>Accounts and transactions can be filtered for reporting
+ according to account full name (e.g. ":Business:" will
+ select account structure Income:Business:Sales, Income:Business:Grants,
+ Expenses:Business:Rent, Expenses:Business:Utilities) or transaction
+ description/notes/memo (select transactions tagged #gift).
+ The filtering text may be either a standard string, or a POSIX regular
+ expression.</para>
+ <orderedlist>
+ <listitem><para>From the <emphasis>Filter</emphasis> tab,
+ complete the <emphasis>Account Name Filter</emphasis>, or
+ <emphasis>Transaction Filter</emphasis>. Optionally toggle the
+ regular expression check boxes to toggle full POSIX regex
+ matching. Regular expressions will allow more complex
+ queries e.g. the transaction filter can be set to
+ (#gift|#travel) which will filter transactions with either
+ #gift or #travel. They can be complex and are best learned
+ from external guides.</para>
+ </listitem>
+ </orderedlist>
+ </sect3>
+ <sect3>
+ <title>I want a list of transactions showing income transactions,
+ grouped by day of week</title>
+ <para>This report may be pertinent to businesses operating with
+ variable daily income, e.g. food industry. The weekday sortkey will
+ allow subtotal comparisons according to day of week.</para>
+ <orderedlist>
+ <listitem><para>From the <emphasis>Accounts</emphasis> tab,
+ click Income, and Select Children</para></listitem>
+ <listitem><para>From <emphasis>General</emphasis> tab,
+ choose appropriate dates.</para></listitem>
+ <listitem><para>From the <emphasis>Sorting</emphasis> tab,
+ set <emphasis>Primary Key</emphasis> to Accounts, and
+ <emphasis>Secondary Key</emphasis> to Date</para></listitem>
+ <listitem><para>From the <emphasis>Sorting</emphasis> tab,
+ set <emphasis>Secondary Key Subtotal</emphasis> to Weekday</para></listitem>
+ </orderedlist>
+ </sect3>
+ <sect3>
+ <title>Using the Transaction Report to generate a
+ reconciliation statement.</title>
+ <para>This sortkey 'reconcile status' will separate reconciled,
+ cleared and unreconciled transactions. This report may be useful
+ in producing a printable reconciliation report.</para>
+ <para>Alternatively, the <emphasis>Reconciliation Report
+ </emphasis> will preset these defaults and requires only the
+ Accounts selection.
+ </para>
+ <orderedlist>
+ <listitem><para>From the <emphasis>Accounts</emphasis> tab,
+ select the relevant bank or credit card account</para></listitem>
+ <listitem><para>From the <emphasis>General</emphasis> tab,
+ choose an appropriate date range e.g. past 3 months</para></listitem>
+ <listitem><para>From the <emphasis>Sorting</emphasis> tab,
+ set the <emphasis>Primary Key</emphasis> to Reconcile
+ Status, <emphasis>Primary Key Subtotal</emphasis> to enabled,
+ and set the <emphasis>Secondary Key</emphasis> to Date. The
+ <emphasis>Secondary Date Subtotal</emphasis> is left to None
+ </para></listitem>
+ </orderedlist>
+ </sect3>
</sect2>
</sect1>
</chapter>
commit fffa817cd5d98a493d198f998fd77d79949a0735
Author: christopherlam <christopher.lck at gmail.com>
Date: Mon Jan 22 13:34:45 2018 +0800
typo - this is called subtotal summary grid
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 2ba938f..54c86ae 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -816,7 +816,7 @@ an empty report will be generated.</para>
</para>
<orderedlist>
<listitem><para>As above</para></listitem>
- <listitem><para><emphasis>Display</emphasis>: Subtotal Table enabled</para></listitem>
+ <listitem><para><emphasis>Display</emphasis>: Subtotal Summary Grid</para></listitem>
</orderedlist>
</answer>
</qandaentry>
commit b9a2721b636f0d7bb8ef28dbc3b9870b8a82be38
Author: christopherlam <christopher.lck at gmail.com>
Date: Mon Jan 22 13:33:21 2018 +0800
fix typo - subtotal grid in Display tab
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 21d8c2d..2ba938f 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -816,7 +816,7 @@ an empty report will be generated.</para>
</para>
<orderedlist>
<listitem><para>As above</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Subtotal Table enabled</para></listitem>
+ <listitem><para><emphasis>Display</emphasis>: Subtotal Table enabled</para></listitem>
</orderedlist>
</answer>
</qandaentry>
commit 7a0077d7ec236c60f54bcbb1eaeeab60fd62cd41
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Jan 22 08:39:32 2018 +0800
improve wording for Q&A
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 0230370..21d8c2d 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -770,8 +770,8 @@ an empty report will be generated.</para>
<answer>
<para>The following sequence will select all subaccounts from the
parent Expense account, select appropriate dates, and sort by account
- and date. This will usually be the most
- basic transaction report format.
+ and date. This will usually be the most useful basic transaction
+ report format.
</para>
<orderedlist>
<listitem><para><emphasis>Accounts</emphasis>: click Expense, and
@@ -790,9 +790,12 @@ an empty report will be generated.</para>
<para>How much did I spend on various expenses, grouped by month?</para>
</question>
<answer>
- <para>The following sequence will modify the above Transaction Report
- options to subdivide each account into monthly groups and separately
- produce subtotals.</para>
+ <para>The following will modify the above Transaction Report to use
+ a secondary grouping strategy. The first grouping (i.e. Primary Key =
+ Accounts, Subtotal = enabled) will group transactions from the same
+ accounts, whereas the secondary grouping (i.e. Secondary Key = Date,
+ Subtotal = Monthly) will also calculate monthly sums within each
+ account.</para>
<orderedlist>
<listitem><para>Select options as above</para></listitem>
<listitem><para><emphasis>Sorting</emphasis>: Secondary Key
@@ -806,10 +809,10 @@ an empty report will be generated.</para>
comparison?</para>
</question>
<answer>
- <para>The following sequence will add a subtotal summary table in a
- grid, which will ease comparison of accounts across date periods.
- The subtotal summary grid displays the same subtotal calculations as
- above, presented in a grid structure.
+ <para>The Display / Subtotal Summary Grid adds a subtotal summary
+ table, which will ease comparison of accounts across date periods.
+ This displays the same subtotal calculations as the main table,
+ presented in a grid structure.
</para>
<orderedlist>
<listitem><para>As above</para></listitem>
@@ -824,7 +827,7 @@ an empty report will be generated.</para>
<answer>
<para>New to Gnucash 3.0, accounts and transactions can be filtered
for reporting according to account full name (e.g. ":Business:" will
- select account structure Income:Business:Sales Income:Business:Grants,
+ select account structure Income:Business:Sales, Income:Business:Grants,
Expenses:Business:Rent, Expenses:Business:Utilities) or transaction
description/notes/memo (select transactions tagged #gift or #travel).
The filtering text may be either a standard string, or a POSIX regular
@@ -843,6 +846,15 @@ an empty report will be generated.</para>
July 2015 to 30 June 2016, grouped by quarter</para>
</question>
<answer>
+ <para>Generally, the Accounts selection box will be used to specify
+ the source accounts containing transactions that require reporting.
+ Selecting Income, then "Select Children" will include all
+ subaccounts from the Income account, e.g. Income:Freelance,
+ Income:Salary, Income:Interest can all be included. Please
+ note the account list is saved between <application>&app;</application>
+ sessions. If the account structure is modified (e.g. moving
+ accounts, deleting/adding new accounts), the account selection
+ must usually be recreated.</para>
<orderedlist>
<listitem><para><emphasis>Accounts</emphasis>: click Income, and
Select Children</para></listitem>
@@ -857,7 +869,7 @@ an empty report will be generated.</para>
</qandaentry>
<qandaentry>
<question>
- <para>I wish a list of transactions showing income transactions,
+ <para>I want a list of transactions showing income transactions,
grouped by day of week</para>
</question>
<answer>
@@ -873,7 +885,7 @@ an empty report will be generated.</para>
</qandaentry>
<qandaentry>
<question>
- <para>I wish to print my bank account or credit card transactions,
+ <para>I want to print my bank account or credit card transactions,
similar to the reconciliation report.</para>
</question>
<answer>
@@ -883,8 +895,8 @@ an empty report will be generated.</para>
<orderedlist>
<listitem><para><emphasis>Accounts</emphasis>: select the relevant
bank or credit card account</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose absolute dates
- “01/07/2015†to “30/06/2016â€</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose appropriate dates
+ e.g. past 3 months</para></listitem>
<listitem><para><emphasis>Sorting</emphasis>: Primary Key: Reconcile
Status, Secondary Key: Date</para></listitem>
<listitem><para><emphasis>Sorting</emphasis> Secondary Date
commit ab2539fcc2ba6827ec19b5259727d0c8afb149a2
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Jan 22 08:31:12 2018 +0800
max-width 80
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 0abacb6..0230370 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -1,10 +1,11 @@
<!--
(Do not remove this comment block.)
Version: 2.6.15
- Last modified: October 31, 2016
+ Last modified: January, 2018
Maintainers:
Chris Lyttle <chris at wilddev.net>
Chris Good <chris.good at ozemail.com.au>
+ Christopher Lam
Author:
Jon Lapham <lapham at extracta.com.br>
Originally designed by Carol Champagne.
@@ -618,41 +619,67 @@ an empty report will be generated.</para>
<title>Transaction Report</title>
<sect2 id="rpt_TR_new">
<title>New in Gnucash 3.0</title>
- <para>The Transaction Report has undergone several major upgrades, bug fixes, and new features. It aims to be the most versatile report to retrieve useful information from the financial records.</para>
+ <para>The Transaction Report has undergone several major upgrades, bug
+ fixes, and new features. It aims to be the most versatile report to retrieve
+ useful information from the financial records.</para>
<itemizedlist>
<listitem>
- <para><emphasis>New!</emphasis> Debit and Credit subtotals are now displayed in the appropriate columns. Within a grouping section, if debit totals > credit totals, the group subtotal will be displayed in the debit column.</para>
+ <para><emphasis>New!</emphasis> Debit and Credit subtotals are now
+ displayed in the appropriate columns. Within a grouping section, if
+ debit totals > credit totals, the group subtotal will be displayed in
+ the debit column.</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Multiple data columns enable display of foreign currency and original currency in separate columns.</para>
+ <para><emphasis>New!</emphasis> Multiple data columns enable display of
+ foreign currency and original currency in separate columns.</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Additional sortkeys e.g. sort by reconcile status (unreconciled -> cleared -> reconciled), sort by weekday, allow additional views into the financial records.</para>
+ <para><emphasis>New!</emphasis> Additional sortkeys e.g. sort by
+ reconcile status (unreconciled -> cleared -> reconciled), sort by
+ weekday, allow additional views into the financial records.</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Full text filter enabled for description, notes and memo, and for account full names. This allows easier selection of source account names and tailored reporting. Filters can optionally use full POSIX regular expressions.</para>
+ <para><emphasis>New!</emphasis> Full text filter enabled for
+ description, notes and memo, and for account full names. This allows
+ easier selection of source account names and tailored reporting. Filters
+ can optionally use full POSIX regular expressions.</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Indenting of columns will indent the report columns for easier understanding of grouping and sorting. (This is now enabled by default)</para>
+ <para><emphasis>New!</emphasis> Indenting of columns will indent the
+ report columns for easier understanding of grouping and sorting. (This
+ is now enabled by default)</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Subtotal table is useful to understand the relationship in the data e.g. account values in time series.</para>
+ <para><emphasis>New!</emphasis> Subtotal table is useful to understand
+ the relationship in the data e.g. account values in time series.</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Filter by Closing Transactions will disallow closing transactions (i.e. income & expense accounts to equity) which should not routinely be included in transaction reports. (This is now enabled by default.)</para>
+ <para><emphasis>New!</emphasis> Filter by Closing Transactions will
+ disallow closing transactions (i.e. income & expense accounts to
+ equity) which should not routinely be included in transaction reports.
+ (This is now enabled by default.)</para>
</listitem>
<listitem>
- <para><emphasis>New!</emphasis> Options Summary will print a list of report options that were changed by the user. This is mainly useful to troubleshoot reports.</para>
+ <para><emphasis>New!</emphasis> Options Summary will print a list of
+ report options that were changed by the user. This is mainly useful to
+ troubleshoot reports.</para>
</listitem>
<listitem>
- <para>Bugs fixed - numerous bugs identified were fixed; e.g. sign display was fixed, correct grouping of periodic dates.</para>
+ <para>Bugs fixed - numerous bugs identified were fixed; e.g. sign
+ display was fixed, correct grouping of periodic dates.</para>
</listitem>
</itemizedlist>
</sect2>
<sect2 id="rpt_TR_newbie">
<title>The Newbie Guide to the Transaction Report</title>
- <para>The Transaction Report can be heavily customised to produce most reports appropriate for personal finance and business bookkeeping purposes. It aims to retrieve and filter information from the database, and present transactions and totals, useful for the user and the accountant.</para>
- <para>The following newbie guide to the Transaction Report will assume the user has set up the chart of accounts according to conventional bookkeeping practice. For example, the following describes a typical household book with skeleton accounts. Further accounts will undoubtedly be necessary.</para>
+ <para>The Transaction Report can be heavily customised to produce most
+ reports appropriate for personal finance and business bookkeeping purposes.
+ It aims to retrieve and filter information from the database, and present
+ transactions and totals, useful for the user and the accountant.</para>
+ <para>The following newbie guide to the Transaction Report will assume the
+ user has set up the chart of accounts according to conventional bookkeeping
+ practice. For example, the following describes a typical household book with
+ skeleton accounts. Further accounts will undoubtedly be necessary.</para>
<table>
<title>CHART OF ACCOUNTS</title>
<tgroup cols='2' align='left' colsep='1' rowsep='1'>
@@ -726,23 +753,35 @@ an empty report will be generated.</para>
</tbody>
</tgroup>
</table>
- <para>Conventionally, the oldest transaction would be equity transfers from Equity:Opening Balances to Asset and Liability Accounts. Most subsequent transactions would be transfers from Income/Expense accounts to Assets/Liability accounts (representing day-to-day activity e.g. receiving salary, paying utility bill), or transfers between assets and liability accounts (representing movements between loans and assets, e.g. paying credit card bill, receiving a loan).</para>
- <para>The following use cases will be illustrated, and the options to be selected explained:</para>
+ <para>Conventionally, the oldest transaction would be equity transfers from
+ Equity:Opening Balances to Asset and Liability Accounts. Most subsequent
+ transactions would be transfers from Income/Expense accounts to
+ Assets/Liability accounts (representing day-to-day activity e.g. receiving
+ salary, paying utility bill), or transfers between assets and liability
+ accounts (representing movements between loans and assets, e.g. paying
+ credit card bill, receiving a loan).</para>
+ <para>The following use cases will be illustrated, and the options to be
+ selected explained:</para>
<qandaset defaultlabel='none'>
<qandaentry>
<question>
<para>How much did I spend on various expense accounts last year?</para>
</question>
<answer>
- <para>The following sequence will select all subaccounts from the parent Expense account,
- select appropriate dates, and sort by account and date. This will usually be the most
+ <para>The following sequence will select all subaccounts from the
+ parent Expense account, select appropriate dates, and sort by account
+ and date. This will usually be the most
basic transaction report format.
</para>
<orderedlist>
- <listitem><para><emphasis>Accounts</emphasis>: click Expense, and Select Children</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose relative dates “Start of Previous Year†and “End of Previous Yearâ€</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts, Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal: Enabled, Secondary Key Subtotal: None </para></listitem>
+ <listitem><para><emphasis>Accounts</emphasis>: click Expense, and
+ Select Children</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose relative dates
+ “Start of Previous Year†and “End of Previous Yearâ€</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts,
+ Secondary Key: Date</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal:
+ Enabled, Secondary Key Subtotal: None </para></listitem>
</orderedlist>
</answer>
</qandaentry>
@@ -751,22 +790,26 @@ an empty report will be generated.</para>
<para>How much did I spend on various expenses, grouped by month?</para>
</question>
<answer>
- <para>The following sequence will modify the above Transaction Report options
- to subdivide each account into monthly groups and separately produce subtotals.</para>
+ <para>The following sequence will modify the above Transaction Report
+ options to subdivide each account into monthly groups and separately
+ produce subtotals.</para>
<orderedlist>
<listitem><para>Select options as above</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Secondary Key Subtotal: Monthly</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Secondary Key
+ Subtotal: Monthly</para></listitem>
</orderedlist>
</answer>
</qandaentry>
<qandaentry>
<question>
- <para>How much did I spend on various expenses, with monthly comparison?</para>
+ <para>How much did I spend on various expenses, with monthly
+ comparison?</para>
</question>
<answer>
- <para>The following sequence will add a subtotal summary table in a grid, which
- will ease comparison of accounts across date periods. The subtotal summary grid
- displays the same subtotal calculations as above, presented in a grid structure.
+ <para>The following sequence will add a subtotal summary table in a
+ grid, which will ease comparison of accounts across date periods.
+ The subtotal summary grid displays the same subtotal calculations as
+ above, presented in a grid structure.
</para>
<orderedlist>
<listitem><para>As above</para></listitem>
@@ -779,57 +822,73 @@ an empty report will be generated.</para>
<para>Can I select tagged accounts or transactions for reporting?</para>
</question>
<answer>
- <para>New to Gnucash 3.0, accounts and transactions can be filtered for reporting according
- to account full name (e.g. ":Business:" will select account structure Income:Business:Sales
- Income:Business:Grants, Expenses:Business:Rent, Expenses:Business:Utilities) or transaction
- description/notes/memo (select transactions tagged #gift or #travel). The filtering text
- may be either a standard string, or a POSIX regular expression matcher.
+ <para>New to Gnucash 3.0, accounts and transactions can be filtered
+ for reporting according to account full name (e.g. ":Business:" will
+ select account structure Income:Business:Sales Income:Business:Grants,
+ Expenses:Business:Rent, Expenses:Business:Utilities) or transaction
+ description/notes/memo (select transactions tagged #gift or #travel).
+ The filtering text may be either a standard string, or a POSIX regular
+ expression.
</para>
<orderedlist>
- <listitem><para><emphasis>Filter</emphasis>: Select either Account Name Filter, or
- Transaction Filter. Optionally toggle the regular expression check boxes to toggle
- full POSIX regex matching.</para></listitem>
+ <listitem><para><emphasis>Filter</emphasis>: Select either Account
+ Name Filter, or Transaction Filter. Optionally toggle the regular
+ expression check boxes to toggle full POSIX regex matching.</para></listitem>
</orderedlist>
</answer>
</qandaentry>
<qandaentry>
<question>
- <para>I wish a list of transactions showing my income for the year 1 July 2015 to 30 June 2016, grouped by quarter</para>
+ <para>I want a list of transactions showing my income for the year 1
+ July 2015 to 30 June 2016, grouped by quarter</para>
</question>
<answer>
<orderedlist>
- <listitem><para><emphasis>Accounts</emphasis>: click Income, and Select Children</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose absolute dates “01/07/2015†to “30/06/2016â€</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts, Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal: Enabled, Secondary Date Subtotal: Quarter</para></listitem>
+ <listitem><para><emphasis>Accounts</emphasis>: click Income, and
+ Select Children</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose absolute dates
+ “01/07/2015†to “30/06/2016â€</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts,
+ Secondary Key: Date</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal:
+ Enabled, Secondary Date Subtotal: Quarter</para></listitem>
</orderedlist>
</answer>
</qandaentry>
<qandaentry>
<question>
- <para>I wish a list of transactions showing income transactions, grouped by day of week</para>
+ <para>I wish a list of transactions showing income transactions,
+ grouped by day of week</para>
</question>
<answer>
- <para>This report may be pertinent to businesses operating with variable daily income, e.g. food industry.
- The weekday sortkey will allow subtotal comparisons according to day of week.</para>
+ <para>This report may be pertinent to businesses operating with
+ variable daily income, e.g. food industry. The weekday sortkey will
+ allow subtotal comparisons according to day of week.</para>
<orderedlist>
<listitem><para>As above</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Secondary Key Subtotal: Weekday</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Secondary Key
+ Subtotal: Weekday</para></listitem>
</orderedlist>
</answer>
</qandaentry>
<qandaentry>
<question>
- <para>I wish to print my bank account or credit card transactions, similar to the reconciliation report.</para>
+ <para>I wish to print my bank account or credit card transactions,
+ similar to the reconciliation report.</para>
</question>
<answer>
- <para>This sortkey 'reconcile status' will separate reconciled, cleared and unreconciled transactions.
- This report may be useful in producing a printable reconciliation report.</para>
+ <para>This sortkey 'reconcile status' will separate reconciled,
+ cleared and unreconciled transactions. This report may be useful in
+ producing a printable reconciliation report.</para>
<orderedlist>
- <listitem><para><emphasis>Accounts</emphasis>: select the relevant bank or credit card account</para></listitem>
- <listitem><para><emphasis>General</emphasis>: Choose absolute dates “01/07/2015†to “30/06/2016â€</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Reconcile Status, Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Sorting</emphasis> Secondary Date Subtotal: None</para></listitem>
+ <listitem><para><emphasis>Accounts</emphasis>: select the relevant
+ bank or credit card account</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose absolute dates
+ “01/07/2015†to “30/06/2016â€</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Reconcile
+ Status, Secondary Key: Date</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis> Secondary Date
+ Subtotal: None</para></listitem>
</orderedlist>
</answer>
</qandaentry>
commit 8bb6d01acaf490f8bec9f731c06193f775d6eabf
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jan 21 16:13:56 2018 +0800
add Q&A for txn text search
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 973eaa3..0abacb6 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -776,6 +776,24 @@ an empty report will be generated.</para>
</qandaentry>
<qandaentry>
<question>
+ <para>Can I select tagged accounts or transactions for reporting?</para>
+ </question>
+ <answer>
+ <para>New to Gnucash 3.0, accounts and transactions can be filtered for reporting according
+ to account full name (e.g. ":Business:" will select account structure Income:Business:Sales
+ Income:Business:Grants, Expenses:Business:Rent, Expenses:Business:Utilities) or transaction
+ description/notes/memo (select transactions tagged #gift or #travel). The filtering text
+ may be either a standard string, or a POSIX regular expression matcher.
+ </para>
+ <orderedlist>
+ <listitem><para><emphasis>Filter</emphasis>: Select either Account Name Filter, or
+ Transaction Filter. Optionally toggle the regular expression check boxes to toggle
+ full POSIX regex matching.</para></listitem>
+ </orderedlist>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
<para>I wish a list of transactions showing my income for the year 1 July 2015 to 30 June 2016, grouped by quarter</para>
</question>
<answer>
@@ -802,14 +820,16 @@ an empty report will be generated.</para>
</qandaentry>
<qandaentry>
<question>
- <para>I wish to print my bank account or credit card transactions, reconciled first, then cleared, then unreconciled transactions</para>
+ <para>I wish to print my bank account or credit card transactions, similar to the reconciliation report.</para>
</question>
<answer>
+ <para>This sortkey 'reconcile status' will separate reconciled, cleared and unreconciled transactions.
+ This report may be useful in producing a printable reconciliation report.</para>
<orderedlist>
<listitem><para><emphasis>Accounts</emphasis>: select the relevant bank or credit card account</para></listitem>
<listitem><para><emphasis>General</emphasis>: Choose absolute dates “01/07/2015†to “30/06/2016â€</para></listitem>
<listitem><para><emphasis>Sorting</emphasis>: Primary Key: Reconcile Status, Secondary Key: Date</para></listitem>
- <listitem><para><emphasis>Secondary</emphasis> Date Subtotal: None</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis> Secondary Date Subtotal: None</para></listitem>
</orderedlist>
</answer>
</qandaentry>
commit 98692dea3128bf3ff7afb5bf8efa5c7f1b6e411b
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jan 21 15:01:14 2018 +0800
convert option sequence to lists
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 7ec40a6..973eaa3 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -728,16 +728,22 @@ an empty report will be generated.</para>
</table>
<para>Conventionally, the oldest transaction would be equity transfers from Equity:Opening Balances to Asset and Liability Accounts. Most subsequent transactions would be transfers from Income/Expense accounts to Assets/Liability accounts (representing day-to-day activity e.g. receiving salary, paying utility bill), or transfers between assets and liability accounts (representing movements between loans and assets, e.g. paying credit card bill, receiving a loan).</para>
<para>The following use cases will be illustrated, and the options to be selected explained:</para>
- <qandaset>
+ <qandaset defaultlabel='none'>
<qandaentry>
<question>
<para>How much did I spend on various expense accounts last year?</para>
</question>
<answer>
- <para>Accounts: click Expense, and Select Children</para>
- <para>General: Choose relative dates “Start of Previous Year†and “End of Previous Yearâ€</para>
- <para>Sorting: Primary Key: Accounts, Secondary Key: Date</para>
- <para>Sorting: Primary Key Subtotal: Enabled, Secondary Key Subtotal: None </para>
+ <para>The following sequence will select all subaccounts from the parent Expense account,
+ select appropriate dates, and sort by account and date. This will usually be the most
+ basic transaction report format.
+ </para>
+ <orderedlist>
+ <listitem><para><emphasis>Accounts</emphasis>: click Expense, and Select Children</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose relative dates “Start of Previous Year†and “End of Previous Yearâ€</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts, Secondary Key: Date</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal: Enabled, Secondary Key Subtotal: None </para></listitem>
+ </orderedlist>
</answer>
</qandaentry>
<qandaentry>
@@ -745,8 +751,12 @@ an empty report will be generated.</para>
<para>How much did I spend on various expenses, grouped by month?</para>
</question>
<answer>
- <para>As above</para>
- <para>Sorting: Secondary Key Subtotal: Monthly</para>
+ <para>The following sequence will modify the above Transaction Report options
+ to subdivide each account into monthly groups and separately produce subtotals.</para>
+ <orderedlist>
+ <listitem><para>Select options as above</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Secondary Key Subtotal: Monthly</para></listitem>
+ </orderedlist>
</answer>
</qandaentry>
<qandaentry>
@@ -754,8 +764,14 @@ an empty report will be generated.</para>
<para>How much did I spend on various expenses, with monthly comparison?</para>
</question>
<answer>
- <para> As above</para>
- <para>General: Subtotal Table enabled</para>
+ <para>The following sequence will add a subtotal summary table in a grid, which
+ will ease comparison of accounts across date periods. The subtotal summary grid
+ displays the same subtotal calculations as above, presented in a grid structure.
+ </para>
+ <orderedlist>
+ <listitem><para>As above</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Subtotal Table enabled</para></listitem>
+ </orderedlist>
</answer>
</qandaentry>
<qandaentry>
@@ -763,10 +779,12 @@ an empty report will be generated.</para>
<para>I wish a list of transactions showing my income for the year 1 July 2015 to 30 June 2016, grouped by quarter</para>
</question>
<answer>
- <para>Accounts: click Income, and Select Children</para>
- <para>General: Choose absolute dates “01/07/2015†to “30/06/2016â€</para>
- <para>Sorting: Primary Key: Accounts, Secondary Key: Date</para>
- <para>Sorting: Primary Key Subtotal: Enabled, Secondary Date Subtotal: Quarter</para>
+ <orderedlist>
+ <listitem><para><emphasis>Accounts</emphasis>: click Income, and Select Children</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose absolute dates “01/07/2015†to “30/06/2016â€</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Accounts, Secondary Key: Date</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key Subtotal: Enabled, Secondary Date Subtotal: Quarter</para></listitem>
+ </orderedlist>
</answer>
</qandaentry>
<qandaentry>
@@ -774,8 +792,12 @@ an empty report will be generated.</para>
<para>I wish a list of transactions showing income transactions, grouped by day of week</para>
</question>
<answer>
- <para>As above</para>
- <para>Sorting: Secondary Key Subtotal: Weekday</para>
+ <para>This report may be pertinent to businesses operating with variable daily income, e.g. food industry.
+ The weekday sortkey will allow subtotal comparisons according to day of week.</para>
+ <orderedlist>
+ <listitem><para>As above</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Secondary Key Subtotal: Weekday</para></listitem>
+ </orderedlist>
</answer>
</qandaentry>
<qandaentry>
@@ -783,10 +805,12 @@ an empty report will be generated.</para>
<para>I wish to print my bank account or credit card transactions, reconciled first, then cleared, then unreconciled transactions</para>
</question>
<answer>
- <para>Accounts: select the relevant bank or credit card account</para>
- <para>General: Choose absolute dates “01/07/2015†to “30/06/2016â€</para>
- <para>Sorting: Primary Key: Reconcile Status, Secondary Key: Date</para>
- <para>Secondary Date Subtotal: None</para>
+ <orderedlist>
+ <listitem><para><emphasis>Accounts</emphasis>: select the relevant bank or credit card account</para></listitem>
+ <listitem><para><emphasis>General</emphasis>: Choose absolute dates “01/07/2015†to “30/06/2016â€</para></listitem>
+ <listitem><para><emphasis>Sorting</emphasis>: Primary Key: Reconcile Status, Secondary Key: Date</para></listitem>
+ <listitem><para><emphasis>Secondary</emphasis> Date Subtotal: None</para></listitem>
+ </orderedlist>
</answer>
</qandaentry>
</qandaset>
commit ab268fcdaed8ea092a7b95c0c418cc41a8463be7
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Jan 19 23:19:01 2018 +0800
Add Newbie Guide to the TR
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 7d4e3e4..7ec40a6 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -613,4 +613,183 @@ an empty report will be generated.</para>
</sect3>
</sect2>
</sect1>
+
+<sect1 id="rpt_transaction">
+ <title>Transaction Report</title>
+ <sect2 id="rpt_TR_new">
+ <title>New in Gnucash 3.0</title>
+ <para>The Transaction Report has undergone several major upgrades, bug fixes, and new features. It aims to be the most versatile report to retrieve useful information from the financial records.</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>New!</emphasis> Debit and Credit subtotals are now displayed in the appropriate columns. Within a grouping section, if debit totals > credit totals, the group subtotal will be displayed in the debit column.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Multiple data columns enable display of foreign currency and original currency in separate columns.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Additional sortkeys e.g. sort by reconcile status (unreconciled -> cleared -> reconciled), sort by weekday, allow additional views into the financial records.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Full text filter enabled for description, notes and memo, and for account full names. This allows easier selection of source account names and tailored reporting. Filters can optionally use full POSIX regular expressions.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Indenting of columns will indent the report columns for easier understanding of grouping and sorting. (This is now enabled by default)</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Subtotal table is useful to understand the relationship in the data e.g. account values in time series.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Filter by Closing Transactions will disallow closing transactions (i.e. income & expense accounts to equity) which should not routinely be included in transaction reports. (This is now enabled by default.)</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>New!</emphasis> Options Summary will print a list of report options that were changed by the user. This is mainly useful to troubleshoot reports.</para>
+ </listitem>
+ <listitem>
+ <para>Bugs fixed - numerous bugs identified were fixed; e.g. sign display was fixed, correct grouping of periodic dates.</para>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+ <sect2 id="rpt_TR_newbie">
+ <title>The Newbie Guide to the Transaction Report</title>
+ <para>The Transaction Report can be heavily customised to produce most reports appropriate for personal finance and business bookkeeping purposes. It aims to retrieve and filter information from the database, and present transactions and totals, useful for the user and the accountant.</para>
+ <para>The following newbie guide to the Transaction Report will assume the user has set up the chart of accounts according to conventional bookkeeping practice. For example, the following describes a typical household book with skeleton accounts. Further accounts will undoubtedly be necessary.</para>
+ <table>
+ <title>CHART OF ACCOUNTS</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <thead>
+ <row>
+ <entry>Account Name</entry>
+ <entry>Account Type</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Asset</entry>
+ <entry>ASSET (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Asset:Bank</entry>
+ <entry>BANK</entry>
+ </row>
+ <row>
+ <entry>Asset:Property</entry>
+ <entry>ASSET</entry>
+ </row>
+ <row>
+ <entry>Liability</entry>
+ <entry>LIABILITY (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Liability:Credit Card</entry>
+ <entry>CREDIT CARD</entry>
+ </row>
+ <row>
+ <entry>Liability:Home Loan</entry>
+ <entry>LIABILITY</entry>
+ </row>
+ <row>
+ <entry>Income</entry>
+ <entry>INCOME (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Income:Salary</entry>
+ <entry>INCOME</entry>
+ </row>
+ <row>
+ <entry>Income:Interest</entry>
+ <entry>INCOME</entry>
+ </row>
+ <row>
+ <entry>Expense</entry>
+ <entry>EXPENSE (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Expense:Groceries</entry>
+ <entry>EXPENSE</entry>
+ </row>
+ <row>
+ <entry>Expense:Auto</entry>
+ <entry>EXPENSE</entry>
+ </row>
+ <row>
+ <entry>Expense:Medical</entry>
+ <entry>EXPENSE</entry>
+ </row>
+ <row>
+ <entry>Equity</entry>
+ <entry>EQUITY (placeholder)</entry>
+ </row>
+ <row>
+ <entry>Equity:Opening Balances</entry>
+ <entry>EQUITY</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>Conventionally, the oldest transaction would be equity transfers from Equity:Opening Balances to Asset and Liability Accounts. Most subsequent transactions would be transfers from Income/Expense accounts to Assets/Liability accounts (representing day-to-day activity e.g. receiving salary, paying utility bill), or transfers between assets and liability accounts (representing movements between loans and assets, e.g. paying credit card bill, receiving a loan).</para>
+ <para>The following use cases will be illustrated, and the options to be selected explained:</para>
+ <qandaset>
+ <qandaentry>
+ <question>
+ <para>How much did I spend on various expense accounts last year?</para>
+ </question>
+ <answer>
+ <para>Accounts: click Expense, and Select Children</para>
+ <para>General: Choose relative dates “Start of Previous Year†and “End of Previous Yearâ€</para>
+ <para>Sorting: Primary Key: Accounts, Secondary Key: Date</para>
+ <para>Sorting: Primary Key Subtotal: Enabled, Secondary Key Subtotal: None </para>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
+ <para>How much did I spend on various expenses, grouped by month?</para>
+ </question>
+ <answer>
+ <para>As above</para>
+ <para>Sorting: Secondary Key Subtotal: Monthly</para>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
+ <para>How much did I spend on various expenses, with monthly comparison?</para>
+ </question>
+ <answer>
+ <para> As above</para>
+ <para>General: Subtotal Table enabled</para>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
+ <para>I wish a list of transactions showing my income for the year 1 July 2015 to 30 June 2016, grouped by quarter</para>
+ </question>
+ <answer>
+ <para>Accounts: click Income, and Select Children</para>
+ <para>General: Choose absolute dates “01/07/2015†to “30/06/2016â€</para>
+ <para>Sorting: Primary Key: Accounts, Secondary Key: Date</para>
+ <para>Sorting: Primary Key Subtotal: Enabled, Secondary Date Subtotal: Quarter</para>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
+ <para>I wish a list of transactions showing income transactions, grouped by day of week</para>
+ </question>
+ <answer>
+ <para>As above</para>
+ <para>Sorting: Secondary Key Subtotal: Weekday</para>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
+ <para>I wish to print my bank account or credit card transactions, reconciled first, then cleared, then unreconciled transactions</para>
+ </question>
+ <answer>
+ <para>Accounts: select the relevant bank or credit card account</para>
+ <para>General: Choose absolute dates “01/07/2015†to “30/06/2016â€</para>
+ <para>Sorting: Primary Key: Reconcile Status, Secondary Key: Date</para>
+ <para>Secondary Date Subtotal: None</para>
+ </answer>
+ </qandaentry>
+ </qandaset>
+ </sect2>
+</sect1>
</chapter>
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 50f56c0..790bb0d 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -1,7 +1,8 @@
<!--
(Do not remove this comment block.)
Version: 2.0.x
- Last modified: December 7th 2009
+ Last modified: January 20th 2017
+ modified: December 7th 2009
modified: May 13th 2007
modified: November 28th 2006
modified: August 12th 2006
@@ -463,7 +464,7 @@
</tgroup>
</informaltable>
<note>
- <para>Before stable version 2.8.0
+ <para>Before stable version 3.0
<emphasis>Detail Level</emphasis> was called <emphasis>Style</emphasis> on the General tab.</para>
</note>
@@ -563,7 +564,7 @@
</tbody>
</tgroup>
</informaltable>
- <note><para>In stable version 2.8.0, the <emphasis>Style</emphasis> option will be renamed to <emphasis>Detail Level</emphasis>
+ <note><para>In stable version 3.0, the <emphasis>Style</emphasis> option will be renamed to <emphasis>Detail Level</emphasis>
and moved to the Display tab.</para>
</note>
</listitem>
@@ -645,7 +646,7 @@
<title>Displaying Split Account Details</title>
<para>This is controled by the <emphasis>Detail Level</emphasis> option on the Display tab.</para>
<note>
- <para>In stable versions before 2.8.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
+ <para>In stable versions before 3.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
</note>
<para>In <emphasis>Single</emphasis> line mode, there's only one line per transaction. So you can have
the account name on one side of the equation and
commit 9afce47de3285d79a2698d710e81425421eb376c
Merge: e5b343a b45cc9f
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sun Mar 4 01:45:35 2018 +0100
Merge branch 'maint'
commit e5b343a092b251e34ca9ff1e7e99605b9aa6297e
Merge: 50ed4eb f2298ba
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 24 10:54:12 2018 +0100
Merge branch 'maint'
commit 50ed4eb3133ba7fa977fb1a8b209bf5fe566d504
Merge: e85643b 9f2f37d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 24 10:50:50 2018 +0100
Merge branch 'maint'
commit e85643b9980d67b6bb44e6a99de4f06b84721751
Merge: 04d2191 e458fc0
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Feb 10 02:36:42 2018 +0100
Merge branch 'maint'
commit 04d21916751f5aa9978264fff07e8ee61c53865c
Merge: 3665032 8460176
Author: fell <frank.h.ellenberger at gmail.com>
Date: Wed Feb 7 21:51:03 2018 +0100
Merge branch 'maint'
commit 36650325e9d6d7e13d1521ae266c9a64ee014c04
Merge: 0602cc7 c7eb7b6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 17 13:04:57 2017 -0800
Merge branch 'maint'
commit 0602cc7b8b902b798b011c342dd11882466fa329
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Dec 11 22:12:32 2017 +0100
Update preference name and meaning
diff --git a/help/C/Help_ch_Customize.xml b/help/C/Help_ch_Customize.xml
index 0312aa5..1e1ded6 100644
--- a/help/C/Help_ch_Customize.xml
+++ b/help/C/Help_ch_Customize.xml
@@ -924,9 +924,9 @@
<itemizedlist>
<listitem>
- <para><guilabel>Don't use &app; built-in colors:</guilabel> If selected,
- the system color theme will be applied to register windows. Otherwise
- the original <application>&app;</application> register color will be used.</para>
+ <para><guilabel>Use &app; built-in color theme:</guilabel> If selected,
+ the original <application>&app;</application> register color theme will be used.
+ Otherwise the system color theme will be applied to register windows.</para>
</listitem>
<listitem>
commit 21af0e3a93329e25ff990298ee42e9c4129b4bc3
Merge: f332e99 088cea1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Dec 11 22:07:24 2017 +0100
Merge branch 'maint'
commit f332e997002b562af426607390b3b3bb163306b1
Merge: 6ac6de0 c15a2c1
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 22 16:21:16 2017 -0700
Merge branch 'maint'
commit 6ac6de00042a9de382143a5620f3361b0205ccd9
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 15 15:21:49 2017 -0700
Fix chm mapfile target and cleanfiles.
The mapfile target would fail if the directory was already built,
apparently not recognizing that its target was complete.
Cleanfiles was missing several build targets.
diff --git a/chm.make b/chm.make
index 75d2beb..76fc0e9 100644
--- a/chm.make
+++ b/chm.make
@@ -10,7 +10,6 @@ htmlhelp_xsl="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhe
$(chmfile): $(entities) $(figfiles)
$(mapfile): $(chmfile)
- mv htmlhelp.hhmap $(mapfile)
chm-local: $(chmfile) $(mapfile)
@@ -40,8 +39,9 @@ install-chm-local: $(chmfile) $(mapfile)
rm mymaps
"${HHC}" htmlhelp.hhp >/dev/null || true
mv htmlhelp.chm $(chmfile)
+ mv htmlhelp.hhmap $(mapfile)
-CLEANFILES += $(chmfile) $(mapfile) htmlhelp.hhp
+CLEANFILES += $(chmfile) $(mapfile) htmlhelp.hhp *.html toc.hhc
# Don't try to make dist from windows, this is here only to silence an
# error from the Italian translations.
EXTRA_DIST = $(entities) $(docname).xml
commit d649fb745afe969bc8dd8db0555ad5e80146ae01
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 15 14:53:52 2017 -0700
Build chm docs in Mingw.
diff --git a/Makefile.am b/Makefile.am
index 3d3445d..c11aea7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = gnucash-docs.spec \
xmldocs.make \
omf.make \
pdf.make \
+ chm.make \
stylesheet \
xsl \
HACKING \
@@ -55,4 +56,3 @@ epub-recursive $(MOBI_RECURSIVE):
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; test -z "$$fail"
-
diff --git a/chm.make b/chm.make
new file mode 100644
index 0000000..75d2beb
--- /dev/null
+++ b/chm.make
@@ -0,0 +1,47 @@
+# Create CHM help files for Win32
+# Copyright 2017 John Ralls <jralls at ceridwen.us>
+# Procedure lifted from make_chm() in gnucash-on-windows.git:install-impl.sh,
+# originally written by Andreas Köhler.
+
+chmfile=$(docname).chm
+mapfile=$(docname).hhmap
+
+htmlhelp_xsl="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl"
+
+$(chmfile): $(entities) $(figfiles)
+$(mapfile): $(chmfile)
+ mv htmlhelp.hhmap $(mapfile)
+
+chm-local: $(chmfile) $(mapfile)
+
+install-chm-local: $(chmfile) $(mapfile)
+ $(mkinstalldirs) $(DESTDIR)$(docdir)/$(lang)
+ $(INSTALL_DATA) $(chmfile) $(DESTDIR)$(docdir)/$(lang)
+ $(INSTALL_DATA) $(mapfile) $(DESTDIR)$(docdir)/$(lang)
+
+.xml.chm:
+ ${XSLTPROC} ${htmlhelp_xsl} ${srcdir}/$(docname).xml
+ count=0
+ echo >> htmlhelp.hhp
+ echo "[ALIAS]" >> htmlhelp.hhp
+ echo "IDH_0=index.html" >> htmlhelp.hhp
+ echo "#define IDH_0 0" > mymaps
+ echo "[Map]" > htmlhelp.hhmap
+ echo "Searching for anchors ..."
+ for id in `cat ${srcdir}/*.xml | sed '/sect.*id=/!d;s,.*id=["'\'']\([^"'\'']*\)["'\''].*,\1,'` ; do \
+ files=`grep -l "[\"']${id}[\"']" *.html` || continue; \
+ echo "IDH_$((++count))=${files}#${id}" >> htmlhelp.hhp; \
+ echo "#define IDH_${count} ${count}" >> mymaps; \
+ echo "${id}=${count}" >> htmlhelp.hhmap; \
+ done
+ echo >> htmlhelp.hhp
+ echo "[MAP]" >> htmlhelp.hhp
+ cat mymaps >> htmlhelp.hhp
+ rm mymaps
+ "${HHC}" htmlhelp.hhp >/dev/null || true
+ mv htmlhelp.chm $(chmfile)
+
+CLEANFILES += $(chmfile) $(mapfile) htmlhelp.hhp
+# Don't try to make dist from windows, this is here only to silence an
+# error from the Italian translations.
+EXTRA_DIST = $(entities) $(docname).xml
diff --git a/configure.ac b/configure.ac
index 196d13e..feb1f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([gnucash-docs], [2.6.99], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/])
+AC_CANONICAL_HOST
dnl ==========================================================================
dnl
@@ -189,6 +190,20 @@ case $LANG in
lang_us=false ;;
esac
+ac_cv_gnc_windows="no"
+case $host_os in
+ mingw*)
+ ac_cv_gnc_windows="yes"
+ AC_PATH_PROG([HHC], hhc.exe, [hhc_not_found], [/c/Program Files (x86)/Html Help Workshop:/c/Program Files/Html Help Workshop])
+ if test ! -x "${HHC}"; then
+ AC_MSG_ERROR([Html Help Workshop Not Found])
+ fi
+ AM_EXTRA_RECURSIVE_TARGETS([chm install-chm])
+ ;;
+ *)
+ ;;
+esac
+AM_CONDITIONAL([GNC_WINDOWS], [test x${ac_cv_gnc_windows} = "xyes"])
AM_CONDITIONAL([LANG_US], [test x${lang_us} = "xtrue"])
AC_CONFIG_FILES([
gnucash-docs.spec
diff --git a/guide/C/Makefile.am b/guide/C/Makefile.am
index ccc5196..2770cfd 100644
--- a/guide/C/Makefile.am
+++ b/guide/C/Makefile.am
@@ -36,9 +36,13 @@ entities = \
appendixd.xml
DISTCLEANFILES = $(docname)-C.omf.out
CLEANFILES = $(DISTCLEANFILES)
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
diff --git a/guide/de/Makefile.am b/guide/de/Makefile.am
index 20a8376..799231b 100644
--- a/guide/de/Makefile.am
+++ b/guide/de/Makefile.am
@@ -34,9 +34,13 @@ entities = \
DISTCLEANFILES = $(docname)-de.omf.out
CLEANFILES = $(DISTCLEANFILES)
XSLTFLAGS_FO= --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
diff --git a/guide/it/Makefile.am b/guide/it/Makefile.am
index 5c5f816..e2508e2 100644
--- a/guide/it/Makefile.am
+++ b/guide/it/Makefile.am
@@ -5,12 +5,16 @@ omffile = $(docname)-it.omf
DISTCLEANFILES = $(docname)-it.omf.out
CLEANFILES = $(DISTCLEANFILES)
XSLTFLAGS_FO= --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
COMPONENTS = \
${top_srcdir}/guide/C/gnucash-guide.xml \
diff --git a/guide/ja/Makefile.am b/guide/ja/Makefile.am
index 69c3cd3..ef7101b 100644
--- a/guide/ja/Makefile.am
+++ b/guide/ja/Makefile.am
@@ -31,12 +31,16 @@ DISTCLEANFILES = $(docname)-ja.omf.out mincho.xml gothic.xml $(fopconfig)
CLEANFILES = $(DISTCLEANFILES)
FOPFLAGS = -l $(lang) -c $(fopconfig)
XSLTFLAGS_FO= --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
mincho.xml: $(JAPANESE_MINCHO_TTF_ABS)
$(FOP_TTFREADER) $< $@
diff --git a/guide/pt/Makefile.am b/guide/pt/Makefile.am
index ebb5692..2ac960d 100644
--- a/guide/pt/Makefile.am
+++ b/guide/pt/Makefile.am
@@ -37,9 +37,13 @@ entities = \
appendixd.xml
DISTCLEANFILES = $(docname)-C.omf.out
CLEANFILES = $(DISTCLEANFILES)
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
diff --git a/guide/ru/Makefile.am b/guide/ru/Makefile.am
index 05e3535..130a21f 100644
--- a/guide/ru/Makefile.am
+++ b/guide/ru/Makefile.am
@@ -31,9 +31,13 @@ entities = \
DISTCLEANFILES = $(docname)-ru.omf.out
CLEANFILES = $(DISTCLEANFILES)
XSLTFLAGS_FO = --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 2ac8626..d6718f7 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -27,9 +27,13 @@ entities = \
Help_tips-appendix.xml
DISTCLEANFILES = $(docname)-C.omf.out
CLEANFILES = $(DISTCLEANFILES)
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
diff --git a/help/de/Makefile.am b/help/de/Makefile.am
index 405905b..f18550b 100644
--- a/help/de/Makefile.am
+++ b/help/de/Makefile.am
@@ -14,9 +14,13 @@ entities = \
DISTCLEANFILES = $(docname)-de.omf.out
CLEANFILES = $(DISTCLEANFILES)
XSLTFLAGS_FO= --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
diff --git a/help/it/Makefile.am b/help/it/Makefile.am
index 59c543f..ff6ba4a 100644
--- a/help/it/Makefile.am
+++ b/help/it/Makefile.am
@@ -5,12 +5,16 @@ omffile = $(docname)-it.omf
DISTCLEANFILES = $(docname)-it.omf.out
CLEANFILES = $(DISTCLEANFILES)
XSLTFLAGS_FO= --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
COMPONENTS = \
${top_srcdir}/help/C/gnucash-help.xml \
diff --git a/help/pt/Makefile.am b/help/pt/Makefile.am
index c4a4e7c..d46a1d9 100644
--- a/help/pt/Makefile.am
+++ b/help/pt/Makefile.am
@@ -22,9 +22,13 @@ entities = \
DISTCLEANFILES = $(docname)-pt.omf.out
CLEANFILES = $(DISTCLEANFILES)
XSLTFLAGS_FO= --stringparam paper.type A4
+if GNC_WINDOWS
+include $(top_srcdir)/chm.make
+else
include $(top_srcdir)/xmldocs.make
include $(top_srcdir)/pdf.make
include $(top_srcdir)/epub.make
if WITH_MOBI
include $(top_srcdir)/mobi.make
endif
+endif
commit 430feccc57f52e9952d099a067cb3bf3d67ec0ec
Merge: dc8ecbd 2cd4f41
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Aug 5 15:23:45 2017 +0200
Merge branch 'maint'
commit dc8ecbd48cecf4fbb8f9446bb1d1881e888dd55e
Merge: ab6dab8 70b92e1
Author: fell <frank.h.ellenberger at gmail.com>
Date: Tue Jul 25 23:12:27 2017 +0200
Merge branch 'maint'
commit ab6dab8ac7d8b98541a3293cfe418d9ad71fec2b
Merge: cf66982 4160a5f
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Jul 2 12:24:36 2017 +0200
Merge branch 'maint'
commit cf6698226c5078fbe06112e3d9e3c330f2c6ca3c
Merge: 675ca9e d10b1d3
Author: fell <frank.h.ellenberger at gmail.com>
Date: Fri Jun 30 23:28:46 2017 +0200
Merge branch 'maint'
commit d10b1d3173c922159ce3267baa83b0b1e193274a
Merge: 0c37c89 bd8d9fb
Author: Frank H. Ellenberger <fellen at users.noreply.github.com>
Date: Fri Jun 30 23:13:58 2017 +0200
Merge pull request #94 from DiMan/patch-1
Update translators and rename the file
commit bd8d9fb39c8cd94cd892349fbca8e5dff43a8ebe
Author: DiMan <DiMan at users.noreply.github.com>
Date: Fri Jun 30 22:38:13 2017 +0200
Update translators and rename the file
Hello fellen,
Thank you for your adaptations, a few notes: the Evgeny Zhulin is not a translator, he simply communicated the translation of Anton Tarasov. I have replaced the Translator. If the Evgeny should later take part in the translation, we can add he in the list.
In addition, I corrected the filename:
guide/ru/gnucash-guide-de.omf => guide/ru/gnucash-guide-ru.omf
Regards,
DiMan
diff --git a/guide/ru/gnucash-guide-de.omf b/guide/ru/gnucash-guide-ru.omf
similarity index 99%
rename from guide/ru/gnucash-guide-de.omf
rename to guide/ru/gnucash-guide-ru.omf
index 06f280b..d2be21d 100644
--- a/guide/ru/gnucash-guide-de.omf
+++ b/guide/ru/gnucash-guide-ru.omf
@@ -389,7 +389,7 @@
Dmitriy Mangul
</contributor>
<contributor>
- Evgeny Zhulin
+ Anton Tarasov
</contributor>
<title>
ПрактичеÑкое руководÑтво по GnuCash
commit 675ca9e6a45e27e44878f72afda89af9489999a1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun May 21 00:35:37 2017 +0200
Use same AC_INIT invocation as on maint
This adds a bug url and home page
diff --git a/configure.ac b/configure.ac
index 898a7cd..7965092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# copyright (c) 2003-2016 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.99)
+AC_INIT([gnucash-docs], [2.6.99], [https://bugzilla.gnome.org/page.cgi?id=browse.html&product=GnuCash], , [http://www.gnucash.org/])
dnl ==========================================================================
dnl
commit 3c6247ea7fd0cb9616aa68ff55caf7b24ad185ca
Merge: 91be847 eded1c2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 20 13:51:03 2017 -0700
Merge branch 'maint'
commit 91be847adee924450d2a22a96da9e93fb11019fc
Merge: 0663736 45523a1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Mar 30 12:41:14 2017 +0200
Merge branch 'maint'
commit 0663736639d8c0f0442492a4d92377c60459131a
Merge: 7117731 51af85d
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 25 11:35:45 2017 -0700
Merge branch 'maint'
commit 7117731a30beb8b0fe6b9a1964a810ad36aaa082
Merge: f31dd15 0a7a95c
Author: fell <frank.h.ellenberger at gmail.com>
Date: Tue Feb 7 23:01:29 2017 +0100
Merge branch 'maint'
commit f31dd1502afc837269728ad8756c5740bed01223
Author: Derek Atkins <derek at ihtfp.com>
Date: Mon Jan 23 10:08:41 2017 -0500
it's builddir, not buildir
diff --git a/guide/it/Makefile.am b/guide/it/Makefile.am
index 647abef..4ca2c97 100644
--- a/guide/it/Makefile.am
+++ b/guide/it/Makefile.am
@@ -46,6 +46,6 @@ COMPONENTS = \
gnucash-guide.xml: ${COMPONENTS} ${srcdir}/it.po
xml2po -e -p ${srcdir}/it.po -o $@ ${top_srcdir}/guide/C/gnucash-guide.xml
- if test "${srcdir}" != "${buildir}"; then mv $@ ${srcdir}; fi
+ if test "${srcdir}" != "${builddir}"; then mv $@ ${srcdir}; fi
EXTRA_DIST += it.po
commit 4e33c3f83da3580f8636394d07e96a6d471d6bfb
Merge: 42f42f9 3b6679e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 23 13:27:22 2017 +0100
Merge branch 'UpdateTranslation' of https://github.com/Mechtilde/gnucash-docs
commit 42f42f90e5448345a318e04e83620e5d882f496e
Merge: 672dcdf 889b6c2
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 18 11:46:19 2016 -0800
Merge branch 'maint' after 2.6.15 release.
diff --cc guide/it/gnucash-guide.xml
index a1c141f,a2e9f1d..d535932
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@@ -2465,24 -2444,23 +2444,24 @@@ Translators
<tip><para>Specifically for dates there's another way you can save time: you can enter
partial dates. For example if you only enter one number, <application>GnuCash</application>
will interpret it as the day in the current month of the current year. If you only enter
- a day and month, <application>GnuCash</application> will automatically append the year. By
- default this is the current year. You can however also configure
- <application>GnuCash</application> to take such a date in a sliding window starting
- a number of months before the current month. This can be done via
+ a day and month, <application>GnuCash</application> will automatically append the year. The
+ default this to take such a date in a sliding window starting 11 months before the current
+ month. This means that if you enter 1/5 (January 5th) as date while the current date is
+ in December 2015, the date will be completed as 1/5/16. This default can be changed via
<menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Date/Time</guisubmenu>
- <guilabel>Date Completion</guilabel></menuchoice>.</para></tip>
+ <guilabel>Date Completion</guilabel></menuchoice>. You can change it to either always
+ evaluate a date in the current calendar year or change the start of the sliding window.</para></tip>
<para>Nel campo <guilabel>Nr.</guilabel> nella linea di una transazione, è possibile premere <keycap>+</keycap> per incrementare il numero della transazione, mentre premendo <keycap>-</keycap> verrà diminuito il numero. Questo funzionerà anche nel campo <guilabel>Operazione</guilabel> nella linea della suddivisione, se si sceglie di immettere i numeri della suddivisione qui. Il campo <guilabel>Operazione</guilabel> supporta anche <emphasis>Quickfill</emphasis>: se si digitano i primi caratteri di una operazione comune (come <emphasis>Deposito</emphasis>), <application>&app;</application> completerà il resto.</para>
-
+
<para>Il campo <guilabel>Trasferimento</guilabel> supporta il <emphasis>Quickfill</emphasis> dei nomi dei conti. Iniziando a digitare il nome di un conto, <application>&app;</application> completerà la parte restante del nome con quello di un conto esistente. Digitando il carattere separatore in qualsiasi momento, verrà completato il livello corrente del nome del conto, lasciando il cursore posizionato all’inizio del successivo livello di nomi di conti. Digitando, per esempio, <keycap>A:C</keycap> con il gruppo standard di conti, verrà selezionato il conto <emphasis>Attività :Conto corrente</emphasis>. Si possono anche selezionare i tasti <keycap>Menu</keycap> o <keycombo><keycap>Ctrl</keycap><keycap>Giù</keycap></keycombo> in questo campo per visualizzare la lista a comparsa dei nomi dei conti.</para>
-
+
<para>In ognuno dei campi per l’importo, si può usare una calcolatrice incorporata. Digitare semplicemente il primo valore, seguito da un <keycap>+</keycap>, <keycap>-</keycap>, <keycap>*</keycap> o <keycap>/</keycap>, poi inserire il secondo valore. <application>&app;</application> eseguirà i calcoli e restituirà il valore risultante nel campo dell’importo alla pressione del tasto <keycap>Tab</keycap>.</para>
-
+
<para>Per tutte le voci del menu sono definite delle chiavi di accesso che sono indicate da caratteri sottolineati nei nome del menu. Premere <keycap>Alt</keycap> + [carattere sottolineato] per aprire il menu desiderato e selezionare poi una voce digitando il carattere sottolineato corrispondente. Per esempio, premere <keycombo><keycap>Alt</keycap><keycap>T</keycap></keycombo> per far comparire il menu <guimenu>Operazioni</guimenu>, poi premere <keycap>S</keycap> per suddividere la transazione. Alcune delle voci del menu hanno anch’esse delle scorciatoie che immediatamente invocano il comando (normalmente utilizzando il tasto <keycap>Ctrl</keycap>). Queste scorciatoie sono riportate a fianco della voce.</para>
-
+
<para>Per muoversi nel registro, utilizzare questi tasti per risparmiare tempo:</para>
-
+
<itemizedlist>
<listitem>
<para><keycap>Tab</keycap> per spostarsi al prossimo campo, <keycombo><keycap>Maiusc</keycap><keycap>Tab</keycap></keycombo> per spostarsi nel campo precedente</para>
diff --cc help/C/Help_ch_Reports.xml
index fce5ed3,6dd3afa..747a33e
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@@ -453,27 -453,8 +453,27 @@@
<listitem><para><guilabel>Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Use Full Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Account Code</guilabel></para></listitem>
+ <listitem><para><guilabel>Detail Level</guilabel>— One of</para>
+ <informaltable>
+ <tgroup cols="2">
+ <tbody>
+ <row><entry>Single</entry><entry>Display 1 line</entry></row>
+ <row><entry>Multi-Line</entry><entry>Display N lines</entry></row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ <note>
+ <para>Before stable version 2.8.0
+ <emphasis>Detail Level</emphasis> was called <emphasis>Style</emphasis> on the General tab.</para>
+ </note>
+
+ <para>If <emphasis>Detail Level</emphasis> is <emphasis>Multi-Line</emphasis>,
+ check boxes <emphasis>Other Account Name</emphasis> and <emphasis>Use Full Other Account Name</emphasis>
+ are automatically deselected and disabled, and the <emphasis>Transfer</emphasis> column is not reported.
+ </para>
+ </listitem>
- <listitem><para><guilabel>Other Account Name</guilabel> — For multi-split transactions, this parameter is not used and hence disabled</para>
+ <listitem><para><guilabel>Other Account Name:</guilabel> For multi-split transactions, this parameter should be unticked. See below for more details.</para>
</listitem>
<listitem><para><guilabel>Use Full Other Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Other Account Code</guilabel></para></listitem>
diff --cc help/it/gnucash-help.xml
index d9ad5dd,fa0d090..f1234b9
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@@ -2908,10 -2865,10 +2865,10 @@@
</sect1>
<sect1>
-- <title>Account Register/General Journal</title>
++ <title>Registro del conto/Libro mastro generale</title>
<sect2 id="account-register">
-- <title>Account Register & General Journal Window</title>
++ <title>Registro del conto e finestra del libro mastro generale</title>
<para>Questa finestra è utilizzata per l’inserimento e la modifica dei dati del conto; fornisce anche degli strumenti per la pianificazione futura delle transazioni, per cercare e per creare dei resoconti sulle transazioni e per la stampa degli assegni.</para>
@@@ -4005,7 -3978,7 +3978,9 @@@
<row>
<entry><para><guibutton>Suddivisione</guibutton></para></entry>
-- <entry><para>Mostra tutte le suddivisioni nella transazione selezionata. Questo pulsante è disattivato se è stato scelta l’opzione <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Mastro a espansione automatica</guimenuitem></menuchoice></para></entry>
++ <entry><para>Show all splits in the current transaction. Not highlighted if
++ <menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split
++ Ledger</guimenuitem></menuchoice> is enabled.</para></entry>
</row>
<row>
@@@ -7521,12 -7519,12 +7521,9 @@@ Translators
<sect1 id="general-journal">
<title>Giornale generale</title>
-- <para>The General Journal is an advanced register used to enter transactions without needing to open
-- individual accounts. The General Journal shows the transaction entries for all accounts on one register.</para>
++ <para>Il libro mastro generale è un registro avanzato che permette di inserire le transazioni senza il bisogno di aprire i singoli conti; permette anche di visualizzare tutte le transazioni per tutti i conti in un unico registro.</para>
-- <para>Entering transactions in the General Journal is more complicated than entering them in the individual
-- account registers. The advantage is the General Journal provides a more comprehensive view of the
-- transactions you have entered in all your accounts.</para>
++ <para>L’inserimento di una transazione nel libro mastro generale è più complicato rispetto alla stessa operazione compiuta dal registro del conto. Il vantaggio del libro mastro generale risiede nella visualizzazione più esaustiva delle transazioni inserite in tutti i propri conti.</para>
<para>The General Journal defaults to showing only the previous month of transactions. This is changeable
by using the "Filter By..." on the View menu.</para>
@@@ -12948,8 -13483,8 +13482,27 @@@ _______________________________________
<listitem><para><guilabel>Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Use Full Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Account Code</guilabel></para></listitem>
++ <listitem><para><guilabel>Detail Level</guilabel>— One of</para>
++ <informaltable>
++ <tgroup cols="2">
++ <tbody>
++ <row><entry>Single</entry><entry>Display 1 line</entry></row>
++ <row><entry>Multi-Line</entry><entry>Display N lines</entry></row>
++ </tbody>
++ </tgroup>
++ </informaltable>
++ <note>
++ <para>Before stable version 2.8.0
++ <emphasis>Detail Level</emphasis> was called <emphasis>Style</emphasis> on the General tab.</para>
++ </note>
++
++ <para>If <emphasis>Detail Level</emphasis> is <emphasis>Multi-Line</emphasis>,
++ check boxes <emphasis>Other Account Name</emphasis> and <emphasis>Use Full Other Account Name</emphasis>
++ are automatically deselected and disabled, and the <emphasis>Transfer</emphasis> column is not reported.
++ </para>
++ </listitem>
- <listitem><para><guilabel>Other Account Name</guilabel> — For multi-split transactions, this parameter should be unticked. See below for more details.</para>
+ <listitem><para><guilabel>Other Account Name:</guilabel> For multi-split transactions, this parameter should be unticked. See below for more details.</para>
</listitem>
<listitem><para><guilabel>Use Full Other Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Other Account Code</guilabel></para></listitem>
@@@ -13119,9 -13654,9 +13672,9 @@@
<sect4 id="report-txrpt-splits">
<title>Displaying Split Account Details</title>
-- <para>This is controled by the <emphasis>Style</emphasis> option on the General tab.</para>
++ <para>This is controled by the <emphasis>Detail Level</emphasis> option on the Display tab.</para>
<note>
-- <para>In stable version 2.8.0 this option will be renamed to <emphasis>Detail Level</emphasis> on the Display tab.</para>
++ <para>In stable versions before 2.8.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
</note>
<para>In <emphasis>Single</emphasis> line mode, there's only one line per transaction. So you can have
the account name on one side of the equation and
commit 672dcdff2b9b48ad84465a7b339b20da8256d678
Merge: 21797f1 81b3d03
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 17 16:32:35 2016 -0700
Merge branch 'maint'
commit 21797f1b38143818e78fd88181cb6d7e0f8c376a
Merge: b99c570 41ece42
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 16 11:30:02 2016 -0700
Merge branch 'maint' for release of 2.6.14.
diff --cc help/it/gnucash-help.xml
index 52f6fed,a1f977f..d9ad5dd
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@@ -2494,9 -2692,9 +2692,9 @@@
</row>
<row>
- <entry><para><guimenuitem>Libro mastro generale</guimenuitem></para></entry>
+ <entry><para><guimenuitem>Giornale generale</guimenuitem></para></entry>
- <entry><para>See <xref linkend="general-journal"/></para></entry>
+ <entry><para>Vedere la <xref linkend="general-journal"/></para></entry>
</row>
</tbody>
</tgroup>
commit b99c57017098b937abb054a38e61df2ed812f9f2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 26 09:17:53 2016 -0700
Bug 762088 - Remove Section 9.4.3 From Guide
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index f7b05f0..7c5a618 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -470,7 +470,6 @@
</listitem>
</orderedlist>
</sect2>
-
</sect1>
<sect1 id="capgain_tax1">
commit 8fb47e8f55a96f4090a888dfda9713e4450df438
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Mar 19 18:13:38 2016 +0100
Update partial date entry documentation based on new default behaviour
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index ccebaa9..42295f8 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -216,12 +216,13 @@
<tip><para>Specifically for dates there's another way you can save time: you can enter
partial dates. For example if you only enter one number, <application>&app;</application>
will interpret it as the day in the current month of the current year. If you only enter
- a day and month, <application>&app;</application> will automatically append the year. By
- default this is the current year. You can however also configure
- <application>&app;</application> to take such a date in a sliding window starting
- a number of months before the current month. This can be done via
+ a day and month, <application>&app;</application> will automatically append the year. The
+ default this to take such a date in a sliding window starting 11 months before the current
+ month. This means that if you enter 1/5 (January 5th) as date while the current date is
+ in December 2015, the date will be completed as 1/5/16. This default can be changed via
<menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Date/Time</guisubmenu>
- <guilabel>Date Completion</guilabel></menuchoice>.</para></tip>
+ <guilabel>Date Completion</guilabel></menuchoice>. You can change it to either always
+ evaluate a date in the current calendar year or change the start of the sliding window.</para></tip>
<para>In the <guilabel>Num</guilabel> field of the transaction line, you
can type <keycap>+</keycap> to increment the transaction number from the
commit 2cd204463481d204df99c844b2ecb6fa85dc5a51
Merge: 3ae473b bb525f9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Mar 19 18:15:28 2016 +0100
Merge branch 'maint'
commit 3ae473b6b6898a07708d8540069b6f494d08b9c2
Merge: 4d5307a 4ce34d3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Mar 3 20:10:14 2016 +0100
Merge branch 'maint'
commit 4d5307a640be024afd18900b6e6624399c3b509c
Merge: 2745947 fd63aab
Author: fell <f.ellenberger at online.de>
Date: Wed Jan 27 01:25:05 2016 +0100
Merge branch 'maint'
Conflicts:
help/C/Help_ch_Reports.xml
diff --cc help/C/Help_ch_Reports.xml
index e01aaa3,d930e29..2989052
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@@ -337,13 -609,13 +614,13 @@@
</itemizedlist>
</listitem>
</itemizedlist>
- </sect3>
+ </sect4>
- <sect3 id="report-txrpt-splits">
+ <sect4 id="report-txrpt-splits">
<title>Displaying Split Account Details</title>
- <para>This is controled by the <emphasis>Style</emphasis> option on the General tab.</para>
+ <para>This is controled by the <emphasis>Detail Level</emphasis> option on the Display tab.</para>
<note>
- <para>In stable version 2.8.0 this option will be renamed to <emphasis>Detail Level</emphasis> on the Display tab.</para>
+ <para>In stable versions before 2.8.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
</note>
<para>In <emphasis>Single</emphasis> line mode, there's only one line per transaction. So you can have
the account name on one side of the equation and
commit 274594730a4783e02c04f9511b765b385ef81f12
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 26 09:05:47 2016 -0800
Remove build product accidentally committed.
diff --git a/guide/ja/fop.xconf b/guide/ja/fop.xconf
deleted file mode 100644
index b100c87..0000000
--- a/guide/ja/fop.xconf
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
- <font-base>/home/pedro/Programas/GnucashGit/gnucash-docs</font-base>
-
- <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
- <source-resolution>72</source-resolution>
- <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
- <target-resolution>72</target-resolution>
-
- <!-- page-height and page-width, A4 for Japanese -->
- <default-page-settings height="297mm" width="210mm"/>
-
- <!-- Information for specific renderers -->
- <!-- Uses renderer mime type for renderers -->
- <renderers>
- <renderer mime="application/pdf">
- <filterList>
- <!-- provides compression using zlib flate (default is on) -->
- <value>flate</value>
- </filterList>
-
- <fonts>
- <!-- embedded fonts -->
- <!--
- This information must exactly match the font specified
- in the fo file. Otherwise it will use a default font.
-
- For example,
- <fo:inline font-family="Arial" font-weight="bold" font-style="normal">
- Arial-normal-normal font
- </fo:inline>
- for the font triplet specified by:
- <font-triplet name="Arial" style="normal" weight="bold"/>
-
- If you do not want to embed the font in the pdf document
- then do not include the "embed-url" attribute.
- The font will be needed where the document is viewed
- for it to be displayed properly.
-
- possible styles: normal | italic | oblique | backslant
- possible weights: normal | bold | 100 | 200 | 300 | 400
- | 500 | 600 | 700 | 800 | 900
- (normal = 400, bold = 700)
- -->
- <font kerning="yes" embed-url="fonts/ume-tmo3.ttf">
- <font-triplet name="serif" style="normal" weight="normal"/>
- </font>
- <font kerning="yes" embed-url="fonts/ume-tmo3.ttf">
- <font-triplet name="serif" style="normal" weight="bold" />
- <font-triplet name="sans-serif" style="normal" weight="normal"/>
- <font-triplet name="sans-serif" style="normal" weight="bold" />
-
- <font-triplet name="serif" style="italic" weight="normal"/>
- <font-triplet name="serif" style="italic" weight="bold" />
- <font-triplet name="sans-serif" style="italic" weight="normal"/>
- <font-triplet name="sans-serif" style="italic" weight="bold" />
- </font>
- </fonts>
-
- <!-- This option lets you specify additional options on an XML handler -->
- <xml-handler namespace="http://www.w3.org/2000/svg">
- <stroke-text>true</stroke-text>
- </xml-handler>
-
- </renderer>
-
- <renderer mime="application/x-afp">
- <!--
- The bit depth and type of images produced
- (this is the default setting)
- -->
- <images mode="b+w" bits-per-pixel="8"/>
- <renderer-resolution>240</renderer-resolution>
- <resource-group-file>resources.afp</resource-group-file>
-
- <fonts>
- <!--
- Below is an example using raster font configuration using FOP builtin base-14 font metrics.
- for Times Roman, Helvetica and Courier.
-
- Depending on AFP raster and outline font availability on your installation you will
- most likely need to modify the configuration provided below.
-
- See http://xmlgraphics.apache.org/fop/trunk/output.html#afp-configuration
- for details of FOP configuration for AFP
- -->
-
- <!-- Times Roman -->
- <font>
- <afp-font name="Times Roman" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0N20060" base14-font="TimesRoman"/>
- <afp-raster-font size="7" characterset="C0N20070" base14-font="TimesRoman"/>
- <afp-raster-font size="8" characterset="C0N20080" base14-font="TimesRoman"/>
- <afp-raster-font size="9" characterset="C0N20090" base14-font="TimesRoman"/>
- <afp-raster-font size="10" characterset="C0N20000" base14-font="TimesRoman"/>
- <afp-raster-font size="11" characterset="C0N200A0" base14-font="TimesRoman"/>
- <afp-raster-font size="12" characterset="C0N200B0" base14-font="TimesRoman"/>
- <afp-raster-font size="14" characterset="C0N200D0" base14-font="TimesRoman"/>
- <afp-raster-font size="16" characterset="C0N200F0" base14-font="TimesRoman"/>
- <afp-raster-font size="18" characterset="C0N200H0" base14-font="TimesRoman"/>
- <afp-raster-font size="20" characterset="C0N200J0" base14-font="TimesRoman"/>
- <afp-raster-font size="24" characterset="C0N200N0" base14-font="TimesRoman"/>
- <afp-raster-font size="30" characterset="C0N200T0" base14-font="TimesRoman"/>
- <afp-raster-font size="36" characterset="C0N200Z0" base14-font="TimesRoman"/>
- </afp-font>
- <font-triplet name="Times" style="normal" weight="normal"/>
- <font-triplet name="TimesRoman" style="normal" weight="normal"/>
- <font-triplet name="Times Roman" style="normal" weight="normal"/>
- <font-triplet name="Times-Roman" style="normal" weight="normal"/>
- <font-triplet name="Times New Roman" style="normal" weight="normal"/>
- <font-triplet name="TimesNewRoman" style="normal" weight="normal"/>
- <font-triplet name="serif" style="normal" weight="normal"/>
- </font>
-
- <!-- Times Roman Italic -->
- <font>
- <afp-font name="Times Roman Italic" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0N30060" base14-font="TimesItalic"/>
- <afp-raster-font size="7" characterset="C0N30070" base14-font="TimesItalic"/>
- <afp-raster-font size="8" characterset="C0N30080" base14-font="TimesItalic"/>
- <afp-raster-font size="9" characterset="C0N30090" base14-font="TimesItalic"/>
- <afp-raster-font size="10" characterset="C0N30000" base14-font="TimesItalic"/>
- <afp-raster-font size="11" characterset="C0N300A0" base14-font="TimesItalic"/>
- <afp-raster-font size="12" characterset="C0N300B0" base14-font="TimesItalic"/>
- <afp-raster-font size="14" characterset="C0N300D0" base14-font="TimesItalic"/>
- <afp-raster-font size="16" characterset="C0N300F0" base14-font="TimesItalic"/>
- <afp-raster-font size="18" characterset="C0N300H0" base14-font="TimesItalic"/>
- <afp-raster-font size="20" characterset="C0N300J0" base14-font="TimesItalic"/>
- <afp-raster-font size="24" characterset="C0N300N0" base14-font="TimesItalic"/>
- <afp-raster-font size="30" characterset="C0N300T0" base14-font="TimesItalic"/>
- <afp-raster-font size="36" characterset="C0N300Z0" base14-font="TimesItalic"/>
- </afp-font>
- <font-triplet name="Times" style="italic" weight="normal"/>
- <font-triplet name="TimesRoman" style="italic" weight="normal"/>
- <font-triplet name="Times Roman" style="italic" weight="normal"/>
- <font-triplet name="Times-Roman" style="italic" weight="normal"/>
- <font-triplet name="Times New Roman" style="italic" weight="normal"/>
- <font-triplet name="TimesNewRoman" style="italic" weight="normal"/>
- <font-triplet name="serif" style="italic" weight="normal"/>
- </font>
-
- <!-- Times Roman Bold -->
- <font>
- <afp-font name="Times Roman Bold" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0N40060" base14-font="TimesBold"/>
- <afp-raster-font size="7" characterset="C0N40070" base14-font="TimesBold"/>
- <afp-raster-font size="8" characterset="C0N40080" base14-font="TimesBold"/>
- <afp-raster-font size="9" characterset="C0N40090" base14-font="TimesBold"/>
- <afp-raster-font size="10" characterset="C0N40000" base14-font="TimesBold"/>
- <afp-raster-font size="11" characterset="C0N400A0" base14-font="TimesBold"/>
- <afp-raster-font size="12" characterset="C0N400B0" base14-font="TimesBold"/>
- <afp-raster-font size="14" characterset="C0N400D0" base14-font="TimesBold"/>
- <afp-raster-font size="16" characterset="C0N400F0" base14-font="TimesBold"/>
- <afp-raster-font size="18" characterset="C0N400H0" base14-font="TimesBold"/>
- <afp-raster-font size="20" characterset="C0N400J0" base14-font="TimesBold"/>
- <afp-raster-font size="24" characterset="C0N400N0" base14-font="TimesBold"/>
- <afp-raster-font size="30" characterset="C0N400T0" base14-font="TimesBold"/>
- <afp-raster-font size="36" characterset="C0N400Z0" base14-font="TimesBold"/>
- </afp-font>
- <font-triplet name="Times" style="normal" weight="bold"/>
- <font-triplet name="TimesRoman" style="normal" weight="bold"/>
- <font-triplet name="Times Roman" style="normal" weight="bold"/>
- <font-triplet name="Times-Roman" style="normal" weight="bold"/>
- <font-triplet name="Times New Roman" style="normal" weight="bold"/>
- <font-triplet name="TimesNewRoman" style="normal" weight="bold"/>
- <font-triplet name="serif" style="normal" weight="bold"/>
- </font>
-
- <!-- Times Roman Italic Bold -->
- <font>
- <afp-font name="Times Roman Italic Bold" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0N50060" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="7" characterset="C0N50070" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="8" characterset="C0N50080" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="9" characterset="C0N50090" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="10" characterset="C0N50000" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="11" characterset="C0N500A0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="12" characterset="C0N500B0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="14" characterset="C0N500D0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="16" characterset="C0N500F0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="18" characterset="C0N500H0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="20" characterset="C0N500J0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="24" characterset="C0N500N0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="30" characterset="C0N500T0" base14-font="TimesBoldItalic"/>
- <afp-raster-font size="36" characterset="C0N500Z0" base14-font="TimesBoldItalic"/>
- </afp-font>
- <font-triplet name="Times" style="italic" weight="bold"/>
- <font-triplet name="TimesRoman" style="italic" weight="bold"/>
- <font-triplet name="Times Roman" style="italic" weight="bold"/>
- <font-triplet name="Times-Roman" style="italic" weight="bold"/>
- <font-triplet name="Times New Roman" style="italic" weight="bold"/>
- <font-triplet name="TimesNewRoman" style="italic" weight="bold"/>
- <font-triplet name="serif" style="italic" weight="bold"/>
- </font>
-
- <!-- Helvetica -->
- <font>
- <afp-font name="Helvetica" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0H20060" base14-font="Helvetica"/>
- <afp-raster-font size="7" characterset="C0H20070" base14-font="Helvetica"/>
- <afp-raster-font size="8" characterset="C0H20080" base14-font="Helvetica"/>
- <afp-raster-font size="9" characterset="C0H20090" base14-font="Helvetica"/>
- <afp-raster-font size="10" characterset="C0H20000" base14-font="Helvetica"/>
- <afp-raster-font size="11" characterset="C0H200A0" base14-font="Helvetica"/>
- <afp-raster-font size="12" characterset="C0H200B0" base14-font="Helvetica"/>
- <afp-raster-font size="14" characterset="C0H200D0" base14-font="Helvetica"/>
- <afp-raster-font size="16" characterset="C0H200F0" base14-font="Helvetica"/>
- <afp-raster-font size="18" characterset="C0H200H0" base14-font="Helvetica"/>
- <afp-raster-font size="20" characterset="C0H200J0" base14-font="Helvetica"/>
- <afp-raster-font size="24" characterset="C0H200N0" base14-font="Helvetica"/>
- <afp-raster-font size="30" characterset="C0H200T0" base14-font="Helvetica"/>
- <afp-raster-font size="36" characterset="C0H200Z0" base14-font="Helvetica"/>
- </afp-font>
- <font-triplet name="Helvetica" style="normal" weight="normal"/>
- <font-triplet name="Arial" style="normal" weight="normal"/>
- <font-triplet name="sans-serif" style="normal" weight="normal"/>
- <font-triplet name="any" style="normal" weight="normal"/>
- </font>
-
- <!-- Helvetica Italic -->
- <font>
- <afp-font name="Helvetica Italic" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0H30060" base14-font="HelveticaOblique"/>
- <afp-raster-font size="7" characterset="C0H30070" base14-font="HelveticaOblique"/>
- <afp-raster-font size="8" characterset="C0H30080" base14-font="HelveticaOblique"/>
- <afp-raster-font size="9" characterset="C0H30090" base14-font="HelveticaOblique"/>
- <afp-raster-font size="10" characterset="C0H30000" base14-font="HelveticaOblique"/>
- <afp-raster-font size="11" characterset="C0H300A0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="12" characterset="C0H300B0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="14" characterset="C0H300D0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="16" characterset="C0H300F0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="18" characterset="C0H300H0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="20" characterset="C0H300J0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="24" characterset="C0H300N0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="30" characterset="C0H300T0" base14-font="HelveticaOblique"/>
- <afp-raster-font size="36" characterset="C0H300Z0" base14-font="HelveticaOblique"/>
- </afp-font>
- <font-triplet name="Helvetica" style="italic" weight="normal"/>
- <font-triplet name="Arial" style="italic" weight="normal"/>
- <font-triplet name="sans-serif" style="italic" weight="normal"/>
- </font>
-
- <!-- Helvetica (Semi) Bold -->
- <font>
- <afp-font name="Helvetica (Semi) Bold" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0H40060" base14-font="HelveticaBold"/>
- <afp-raster-font size="7" characterset="C0H40070" base14-font="HelveticaBold"/>
- <afp-raster-font size="8" characterset="C0H40080" base14-font="HelveticaBold"/>
- <afp-raster-font size="9" characterset="C0H40090" base14-font="HelveticaBold"/>
- <afp-raster-font size="10" characterset="C0H40000" base14-font="HelveticaBold"/>
- <afp-raster-font size="11" characterset="C0H400A0" base14-font="HelveticaBold"/>
- <afp-raster-font size="12" characterset="C0H400B0" base14-font="HelveticaBold"/>
- <afp-raster-font size="14" characterset="C0H400D0" base14-font="HelveticaBold"/>
- <afp-raster-font size="16" characterset="C0H400F0" base14-font="HelveticaBold"/>
- <afp-raster-font size="18" characterset="C0H400H0" base14-font="HelveticaBold"/>
- <afp-raster-font size="20" characterset="C0H400J0" base14-font="HelveticaBold"/>
- <afp-raster-font size="24" characterset="C0H400N0" base14-font="HelveticaBold"/>
- <afp-raster-font size="30" characterset="C0H400T0" base14-font="HelveticaBold"/>
- <afp-raster-font size="36" characterset="C0H400Z0" base14-font="HelveticaBold"/>
- </afp-font>
- <font-triplet name="Helvetica" style="normal" weight="bold"/>
- <font-triplet name="Arial" style="normal" weight="bold"/>
- <font-triplet name="sans-serif" style="normal" weight="bold"/>
- </font>
-
- <!-- Helvetica Italic (Semi) Bold -->
- <font>
- <afp-font name="Helvetica Italic (Semi) Bold" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0H50060" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="7" characterset="C0H50070" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="8" characterset="C0H50080" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="9" characterset="C0H50090" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="10" characterset="C0H50000" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="11" characterset="C0H500A0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="12" characterset="C0H500B0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="14" characterset="C0H500D0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="16" characterset="C0H500F0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="18" characterset="C0H500H0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="20" characterset="C0H500J0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="24" characterset="C0H500N0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="30" characterset="C0H500T0" base14-font="HelveticaBoldOblique"/>
- <afp-raster-font size="36" characterset="C0H500Z0" base14-font="HelveticaBoldOblique"/>
- </afp-font>
- <font-triplet name="Helvetica" style="italic" weight="bold"/>
- <font-triplet name="Arial" style="italic" weight="bold"/>
- <font-triplet name="sans-serif" style="italic" weight="bold"/>
- </font>
-
- <!-- Courier -->
- <font>
- <afp-font name="Courier" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0420060" base14-font="Courier"/>
- <afp-raster-font size="7" characterset="C0420070" base14-font="Courier"/>
- <afp-raster-font size="8" characterset="C0420080" base14-font="Courier"/>
- <afp-raster-font size="9" characterset="C0420090" base14-font="Courier"/>
- <afp-raster-font size="10" characterset="C0420000" base14-font="Courier"/>
- <afp-raster-font size="11" characterset="C04200A0" base14-font="Courier"/>
- <afp-raster-font size="12" characterset="C04200B0" base14-font="Courier"/>
- <afp-raster-font size="14" characterset="C04200D0" base14-font="Courier"/>
- <afp-raster-font size="16" characterset="C04200F0" base14-font="Courier"/>
- <afp-raster-font size="18" characterset="C04200H0" base14-font="Courier"/>
- <afp-raster-font size="20" characterset="C04200J0" base14-font="Courier"/>
- <afp-raster-font size="24" characterset="C04200N0" base14-font="Courier"/>
- <afp-raster-font size="30" characterset="C04200T0" base14-font="Courier"/>
- <afp-raster-font size="36" characterset="C04200Z0" base14-font="Courier"/>
- </afp-font>
- <font-triplet name="Courier" style="normal" weight="normal"/>
- <font-triplet name="monospace" style="normal" weight="normal"/>
- </font>
-
- <!-- Courier Italic -->
- <font>
- <afp-font name="Courier Italic" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0430060" base14-font="CourierOblique"/>
- <afp-raster-font size="7" characterset="C0430070" base14-font="CourierOblique"/>
- <afp-raster-font size="8" characterset="C0430080" base14-font="CourierOblique"/>
- <afp-raster-font size="9" characterset="C0430090" base14-font="CourierOblique"/>
- <afp-raster-font size="10" characterset="C0430000" base14-font="CourierOblique"/>
- <afp-raster-font size="11" characterset="C04300A0" base14-font="CourierOblique"/>
- <afp-raster-font size="12" characterset="C04300B0" base14-font="CourierOblique"/>
- <afp-raster-font size="14" characterset="C04300D0" base14-font="CourierOblique"/>
- <afp-raster-font size="16" characterset="C04300F0" base14-font="CourierOblique"/>
- <afp-raster-font size="18" characterset="C04300H0" base14-font="CourierOblique"/>
- <afp-raster-font size="20" characterset="C04300J0" base14-font="CourierOblique"/>
- <afp-raster-font size="24" characterset="C04300N0" base14-font="CourierOblique"/>
- <afp-raster-font size="30" characterset="C04300T0" base14-font="CourierOblique"/>
- <afp-raster-font size="36" characterset="C04300Z0" base14-font="CourierOblique"/>
- </afp-font>
- <font-triplet name="Courier" style="italic" weight="normal"/>
- <font-triplet name="monospace" style="italic" weight="normal"/>
- </font>
-
- <!-- Courier Bold -->
- <font>
- <afp-font name="Courier Bold" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0440060" base14-font="CourierBold"/>
- <afp-raster-font size="7" characterset="C0440070" base14-font="CourierBold"/>
- <afp-raster-font size="8" characterset="C0440080" base14-font="CourierBold"/>
- <afp-raster-font size="9" characterset="C0440090" base14-font="CourierBold"/>
- <afp-raster-font size="10" characterset="C0440000" base14-font="CourierBold"/>
- <afp-raster-font size="11" characterset="C04400A0" base14-font="CourierBold"/>
- <afp-raster-font size="12" characterset="C04400B0" base14-font="CourierBold"/>
- <afp-raster-font size="14" characterset="C04400D0" base14-font="CourierBold"/>
- <afp-raster-font size="16" characterset="C04400F0" base14-font="CourierBold"/>
- <afp-raster-font size="18" characterset="C04400H0" base14-font="CourierBold"/>
- <afp-raster-font size="20" characterset="C04400J0" base14-font="CourierBold"/>
- <afp-raster-font size="24" characterset="C04400N0" base14-font="CourierBold"/>
- <afp-raster-font size="30" characterset="C04400T0" base14-font="CourierBold"/>
- <afp-raster-font size="36" characterset="C04400Z0" base14-font="CourierBold"/>
- </afp-font>
- <font-triplet name="Courier" style="normal" weight="bold"/>
- <font-triplet name="monospace" style="normal" weight="bold"/>
- </font>
-
- <!-- Courier Italic Bold -->
- <font>
- <afp-font name="Courier Italic Bold" type="raster" codepage="T1V10500" encoding="Cp500">
- <afp-raster-font size="6" characterset="C0450060" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="7" characterset="C0450070" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="8" characterset="C0450080" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="9" characterset="C0450090" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="10" characterset="C0450000" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="11" characterset="C04500A0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="12" characterset="C04500B0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="14" characterset="C04500D0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="16" characterset="C04500F0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="18" characterset="C04500H0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="20" characterset="C04500J0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="24" characterset="C04500N0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="30" characterset="C04500T0" base14-font="CourierBoldOblique"/>
- <afp-raster-font size="36" characterset="C04500Z0" base14-font="CourierBoldOblique"/>
- </afp-font>
- <font-triplet name="Courier" style="italic" weight="bold"/>
- <font-triplet name="monospace" style="italic" weight="bold"/>
- </font>
-
- <!--
- Configure double-byte (CID Keyed font (Type 0)) AFP fonts with type="CIDKeyed".
-
- example:
- <font>
- <afp-font type="CIDKeyed" encoding="UnicodeBigUnmarked"
- codepage="T1120000" characterset="CZJHMNU"
- base-uri="fonts" />
- <font-triplet name="J-Heisei Mincho" style="normal" weight="normal" />
- </font>
- -->
-
-
- </fonts>
- </renderer>
-
- <renderer mime="application/postscript">
- <!-- This option forces the PS renderer to rotate landscape pages -->
- <!--auto-rotate-landscape>true</auto-rotate-landscape-->
-
- <!-- This option lets you specify additional options on an XML handler -->
- <!--xml-handler namespace="http://www.w3.org/2000/svg">
- <stroke-text>false</stroke-text>
- </xml-handler-->
- </renderer>
-
- <renderer mime="application/vnd.hp-PCL">
- </renderer>
-
- <!-- MIF does not have a renderer
- <renderer mime="application/vnd.mif">
- </renderer>
- -->
-
- <renderer mime="image/svg+xml">
- <format type="paginated"/>
- <link value="true"/>
- <strokeText value="true"/>
- </renderer>
-
- <renderer mime="application/awt">
- </renderer>
-
- <renderer mime="image/png">
- <!--transparent-page-background>true</transparent-page-background-->
- </renderer>
-
- <renderer mime="image/tiff">
- <!--transparent-page-background>true</transparent-page-background-->
- <!--compression>CCITT T.6</compression-->
- </renderer>
-
- <renderer mime="text/xml">
- </renderer>
-
- <!-- RTF does not have a renderer
- <renderer mime="text/rtf">
- </renderer>
- -->
-
- </renderers>
-
-</fop>
commit d78c9804225b79fd64ef5ddd0a7f3505362afb55
Merge: 930d420 62d92ac
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jan 19 13:41:00 2016 -0800
Merge branch 'maint', new Portuguese help translation.
diff --cc configure.ac
index ec2bd8d,27ab521..6c3fd30
--- a/configure.ac
+++ b/configure.ac
@@@ -2,9 -2,8 +2,8 @@@
# copyright (c) 2003-2016 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.11)
+AC_INIT(gnucash-docs, 2.6.99)
-
dnl ==========================================================================
dnl
dnl If you add a version number here, you *must* add an AC_SUBST line for
commit 930d42049805baaae4007800dff482919a462bdd
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jan 10 16:45:52 2016 -0800
Release Docs v2.6.11
diff --git a/ChangeLog b/ChangeLog
index a6266bd..c218e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,183 @@
+2016-01-10 John Ralls
+
+ * Bug 760407 - Note account separator isn't always a colon. (HEAD, origin/maint, maint)
+
+2016-01-09 John Ralls
+
+ * Remove 'Remainder To' from loan assistant page 2.
+
+2016-01-02 John Ralls
+
+ * Clarify that creating a postponed SX will use the original date.
+
+2016-01-02 Mechtilde
+
+ * small corrections of the translated text
+
+2016-01-02 Mechtilde
+
+ * corrections and German screenshots for chapter bus_ap
+
+2016-01-01 Mechtilde
+
+ * corrections and German screenshots for chapter bus_ar
+
+2016-01-01 John Ralls
+
+ * Use letter size paper only in US or C locales.
+
+2016-01-01 John Ralls
+
+ * Bug 760016 - 2.6.10 and master dump script error while running configure
+
+2016-01-01 Mechtilde
+
+ * corrections and German screenshots for chapter bus_intro and bus_setup
+
+2016-01-01 Mechtilde
+
+ * corrections and German screenshots for chapter currency - finished
+
+2015-12-31 Mechtilde
+
+ * corrections and German screenshots for chapter currency - part boat
+
+2015-12-31 Mechtilde
+
+ * corrections and German screenshots for chapter currency - first part
+
+2015-12-31 Mechtilde
+
+ * corrections and German screenshots for chapter capgain
+
+2015-12-31 Mechtilde
+
+ * first changes for chapter cap_gains
+
+2015-12-30 Mechtilde
+
+ * translated screenshot for chapter invest
+
+2015-12-31 fell
+
+ * Add Eclipse specific files to gitignore
+
+2015-12-31 fell
+
+ * Improve german wordening around the last commit
+
+2015-12-31 fell
+
+ * Formal accounting terms are selectable on the preferences accounts tab
+
+2015-12-31 fell
+
+ * Add missing file to guide/de/Makefile.am
+
+2015-12-30 John Ralls
+
+ * Add missing sect1 element.
+
+2015-12-30 Mechtilde
+
+ * add als few corrections
+
+2015-12-30 Mechtilde
+
+ * add some more files needed translation
+
+2015-12-30 Mechtilde
+
+ * add inforamtion about chapter import_business_data
+
+2015-12-30 Mechtilde
+
+ * add inforamtion about chapter python_bindings
+
+2015-12-30 Mechtilde
+
+ * add inforamtion about chapter oth_assets and dep
+
+2015-12-30 Mechtilde
+
+ * add inforamtion about chapter budgets
+
+2015-12-30 Mechtilde
+
+ * ad inforamtion about chapter bus_pay
+
+2015-12-30 Mechtilde
+
+ * adapt chapter bus_ap after translation chapter bus_setup
+
+2015-12-30 Mechtilde
+
+ * adapt chapter bus_ar after translation chapter bus_setup
+
+2015-12-30 Mechtilde
+
+ * finishing German translation of chapter bus_setup
+
+2015-12-29 Mechtilde
+
+ * add the corresponding English screenshots
+
+2015-12-29 Mechtilde
+
+ * first part of German translation of chapter bus_setup
+
+2015-12-21 Mechtilde
+
+ * adapt Makefile.am and gnucash-guide.xml to chapter ch_bus_setup
+
+2015-12-13 Mechtilde
+
+ * initial commit for German translation of chapter bus_setup
+
+2015-12-29 John Ralls
+
+ * Fix invalid child element errors.
+
+2015-12-29 Mechtilde
+
+ * finished German translation of chapter bus_intro
+
+2015-12-21 Mechtilde
+
+ * adapt Makefile.am and gnucash-guide.xml to chapter ch_bus_intro
+
+2015-12-13 Mechtilde
+
+ * initial commit for German translation of chapter bus_intro
+
+2015-12-29 Mechtilde
+
+ * finishe German translation of chapter currency
+
+2015-12-21 Mechtilde
+
+ * some further German translation of chapter currencies
+
+2015-12-19 Mechtilde
+
+ * add ch_currency.xml to guide/de/Makefile.am
+
+2015-12-13 Mechtilde
+
+ * further German translation of chapter currencies
+
+2015-12-13 Mechtilde
+
+ * initial commit for German Translation of chapter currency
+
+2015-12-26 John Ralls
+
+ * Bug 759859 - Reconcilation does not convert transactions' currency to the main one making reconcilation impossible.
+
+2015-12-20 John Ralls
+
+ * Better style for the *.png dependencies.
+
2015-12-13 Mechtilde
* finishing German translation of chapter capgain (HEAD, origin/maint, maint)
diff --git a/NEWS b/NEWS
index 7e07e38..4b134d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
Version History
---------------
+ 2.6.11 - 11 January 2016
+ o More German Translations and screenshots from Mechtilde Stehmann
+ o Bug 759859 - Reconcilation does not convert transactions' currency
+ to the main one making reconcilation impossible.
+ o Bug 760016 - 2.6.10 and master dump script error while running
+ configure.
+ o Bug 760407 - Note account separator isn't always a colon.
+ o Use letter size paper only in US or C locales. The rest of the world
+ uses metric A4 paper. The locale detection is done at configure.
+ o Clarify that creating a postponed SX will use the original date.
2.6.10 - 20 December 2015
o More German Translation work from Mechtilde Stehmann.
o New German illustrations from Mechtilde Stehmann.
diff --git a/configure.ac b/configure.ac
index ceca02c..ec2bd8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
# copyright (c) 2000-2002 Chris Lyttle
-# copyright (c) 2003-2015 GnuCash Development Team
+# copyright (c) 2003-2016 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
AC_INIT(gnucash-docs, 2.6.99)
+
dnl ==========================================================================
dnl
dnl If you add a version number here, you *must* add an AC_SUBST line for
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 623764c..ccc91e6 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -40,10 +40,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.8">
-<!ENTITY date "27 September 2015">
+<!ENTITY manrevision "2.6.11">
+<!ENTITY date "11 January 2016">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.8">
+<!ENTITY vers-stable "2.6.11">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -74,8 +74,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.8
- Last modified: 27 September 2015
+ Version: 2.6.11
+ Last modified: 11 January 2016
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -89,7 +89,7 @@
<edition>V&manrevision;</edition>
<copyright>
- <year>2009-2015</year>
+ <year>2009-20156</year>
<holder>&app; Documentation Team</holder>
</copyright>
@@ -299,6 +299,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.11</revnumber>
+ <date>11 January 2016</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.8</revnumber>
<date>27 September 2015</date>
<revdescription>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 42e9530..615e865 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -41,10 +41,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.10">
-<!ENTITY date "20 December 2015">
+<!ENTITY manrevision "2.6.11">
+<!ENTITY date "11 January 2016">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.10">
+<!ENTITY vers-stable "2.6.11">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -78,8 +78,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.10
- Last modified: 20 December 2015
+ Version: 2.6.11
+ Last modified: 11 January 2016
Maintainers:
GnuCash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -314,6 +314,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.11</revnumber>
+ <date>11 January 2016</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.10</revnumber>
<date>20 December 2015</date>
<revdescription>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 5d03346..4f253a4 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -29,10 +29,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.7">
-<!ENTITY date "28 June 2015">
+<!ENTITY manrevision "2.6.11">
+<!ENTITY date "11 January 2016">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.7">
+<!ENTITY vers-stable "2.6.11">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -80,7 +80,7 @@
<edition>v&manrevision;</edition>
<copyright>
- <year>2002-2015</year>
+ <year>2002-2016</year>
<holder>GnuCash Documentation Team</holder>
</copyright>
@@ -225,6 +225,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Help Manual v2.6.11</revnumber>
+ <date>11 January 2016</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Help Manual v2.6.8</revnumber>
<date>27 September 2015</date>
<revdescription>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 92882ca..7666ebf 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -28,10 +28,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.8">
-<!ENTITY date "27 September 2015">
+<!ENTITY manrevision "2.6.11">
+<!ENTITY date "11 January 2016">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.8">
+<!ENTITY vers-stable "2.6.11">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -87,7 +87,7 @@
<edition>v&manrevision;</edition>
<copyright>
- <year>2014-2015</year>
+ <year>2014-2016</year>
<holder>&app; Documentation Team</holder>
</copyright>
@@ -252,7 +252,16 @@
<revhistory>
<revision>
- <revnumber>&app; Hilfe v2.6.8</revnumber>
+ <revnumber>&app; Hilfe v2.6.11</revnumber>
+ <date>11 January 2016</date>
+ <revdescription>
+ <para role="author">Multiple Authors </para>
+ <para role="publisher">&app; Development Team</para>
+ </revdescription>
+ </revision>
+
+ <revision>
+ <revnumber>&app; Hilfe v2.6.8</revnumber>
<date>27 September 2015</date>
<revdescription>
<para role="author">Multiple Authors
commit 252d5af86fb012fa57455fb85b2c00c8d9c71824
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jan 10 11:43:14 2016 -0800
Bug 760407 - Note account separator isn't always a colon.
diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index f4a38c1..e0fc856 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -270,15 +270,25 @@ Translators:
</listitem>
<listitem>
- <para>When typing into the account field <application>&app;</application> will also attempt to automatically match the account
- name with an existing account. It does this alphabetically, so typing <keycap>Ex</keycap> will match the <emphasis>Expenses</emphasis>
- section of the account list. When the section is matched, it is possible to move to a child account by
- pressing <keycap>:</keycap> (colon). If after typing <keycap>Ex</keycap> you press <keycap>:</keycap> then the cursor will
- move to the first child account in the list. Typing combinations of letters and <keycap>:</keycap> will
- allow movement down the tree of accounts quickly. The triangle icon on the right of the <guilabel>Transfer</guilabel> box can
- be used as an alternate way of selecting accounts. Up & down arrow keys will also move up/down the
- displayed list of accounts.
+ <para> Accounts may be selected either by typing them in or
+ by pressing the small button on the right of the
+ <guilabel>Transfer</guilabel> field, which will display a
+ pick list of all non-placeholder accounts.
</para>
+ <para> When typing, <application>&app;</application> will
+ fill in available accounts as you type. For example, if you
+ have <emphasis>Equity</emphasis> and
+ <emphasis>Expenses</emphasis> top-level accounts, typing
+ <keycap>E</keycap> will fill in <emphasis
+ role="bold">Equity</emphasis> because it sorts before
+ <emphasis role="bold">Expenses</emphasis>. Continuing to
+ type <keycap>x</keycap> will present <emphasis
+ role="bold">Expenses</emphasis> the account separator
+ (<keycap>:</keycap> by default, see <xref
+ linkend="prefs-accounts"></xref>Account Preferences about
+ changing it) will accept the currently offered account so
+ that you can start typing the name of a child
+ account.</para>
</listitem>
<listitem>
commit 5fc6ad9b5bc617d79746a8f0288345906c0f9075
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 9 11:25:50 2016 -0800
Remove 'Remainder To' from loan assistant page 2.
It was never there in a released GnuCash.
diff --git a/help/C/Help_ch_Tools_Assistants.xml b/help/C/Help_ch_Tools_Assistants.xml
index 27b2cc1..6c8fcbc 100644
--- a/help/C/Help_ch_Tools_Assistants.xml
+++ b/help/C/Help_ch_Tools_Assistants.xml
@@ -2452,10 +2452,6 @@
</listitem>
<listitem>
- <para>Remainder to: Choose an account to transfer the rest of the payment amount to.</para>
- </listitem>
-
- <listitem>
<para>Repayment Frequency: Select the Frequency and start date for loan
repayments. Note that the start date will be the posted date of the first scheduled
transaction. This is not taken into account for calculating the remaining duration of
commit 6633dc6b0679c2bcedc1360da3cae304946a00a6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 2 15:22:42 2016 -0800
Clarify that creating a postponed SX will use the original date.
diff --git a/help/C/Help_ch_Tools_Assistants.xml b/help/C/Help_ch_Tools_Assistants.xml
index 51e7761..27b2cc1 100644
--- a/help/C/Help_ch_Tools_Assistants.xml
+++ b/help/C/Help_ch_Tools_Assistants.xml
@@ -2249,9 +2249,16 @@
<varlistentry>
<term><guilabel>Postponed</guilabel></term>
<listitem>
- <para>If a scheduled transaction has been listed with a status <guilabel>To-create</guilabel> but you
- want to hold it and not have it entered to your register yet, then you can set it
- to <guilabel>Postponed</guilabel>.</para>
+ <para>If a scheduled transaction has been listed
+ with a status <guilabel>To-create</guilabel> but
+ you want to hold it and not have it entered to
+ your register yet, then you can set it to
+ <guilabel>Postponed</guilabel>. When at some
+ later time you change it back to
+ <guilabel>To-create</guilabel> it will be
+ created with the original posted-date. If you
+ want to change that you must edit the
+ transaction after it's created.</para>
</listitem>
</varlistentry>
commit 37d798581d92433f31e313908cbf7691c5cba015
Author: Mechtilde <ooo at mechtilde.de>
Date: Sat Jan 2 14:22:13 2016 +0100
small corrections of the translated text
diff --git a/guide/de/ch_bus_ap.xml b/guide/de/ch_bus_ap.xml
index e90a4b4..f031a49 100644
--- a/guide/de/ch_bus_ap.xml
+++ b/guide/de/ch_bus_ap.xml
@@ -59,7 +59,7 @@ corrected to be less describing of the interface and more tutorial oriented
</listitem>
<listitem>
<para>Unter <guilabel>Aufträge</guilabel> (optional) können Sie Lieferantenaufträge
- eintragen. Aufträge sind eine Einrichtung, mit der man mehrere Rechnungen
+ eintragen. Aufträge sind eine Einrichtung, mit der Sie mehrere Rechnungen
eines einzelnen Lieferanten gruppieren kann.</para>
</listitem>
<listitem>
@@ -78,12 +78,12 @@ corrected to be less describing of the interface and more tutorial oriented
registiert sein.</para>
<sect2 id="bus-ap-vendornew2">
- <title>Neu</title>
+ <title>Neuer Lieferant</title>
<para>Um einen neuen Lieferanten zu registrieren, wählen Sie den Menüeintrag
<menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
- <guimenuitem>Neuer Lieferant</guimenuitem></menuchoice>.
+ <guimenuitem>Neuer Lieferant…</guimenuitem></menuchoice>.
Geben Sie die allgemeinen Informationen über den Lieferanten, wie Firmenname,
- Adresse, Telefon- und Faxnummer, etc ein. Unten finden Sie eine Liste
+ Adresse, Telefon- und Faxnummer etc ein. Unten finden Sie eine Liste
weiterer Optionen: </para>
<para>So sieht das Registrierungsfenster für einen neuen Lieferanten aus:</para>
diff --git a/guide/de/ch_bus_ar.xml b/guide/de/ch_bus_ar.xml
index c3c48f9..c602bff 100644
--- a/guide/de/ch_bus_ar.xml
+++ b/guide/de/ch_bus_ar.xml
@@ -26,7 +26,7 @@ corrected to be less describing of the interface and more tutorial oriented
<sect1 id="bus-ar-setup1">
<title>Starteinrichtung</title>
- <para>Durchführung der Einrichtung ist in <xref linkend="chapter_bus_setup" />
+ <para>Die Durchführung der Einrichtung ist in <xref linkend="chapter_bus_setup" />
beschrieben.
</para>
@@ -40,29 +40,31 @@ beschrieben.
der Debitorenbuchhaltung generierten Geschäftsvorfälle werden innerhalb der Forderungskonten
aufgezeichnet. Normalerweise werden Sie nicht direkt mit diesen Konten arbeiten.
Sie werden normalerweise mit den vier integrierten <application>&app;</application> Debitorenanwendungen
- arbeiten, die unter <menuchoice><guimenu>Geschäft</guimenu>
- <guisubmenu>Kunden</guisubmenu></menuchoice>-Dialog zu finden sind. Diese vier Komponenten sind:</para>
+ arbeiten, die im Menü unter <menuchoice><guimenu>Geschäft</guimenu>
+ <guisubmenu>Kunden</guisubmenu></menuchoice> zu finden sind. Diese vier Komponenten sind:</para>
<itemizedlist>
<listitem>
- <para><guilabel>Kunden</guilabel> sind Leute oder Unternehmen, denen
+ <para><guilabel>Kunden</guilabel> sind Menschen oder Unternehmen, denen
Sie Waren oder Dienstleistungen auf Kredit verkaufen.</para>
</listitem>
<listitem>
- <para><guilabel>Rechnungen</guilabel> stellen die physikalischen Ausgangsrechnungen dar, die
- Sie an den Kunden zur Zahlungsanforderung gesandt haben. Diese Ausgangsrechnung enthält eine
+ <para><guilabel>Rechnungen</guilabel> stellen in diesem Zusammenhang
+ die physikalischen Ausgangsrechnungen dar, die Sie an den Kunden
+ zur Zahlungsanforderung gesandt haben. Diese Ausgangsrechnung enthält eine
Aufzählung der Posten, die Sie verkauften.</para>
- <para>Zusätzlich bietet <application>&app;</application> auch Unterstützung für <guilabel>Gutschriften</guilabel>,
- welche die Umkehrung einer Ausgangsrechnung darstellen. Eine Gutschrift wird normalerweise dem Kunden
+ <para>Zusätzlich bietet <application>&app;</application> auch Unterstützung
+ für <guilabel>Gutschriften</guilabel>, welche die Umkehrung einer
+ Ausgangsrechnung darstellen. Eine Gutschrift wird normalerweise dem Kunden
ausgehändigt, um die Posten zu korrigieren, die falsch berechnet oder zurückgegeben wurden.</para>
<para>Beide Dokumententypen werden mit dem selben Menüpunkt erstellt.</para>
</listitem>
<listitem>
- <para><guilabel>Aufträge</guilabel> (optional) sind solche, wo Sie Kundenaufträge
- eintragen können. Aufträge sind Mechanismen, durch die Sie mehrere Rechnungen zu einem
- bestimmten Kunden zusammenfassen können</para>
+ <para>Unter <guilabel>Aufträge</guilabel> (optional) können Sie Kundenaufträge
+ eintragen. Aufträge sind eine Einrichtung, mit der Sie mehrere Rechnungen für
+ einen bestimmten Kunden zusammenfassen können</para>
</listitem>
<listitem>
@@ -75,17 +77,17 @@ beschrieben.
<sect1 id="bus-ar-customers1">
<title>Kunden</title>
- <para>Kunden sind Leute oder Unternehmen, denen Sie Waren oder Dienstleistungen verkaufen.
+ <para>Kunden sind Menschen oder Unternehmen, denen Sie Waren oder Dienstleistungen verkaufen.
Sie müssen in Ihrer Debitorenbuchhaltung registriert werden..</para>
<sect2 id="bus-ar-custnew2">
- <title>Neu</title>
+ <title>Neuer Kunde</title>
<para>Um einen neuen Kunden einzutragen, öffnen Sie das Menü <menuchoice>
<guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
- <guimenuitem>Neuer Kunde...</guimenuitem></menuchoice>.
+ <guimenuitem>Neuer Kunde…</guimenuitem></menuchoice>.
Geben Sie die Kundeninformationen ein, wie
- Name des Unternehmens, Adresse, Telefon-, Faxnummer, etc.</para>
+ Name des Unternehmens, Adresse, Telefon-, Faxnummer etc.</para>
<screenshot id="bus-ar-custnew">
<mediaobject>
@@ -95,10 +97,10 @@ beschrieben.
</imageobject>
<textobject>
- <phrase>Neuer Kunde Dialog</phrase>
+ <phrase>Registrierungsfenster -Neuer Kunde</phrase>
</textobject>
- <caption><para>Neuer Kunde Dialog</para></caption>
+ <caption><para>Registrierungsfenster - Neuer Kunde</para></caption>
</mediaobject>
</screenshot>
@@ -107,11 +109,12 @@ beschrieben.
<sect2 id="bus-ar-custfind2">
<title>Suchen und Bearbeiten</title>
- <para>Um einen existierenden Kunden zu suchen, nutzen Sie das <menuchoice>
+ <para>Um einen existierenden Kunden zu suchen, nutzen Sie das Fenster <menuchoice>
<guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
- <guimenuitem>Kunde suchen…</guimenuitem></menuchoice> Fenster. Sie wählen einen Kunden
- aus den Ergebnissen der Suche aus zum <guilabel>anzeigen/bearbeiten</guilabel>. Dieses
- Fenster wird auch genutzt, um Kunden zur Erstellung von Ausgangsrechnungen und zur Verarbeitung
+ <guimenuitem>Kunde suchen…</guimenuitem></menuchoice>. Sie wählen
+ einen Kunden aus den Ergebnissen der Suche aus mit der Schaltfläche
+ <guilabel>anzeigen/bearbeiten</guilabel>. Dieses Fenster wird auch genutzt,
+ um Kunden zur Erstellung von Ausgangsrechnungen und zur Verarbeitung
von Zahlungen nachzuschlagen.</para>
<screenshot id="bus-ar-custfind">
@@ -122,33 +125,33 @@ beschrieben.
</imageobject>
<textobject>
- <phrase>Kunden suchen Fenster</phrase>
+ <phrase>Fenster: Kunden suchen </phrase>
</textobject>
- <caption><para>Kunden suchen Fenster</para></caption>
+ <caption><para>Fenster: Kunden suchen </para></caption>
</mediaobject>
</screenshot>
<para>Wenn viele Kunden auf die von Ihnen gewählten Suchkriterien passen, kann die
Suche durch eine zusätzliche Suche in den aktuellen Suchergebnissen verfeinert werden.
- Das aktuelle Suchergebnis wird durchsucht, wenn der <guilabel>Verfeinern der
- aktuellen Suche</guilabel> Radiobutton ausgewählt ist. Tatsächlich wählt <application>&app;</application>
+ Das aktuelle Suchergebnis wird durchsucht, wenn der Radiobutton <guilabel>Verfeinern der
+ aktuellen Suche</guilabel> ausgewählt ist. Tatsächlich wählt <application>&app;</application>
diese Option für Sie, nachdem Sie die anfängliche Suche haben laufen lassen.</para>
<para>Wenn der Kunde, den Sie suchen, nicht den eingegebenen Suchkriterien
- entspricht, ändern Sie die Suchkriterien durch Klick auf den <guilabel>Neue
- Suche</guilabel> Radiobutton und dann auf den <guilabel>Suchen</guilabel>
- Button. Der relevante Schritt ist die <guilabel>Neue Suche</guilabel>
- Auswahl. Wenn der Kunde nicht in dem Ergebnis der Originalsuche enthalten ist und
- Sie nur in diesem Ergebnis suchen, kann der Kunde nicht gefunden werden,
- unabhängig von den neuen Suchkriterien.</para>
+ entspricht, ändern Sie die Suchkriterien durch Klick auf den Radiobutton <guilabel>Neue
+ Suche</guilabel> und dann auf die Schaltfläche <guilabel>Suchen</guilabel>.
+ Der relevante Schritt ist die Auswahl <guilabel>Neue Suche</guilabel>.
+ Wenn der Kunde nicht in dem Ergebnis der Originalsuche enthalten ist und
+ Sie nur in diesem Ergebnis suchen, kann der Kunde unabhängig von den
+ neuen Suchkriterien nicht gefunden werden.</para>
<note>
- <para>Um eine Liste aller registrierten aktiven Kunde zu erhalten, setzen
- Sie die Suchkriterien auf <guilabel>entspricht regulärem Ausdruck</guilabel> und einen
- einfachen Punkt "." in das Textfeld. Stellen Sie sicher, dass <guilabel>Nur aktive Daten
- durchsuchen</guilabel> ausgewählt ist. Nun klicken Sie auf
- <guibutton>Suchen</guibutton>. Der reguläre Ausdruck "." bedeutet, mit allen übereinstimmen.
+ <para>Um eine Liste aller registrierten aktiven Kunden zu erhalten, setzen
+ Sie als Suchkriterium <guilabel>entspricht regulärem Ausdruck</guilabel> und einen
+ einfachen Punkt <quote>.</quote> in das Textfeld. Stellen Sie sicher, dass der Radiobutton
+ <guilabel>Nur aktive Daten durchsuchen</guilabel> ausgewählt ist. Nun klicken Sie auf
+ <guibutton>Suchen</guibutton>. Der reguläre Ausdruck <quote>.</quote> findet alles.
</para>
</note>
</sect2>
@@ -157,29 +160,31 @@ beschrieben.
<sect1 id="bus-ar-invoices1">
<title>Ausgangsrechnungen</title>
- <para>Eine Ausgangsrechnung ist ein Papier, dass Sie an einen Kunden senden, um eine Zahlung
- für eine Lieferung oder Leistung zu generieren. <application>&app;</application> kann Rechnungen
- generieren und aufzeichnen.</para>
+ <para>Eine Ausgangsrechnung ist ein Papier, das Sie an einen Kunden
+ senden, um eine Zahlung für eine Lieferung oder Leistung zu veranlassen.
+ <application>&app;</application> kann Rechnungen generieren und aufzeichnen.</para>
- <para>Eine Gutschrift ist ein Papier, dass die einem Kunden senden, um eine fehlerhaft generierte Rechnung für
- Lieferungen und Leistungen zu korrigieren. <application>&app;</application> kann Gutschriften
- über das gleiche Menü generiren und aufzeichnen wie die Rechnungen.</para>
+ <para>Eine Gutschrift ist ein Papier, das Sie einem Kunden senden, um
+ eine fehlerhaft generierte Rechnung für Lieferungen und Leistungen zu
+ korrigieren. <application>&app;</application> kann Gutschriften
+ über das gleiche Menü generieren und aufzeichnen wie die Rechnungen.</para>
<note>
<para>Dieser Abschnitt gilt sowohl für Ausgangsrechnungen als auch für Gutschriften.
Um zu vermeiden, alles zweimal zu wiederholen und den Text einfacher lesbar zu halten,
- wird er nur bei den Rechnungen dargestellt. Sie können ihn auch auf
+ werden nur Rechnungen behandelt. Sie können ihn auch auf
Gutschriften anwenden. Nur dort, wo sich das Verhalten der Gutschriften von dem
der Rechnungen unterscheidet, wird dies ausdrücklich erwähnt.</para>
</note>
<sect2 id="bus-ar-invoicenew2">
- <title>Neu</title>
+ <title>Neue Ausgangsrechnung</title>
- <para>Um eine Ausgangsrechnung an einen Kunden zu senden, müssen Sie zunächst ein neues Dokument
- erstellen. Um eine Rechnung zu erstellen, nutzen Sie <menuchoice><guimenu>Geschäft</guimenu>
- <guisubmenu>Kunde</guisubmenu><guimenuitem>Neue Rechnung…</guimenuitem></menuchoice>. Das Fenster Neue Rechnung
- muss entsprechend ausgefüllt werden.</para>
+ <para>Um eine Ausgangsrechnung an einen Kunden zu senden, müssen Sie
+ zunächst ein neues Dokument erstellen. Um eine Rechnung zu erstellen,
+ nutzen Sie <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu>
+ <guimenuitem>Neue Rechnung…</guimenuitem></menuchoice>. Das
+ Fenster Neue Rechnung muss entsprechend ausgefüllt werden.</para>
<screenshot id="bus-ar-invoicenew">
<mediaobject>
@@ -196,17 +201,18 @@ beschrieben.
</mediaobject>
</screenshot>
- <para>Wenn Sie den <guibutton>OK</guibutton> Button klicken, öffnet sich das
+ <para>Wenn Sie die Schaltfläche <guibutton>OK</guibutton> klicken, öffnet sich das
Fenster <guilabel>Neue Rechnung</guilabel>.</para>
</sect2>
<sect2 id="bus-ar-invoiceedit2">
<title>Bearbeiten</title>
- <para>Im Rechnungsbearbeitungsfenster können Sie eine aufgeschlüsselte Liste der
- Waren und Leistungen, die Sie mit dieser Rechnung verkauften, eingeben, in einer Art und Weise ähnlich wie das
- Kontenregister arbeitet. Für die Gutschriften geben Sie stattdessen eine aufgeschlüsselte Liste der Waren und
- Leistungen ein, die Sie gutgeschrieben haben.</para>
+ <para>Im Fenster Rechnung bearbeiten können Sie eine aufgeschlüsselte
+ Liste der Waren und Leistungen, die Sie mit dieser Rechnung verkauften,
+ in ähnlicher Weise wie die Kontenregistrierung eingeben.
+ Für die Gutschriften geben Sie stattdessen eine aufgeschlüsselte Liste
+ der Waren und Leistungen ein, die Sie gutgeschrieben haben.</para>
<screenshot id="bus-ar-invoiceedit">
<mediaobject>
@@ -223,18 +229,19 @@ beschrieben.
</mediaobject>
</screenshot>
- <para>Wenn Sie alle Posten eingegeben haben, können sie die Rechnung
+ <para>Wenn Sie alle Posten eingegeben haben, können Sie die Rechnung
<guilabel>Buchen</guilabel> und drucken.</para>
</sect2>
<sect2 id="bus-ar-invoicepost2">
<title>Buchen</title>
- <para>Wenn die die Bearbeitung der Rechnung beendet haben und bereit sind, diese zu drucken,
- müssen Sie die Rechnung <guilabel>Buchen</guilabel>. Die Rechnung muss nicht sofort
- gebucht werden. In der Tat sollten Sie eine Rechnung nur Buchen, wenn Sie
- bereit sind, diese zu drucken. Das Buchen einer Rechnung setzt den Geschäftsvorfall in die
- Debitorenbuchhaltung.</para>
+ <para>Wenn Sie die Bearbeitung der Rechnung beendet haben und bereit
+ sind, diese zu drucken, müssen Sie die Rechnung <guilabel>Buchen</guilabel>.
+ Die Rechnung muss nicht sofort gebucht werden. In der Tat sollten
+ Sie eine Rechnung nur Buchen, wenn Sie bereit sind, diese zu drucken.
+ Das Buchen einer Rechnung stellt den Geschäftsvorfall in die
+ Debitorenbuchhaltung ein.</para>
<screenshot id="bus-ar-invoicepost">
<mediaobject>
@@ -256,8 +263,9 @@ beschrieben.
<sect2 id="bus-ar-invoicefind2">
<title>Suchen</title>
- <para>Um eine existierende Rechnung zu finden, nutzen Sie den Menüentrag <menuchoice><guimenu>Geschäft</guimenu>
- <guisubmenu>Kunde</guisubmenu><guimenuitem>Rechnung suchen…</guimenuitem></menuchoice>.
+ <para>Um eine existierende Rechnung zu finden, nutzen Sie den Menüentrag
+ <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
+ <guimenuitem>Rechnung suchen…</guimenuitem></menuchoice>.
In den Suchergebnissen können Sie eine Rechnung auswählen, um diese
zu betrachten oder zu bearbeiten.</para>
@@ -266,23 +274,23 @@ beschrieben.
<guilabel>Rechnungsbuchung rückgängig</guilabel> machen.</para>
</note>
- <para>Ein Gestaltungsziel in <application>&app;</application>’s Debitorenbuchhaltung war
- verschiedene Wege zum gleichen Ziel zu erlauben. So können Sie eine
- Ausgangsrechnung auf verschiedenen Wegen errechen, abhängig davon, wie Sie über das Problem
- denken:</para>
+ <para>Ein Gestaltungsziel in <application>&app;</application>’s
+ Debitorenbuchhaltung war, verschiedene Wege zum gleichen Ziel zu erlauben.
+ So können Sie eine Ausgangsrechnung auf verschiedenen Wegen erreichen,
+ abhängig davon, wie Sie über das Problem denken:</para>
<itemizedlist>
<listitem>
- <para>Sie können zuerst den Kunden suchen und dann deren Rechnungen.</para>
+ <para>Sie können zuerst den Kunden suchen und dann dessen Rechnungen.</para>
</listitem>
<listitem>
- <para>Sie können die Rechnungen nach der Nummer oder dem Namen des Unternehmens
+ <para>Sie können die Rechnungen nach der Nummer oder dem Unternehmensnamen
suchen.</para>
</listitem>
<listitem>
- <para>Sie können die Rechnungen auflisten, die mit eienr Kundenaufgabe verbunden sind.</para>
+ <para>Sie können die Rechnungen auflisten, die mit einem Kundenauftrag verbunden sind.</para>
</listitem>
</itemizedlist>
</sect2>
@@ -310,32 +318,34 @@ beschrieben.
</screenshot>
<note>
- <para>Sie können das Erscheinungsbild der Rechnung ändern,z.B. ein Firmenlogo etc.
- hinzufügen. Wie das geht, steht unter <xref
+ <para>Sie können das Erscheinungsbild der Rechnung ändern, z.B.
+ ein Firmenlogo etc. hinzufügen. Wie das geht, steht unter <xref
linkend="bus-ar-invoicechange" />.</para>
</note>
- <para>Rechnungen können auch vom Hauptfenster aus ausgedruckt werden, indem dort
- <menuchoice><guimenu>Berichte</guimenu><guisubmenu>Geschäft</guisubmenu>
- <guimenuitem>Druckbare Rechnung</guimenuitem></menuchoice> aus dem Hauptmenü ausgewählt wird.
- Das sich ergebende Berictsfenster stellt fest, dass keine gültige Rechnung ausgewählt wurde. Um
+ <para>Rechnungen können auch vom Hauptfenster aus ausgedruckt werden, indem dort
+ aus dem Hauptmenü <menuchoice><guimenu>Berichte</guimenu><guisubmenu>Geschäft</guisubmenu>
+ <guimenuitem>Druckbare Rechnung…</guimenuitem></menuchoice>
+ Hauptmenü ausgewählt wird. Das sich ergebende Berichtsfenster stellt
+ fest, dass keine gültige Rechnung ausgewählt wurde. Um
die Rechnung zum Drucken auszuwählen:</para>
<orderedlist>
<listitem>
- <para>Nutzen Sie die <guibutton>Optionen</guibutton> <emphasis>Werkzeugleiste</emphasis>-Schaltfläche oder wählen Sie
- <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Berichtsoptionen</guimenuitem></menuchoice> aus
- dem Hauptmenü.</para>
+ <para>Nutzen Sie die Schaltfläche <guibutton>Optionen</guibutton> in der
+ <emphasis>Werkzeugleiste</emphasis> oder wählen Sie in der Menüleiste
+ <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Berichtsoptionen
+ </guimenuitem></menuchoice> aus.</para>
</listitem>
<listitem>
- <para>Wählen Sie den <guilabel>Allgemein</guilabel> Reiter des Dialogs
- Berichtsoptionen.</para>
+ <para>Wählen Sie den Reiter <guilabel>Allgemein</guilabel> im Dialog
+ Druckbare Rechnung.</para>
</listitem>
<listitem>
- <para>Klicken Sie die <guibutton>Auswahl</guibutton> Schaltfläche in der Nähe des Feldes
- <guilabel>Rechnungsnummer</guilabel>.</para>
+ <para>Klicken Sie die Schaltfläche <guibutton>Auswahl</guibutton>
+ in der Nähe des Feldes <guilabel>Rechnungsnummer</guilabel>.</para>
</listitem>
<listitem>
@@ -343,8 +353,8 @@ beschrieben.
</listitem>
</orderedlist>
- <para>Sie können auch die Rechnung innerhalb des Zahlungsprozessdialogs drucken.
- Schauen Sie dazu <xref linkend="bus-ar-payment1" /> für die Anweisungen,
+ <para>Sie können auch die Rechnung innerhalb des Zahlungsprozessdialogs ausdrucken.
+ Schauen Sie dazu unter <xref linkend="bus-ar-payment1" /> für die Anweisungen,
wie dies durchzuführen ist.</para>
</sect2>
@@ -353,24 +363,27 @@ beschrieben.
<para>Standardmäßig startet <application>&app;</application> mit der Rechnungmmer 1 und zählt ab da hoch.
Sie können eine Rechnungsnummer jedesmal händisch in die Textbox eingeben, wenn Sie
- eine Rechnung erstellen. Aber dies ist ermüdend und früher oder später führt dies zu
+ eine Rechnung erstellen. Aber dies ist ermüdend, und früher oder später führt dies zu
doppelten Nummern.</para>
<para>Sie können die erste Rechnungsnummer ändern, wenn dies für Sie wichtig ist.
- Nutzen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>Eigenschaften</guimenuitem></menuchoice>, greifen Sie auf
- den Reiter <guilabel>Zähler</guilabel> zu, ändern Sie den Wert der <guilabel>Rechnungsnummer</guilabel>, die um eins kleiner
- als Ihre erwartete erste Rechnungsnummer ist und klicken Sie die <guibutton>OK</guibutton>-Schaltfläche oder die
- <guibutton>Anwenden</guibutton>-Schaltfläche.</para>
+ Nutzen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>Eigenschaften
+ </guimenuitem></menuchoice>, greifen Sie auf den Reiter <guilabel>Zähler
+ </guilabel> zu, ändern Sie den Wert der <guilabel>Rechnungsnummer</guilabel> dergestalt,
+ dass sie um eins kleiner ist als Ihre erwartete erste Rechnungsnummer, und
+ klicken Sie die Schaltfläche <guibutton>OK</guibutton> oder die Schaltfläche
+ <guibutton>Anwenden</guibutton>.</para>
</sect2>
</sect1>
<sect1 id="bus-ar-jobs1">
- <title>Kundenaufgaben</title>
+ <title>Kundenaufträge</title>
- <para>Kundenaufgaben werden genutzt, um viele Rechnungen und Grutschriften für den gleichen Kunden
- zu gruppieren. Die Nutzung der Funktion Kundenaufgaben ist freiwillig. Die Eigenschaft ist nützlich,
- wenn Sie viele <guilabel>Aufgaben</guilabel> für den gelichen Kunden haben, und wenn Sie alle Rechnungen
- und Gutschriften zu einer einzelnen Aufgabe auf einem Blick sehen wollen.</para>
+ <para>Kundenaufträge werden genutzt, um viele Rechnungen und Gutschriften
+ für den gleichen Kunden zusammenzufassen. Die Nutzung der Funktion Kundenaufträge
+ ist freiwillig. Die Eigenschaft ist nützlich, wenn Sie viele <guilabel>Aufträge
+ </guilabel> für den gleichen Kunden haben, und wenn Sie alle Rechnungen
+ und Gutschriften zu einer einzelnen Auftrag auf einem Blick sehen wollen.</para>
<screenshot id="bus-ar-jobnew">
<mediaobject>
@@ -380,30 +393,33 @@ beschrieben.
</imageobject>
<textobject>
- <phrase>Neue Kundenaufgabe</phrase>
+ <phrase>Neue Kundenauftrag</phrase>
</textobject>
- <caption><para>Neue Kundenaufgabe </para></caption>
+ <caption><para>Neue Kundenauftrag </para></caption>
</mediaobject>
</screenshot>
- <para>Um Kundenaufgaben zu nutzen, müssen Sie diese erstellen, in dem Sie den Menüeintrag <menuchoice>
- <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu>
- <guimenuitem>Neue Aufgabe</guimenuitem></menuchoice> nutzen. Sie werden das <guilabel>Neue
- Aufgabe</guilabel>-Fenster sehen.</para>
-
- <para>Um eine vorhandene Kundenaufgabe zu bearbeiten, nutzen Sie den Menüeintrag <menuchoice>
- <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu>
- <guimenuitem>Suche Aufgabe…</guimenuitem></menuchoice>. Wählen Sie die erwünschte Aufgabe in den
- Suchergebnissen und klicken Sie die <guilabel>Aufgabe ansehen/bearbeiten</guilabel>-Schaltfläche.</para>
-
- <para>Zum Auswählen der Rechnungen und Gutschriften, die mit einer Aufgabe verbunden sind, nutzen Sie den Menüeintrag <menuchoice>
- <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu><guimenuitem>Aufgabe suchen…
- </guimenuitem></menuchoice>. Wählen Sie die gewünschte Aufgabe in den
- Suchergebnissen und klicken Sie die <guilabel>Rechnungsansicht</guilabel>-Schlatfläche. Ein Fenster
- mit einer Liste von Rechnungen und Gutschriften, die mit dieser Aufgabe verbunden sind, erscheint. Wählen Sie
- eine Rechnung oder Gutschrift aus und klicken Sie die <guilabel>Rechnungsansicht</guilabel>-Schaltfläche, um
- das Rechnungsbearbeitungsfenster im Hauptanwendungsfenster zu öffnen.</para>
+ <para>Um Kundenauftrag zu nutzen, müssen Sie diese erstellen, in dem
+ Sie den Menüeintrag <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Kunden
+ </guisubmenu><guimenuitem>Neuer Auftrag…</guimenuitem></menuchoice> nutzen.
+ Sie werden das Fenster <guilabel>Neuer Auftrag</guilabel> sehen.</para>
+
+ <para>Um eine vorhandene Kundenauftrag zu bearbeiten, nutzen Sie den
+ Menüeintrag <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
+ <guimenuitem>Suche Auftrag…</guimenuitem></menuchoice>. Wählen Sie
+ den erwünschten Auftrag in den Suchergebnissen und klicken Sie auf die Schaltfläche
+ <guilabel>Auftrag ansehen/bearbeiten</guilabel>.</para>
+
+ <para>Zum Auswählen der Rechnungen und Gutschriften, die mit einer Auftrag
+ verbunden sind, nutzen Sie den Menüeintrag <menuchoice>
+ <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Auftrag suchen…
+ </guimenuitem></menuchoice>. Wählen Sie die gewünschte Auftrag in den
+ Suchergebnissen und klicken Sie die Schaltfläche <guilabel>Rechnungsansicht</guilabel>.
+ Ein Fenster mit einer Liste von Rechnungen und Gutschriften, die mit
+ diesem Auftrag verbunden sind, erscheint. Wählen Sie eine Rechnung oder
+ Gutschrift aus und klicken Sie die Schaltfläche <guilabel>Rechnungsansicht</guilabel>,
+ um das Rechnungsbearbeitungsfenster im Hauptanwendungsfenster zu öffnen.</para>
</sect1>
@@ -411,10 +427,10 @@ beschrieben.
<title>Zahlung verarbeiten</title>
<para>Möglicherweise werden Sie Zahlung von Ihren Kunden für offene
- Rechnunge erhalten. Um diese Zahlungen aufzuzeichnen, Nutzen Sie die Anwendung Zahlung verarbeiten,
- zu finden unter <menuchoice><guimenu>Geschäft</guimenu>
- <guisubmenu>Kunden</guisubmenu><guimenuitem>Zahlung
- verarbeiten…</guimenuitem></menuchoice>.</para>
+ Rechnunge erhalten. Um diese Zahlungen aufzuzeichnen, nutzen Sie die
+ Anwendung Zahlung verarbeiten, zu finden unter <menuchoice><guimenu>Geschäft</guimenu>
+ <guisubmenu>Kunden</guisubmenu><guimenuitem>Zahlung verarbeiten…
+ </guimenuitem></menuchoice>.</para>
<screenshot id="bus-ar-payment">
<mediaobject>
@@ -438,17 +454,20 @@ beschrieben.
<para>Die Standardausführung der Rechnung - wie in <xref
linkend="bus-ar-invoiceprint2" /> dargestellt, ist ziemlich öde. Die Standardausführung
der Rechnung lässt den oberen Teil des Formulars frei. So können Sie es auf Kopfbögen Ihrer
- Firma drucken. Es gibt einige Dinge, wie Sie das Erscheinungsbild der Rechnung
- ändern können.</para>
-
- <para>Nutzen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>Eigenschaften</guimenuitem></menuchoice>, um
- Ihre Firmenangaben im Register <guilabel>Geschäft</guilabel> des Fenster <guilabel>Buch-Optionen</guilabel> einzugeben.
- Einige der eingegebenen Informatioonen werden auf der rechten Seite der Rechnungen gedruckt.</para>
-
- <para>Um einen individualisierten Hintergrund, ein Kopfbanner oder Logo zu den Rechnungen
- hinzuzufügen, ändern Sie die Rechnungsstilvorlagen. Um dies zu tun, gehen Sie zu <menuchoice><guimenu>Bearbeiten</guimenu>
- <guimenuitem>Stilvorlagen</guimenuitem></menuchoice> und wählen die <guibutton>Neu</guibutton>
- Schaltfläche im Fenster <guilabel>HTML-Stilvorlage auswählen</guilabel>, welches erscheint.
+ Firma drucken. Sie können einiges machen, um das Erscheinungsbild der Rechnung
+ zu ändern.</para>
+
+ <para>Nutzen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>
+ Eigenschaften</guimenuitem></menuchoice>, um Ihre Firmenangaben im Register
+ <guilabel>Geschäft</guilabel> des Fensters <guilabel>Buch-Optionen</guilabel> einzugeben.
+ Einige der eingegebenen Informationen werden auf der rechten Seite der Rechnungen gedruckt.</para>
+
+ <para>Um einen individualisierten Hintergrund, ein Kopfbanner oder Logo
+ zu den Rechnungen hinzuzufügen, ändern Sie die Rechnungsstilvorlagen.
+ Um dies zu tun, gehen Sie zu <menuchoice><guimenu>Bearbeiten</guimenu>
+ <guimenuitem>Stilvorlagen</guimenuitem></menuchoice> und wählen die
+ Schaltfläche <guibutton>Neu</guibutton> im Fenster <guilabel>HTML-Stilvorlage
+ auswählen</guilabel> aus, welches erscheint.
Sie werden ein Fenster wie dieses sehen:</para>
<screenshot id="bus-ar-invoicechange1">
@@ -466,23 +485,31 @@ beschrieben.
</mediaobject>
</screenshot>
- <para>Geben Sie der neuen Stilvorlage einen <guilabel>Name</guilabel>n (z.B. <guilabel>Kundenrechnung</guilabel>) und wählen Sie die
- <guilabel>Elegant</guilabel> <guilabel>Vorlage</guilabel>. Wenn Sie die
- <guibutton>OK</guibutton> Schaltfläche klicken, wird das Fenster <guilabel>Eigenschaften HTML-Stilvorlage</guilabel>
- angezeigt. Dieses Fenter zeigt Ihnen fünf Abschnitte am linken Rand: <guilabel>Farben</guilabel>, <guilabel>Schriftarten</guilabel>,
- <guilabel>Allgemein</guilabel>, <guilabel>Bilder</guilabel> und <guilabel>Tabellen</guilabel>. Der Abschnitt <guilabel>Farben</guilabel>
- erlaubt Ihnen die Farben der verschiedenen Elemente der Rechnung zu ändern. Im Abschnitt <guilabel>Schriftarten</guilabel> können Sie
- Schriftart und -größe einstellen. Der Abschnitt <guilabel>Allgemein</guilabel> erlaubt Ihnen die <guilabel>Sachbearbeiter</guilabel> und
- <guilabel>Erstellt für:</guilabel> Information festzulegen und <guilabel>Links aktivieren</guilabel>. Der Abschnitt <guilabel>Bilder</guilabel>
- erlaubt Ihnen Grafiken in die Stilvorlage zu importieren. Der Abschnitt <guilabel>Tabellen</guilabel> erlaubt es Ihnen den Raum und
- um die Tabellen einzustellen, welche die Rechnung ausmachen.</para>
-
- <para>Um ein Firmenlogo, ein Kopfbanner und ein Hintergrundbild einzubinden , nutzen Sie
- Ihre bevorzugtes Grafikprogramm wie <application>The Gimp</application> oder <application>OpenOffice Draw</application> um
- die Bilder entweder im <acronym>GIF</acronym>- oder <acronym>PNG</acronym>-Format zu speichern. Dann importieren Sie diese in die
- Stilvorlage, in dem Sie den Abschnitt <guilabel>Bilder</guilabel> wie oben beschrieben nutzen.</para>
-
- <para>Unten ist ein Beispiel, das die Importe aller dre Bildarten zeigt.</para>
+ <para>Geben Sie der neuen Stilvorlage einen <guilabel>Name</guilabel>n
+ (z.B. <guilabel>Kundenrechnung</guilabel>) und wählen Sie die <guilabel>Vorlage</guilabel>
+ <guilabel>Elegant</guilabel>. Wenn Sie die Schaltfläche <guibutton>OK</guibutton>
+ Schaltfläche klicken, wird das Fenster <guilabel>Eigenschaften HTML-Stilvorlage</guilabel>
+ angezeigt. Dieses Fenter zeigt Ihnen fünf Abschnitte am linken Rand:
+ <guilabel>Farben</guilabel>, <guilabel>Schriftarten</guilabel>,
+ <guilabel>Allgemein</guilabel>, <guilabel>Bilder</guilabel> und
+ <guilabel>Tabellen</guilabel>. Der Abschnitt <guilabel>Farben</guilabel>
+ erlaubt Ihnen die Farben der verschiedenen Elemente der Rechnung zu ändern.
+ Im Abschnitt <guilabel>Schriftarten</guilabel> können Sie Schriftart und -größe
+ einstellen. Der Abschnitt <guilabel>Allgemein</guilabel> erlaubt Ihnen die
+ <guilabel>Sachbearbeiter</guilabel> und <guilabel>Erstellt für:</guilabel>
+ Information festzulegen und <guilabel>Links aktivieren</guilabel>.
+ Der Abschnitt <guilabel>Bilder</guilabel> erlaubt Ihnen Grafiken in die
+ Stilvorlage zu importieren. Der Abschnitt <guilabel>Tabellen</guilabel>
+ erlaubt es Ihnen den Raum um die Tabelle einzustellen, welche die Rechnung ausmachen.</para>
+
+ <para>Um ein Firmenlogo, ein Kopfbanner und ein Hintergrundbild einzubinden,
+ nutzen Sie Ihr bevorzugtes Grafikprogramm wie <application>The Gimp</application>
+ oder <application>OpenOffice Draw</application>, um die Bilder entweder im
+ <acronym>GIF</acronym>- oder <acronym>PNG</acronym>-Format zu speichern.
+ Dann importieren Sie diese in die Stilvorlage, indem Sie den Abschnitt
+ <guilabel>Bilder</guilabel> wie oben beschrieben nutzen.</para>
+
+ <para>Nachstehend ein Beispiel, das die Importe aller drei Bildarten zeigt.</para>
<screenshot id="bus-ar-invoicechange2">
<mediaobject>
@@ -500,24 +527,24 @@ beschrieben.
<phrase>Beispiel HTML Stilvorlagen</phrase>
</textobject>
- <caption><para>Das <acronym>HTML</acronym> Stilvorlagenfenster mit einem Beipiel Hintergrundkachel
- Kopfbanner and Logo.</para></caption>
+ <caption><para>Das <acronym>HTML</acronym> Stilvorlagenfenster mit
+ einem Beipiel Hintergrundkachel, Kopfbanner and Logo.</para></caption>
</mediaobject>
</screenshot>
<note>
- <para>Die Bilder werden in de rREchnung wie folgt plaziert. Die
+ <para>Die Bilder werden in der Rechnung wie folgt plaziert. Die
<guilabel>Hintergrundkachel</guilabel> wird gekachelt, um das Hintergrundbild
- zu werden. Der <guilabel>Kopfbanner</guilabel> geht über den Rechnungstext
+ zu werden. Das <guilabel>Kopfbanner</guilabel> geht über den Rechnungstext
und das <guilabel>Logo</guilabel> wird in die obere linke Ecke der Rechnung
links vom Kopfbanner untergebracht. Möglicherweise müssen Sie einige Bilder unterschiedlicher
Größe ausprobieren, bis Sie die Rechnung schön ausdrucken können.
- Einige Größenempfehlungen sind, dass das Logo 1 cm² groß, das Kopfbanner
+ Einige Größenempfehlungen sind, dass das Logo 1 cm² groß und das Kopfbanner
15 cm breit und 1 cm hoch sein sollten.</para>
</note>
<para>Nachdem Sie die Stilvorlage konfiguriert haben, wählen Sie beim Drucken der Rechnung
- die zunutzende Stilvorlage im <guimenu>Optionen</guimenu>-Menü.
+ die zu nutzende Stilvorlage im <guimenu>Optionen</guimenu>-Menü.
Nachfolgend sehen Sie die sich daraus ergebende Rechnung nach Anwendung der oben
dargestellten Stilvorlage.</para>
@@ -532,8 +559,8 @@ beschrieben.
<phrase>HTML Stilvorlage Beispiel</phrase>
</textobject>
- <caption><para>Die scheußliche Rechnung, die sich aus den in der Stilvorlage ausgewählten Grafiken
- ergibt.</para></caption>
+ <caption><para>Die scheußliche Rechnung, die sich aus den in der
+ Stilvorlage ausgewählten Grafiken ergibt.</para></caption>
</mediaobject>
</screenshot>
commit 6a4395f0ef585f62193e1d36862ef8ba809d1b62
Author: Mechtilde <ooo at mechtilde.de>
Date: Sat Jan 2 10:52:11 2016 +0100
corrections and German screenshots for chapter bus_ap
diff --git a/guide/de/ch_bus_ap.xml b/guide/de/ch_bus_ap.xml
index 627aaee..e90a4b4 100644
--- a/guide/de/ch_bus_ap.xml
+++ b/guide/de/ch_bus_ap.xml
@@ -25,34 +25,46 @@ corrected to be less describing of the interface and more tutorial oriented
<sect1 id="bus_ap_setup1">
<title>Starteinrichtung</title>
- <para>Durchführung der Einrichtung ist in <xref linkend="chapter_bus_setup" />
+ <para>Die Durchführung der Einrichtung ist in <xref linkend="chapter_bus_setup" />
beschrieben.
</para>
</sect1>
<sect1 id="bus-ap-components1">
<title>Systemkomponenten</title>
- <para><application>&app;</application> hat eine integrierte Kreditorenbuchhaltung.
- Die von der Kreditorenbuchhaltung erzeugten Geschäftsvorfälle werden im Konto Verbindlichkeiten aus Lieferung und Leistung aufgezeichnet.
- In der Regel arbeiten Sie nicht direkt mit diesem Konto, sondern nutzen die vier integierten <application>&app;</application> Passiva-Anwendungsbestandteile.
- Die Passiva-Anwendungsbestandteile sind im <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu></menuchoice> Untermenü erreichbar. Diese Passiva-Anwendungsbestandteile sind :</para>
+ <para><application>&app;</application> hat eine integrierte Kreditorenbuchhaltung.
+ Die von der Kreditorenbuchhaltung erzeugten Geschäftsvorfälle werden im
+ Konto Verbindlichkeiten aus Lieferung und Leistung aufgezeichnet.
+ In der Regel arbeiten Sie nicht direkt mit diesem Konto, sondern nutzen
+ die vier integierten <application>&app;</application> Passiva-Anwendungsbestandteile.
+ Die Passiva-Anwendungsbestandteile sind im Umtermenü <menuchoice><guimenu>Geschäft</guimenu>
+ <guisubmenu>Kunden</guisubmenu></menuchoice> erreichbar. Diese
+ Passiva-Anwendungsbestandteile sind :</para>
<itemizedlist>
<listitem>
- <para><guilabel>Lieferanten</guilabel> sind Personen oder Unternehmen, von denen Sie
- Produkte oder Dienstleistungen auf Kredit gekauft haben.</para>
+ <para><guilabel>Lieferanten</guilabel> sind Personen oder Unternehmen, von denen Sie
+ Produkte oder Leistungen auf Kredit gekauft haben.</para>
</listitem>
<listitem>
- <para><guilabel>Lieferantenrechnungen </guilabel> bilden die materiellen Rechnungen ab, die Lieferanten senden, um von Ihnen Zahlunge zu erhalten. Eine Rechnung enthält eine aufgegliederte Liste der Dinge, die Sie gekauft haben.</para>
- <para>Zusätzlich unterstützt <application>&app;</application> auch <guilabel>Gutschriften</guilabel>
- welches die Umkehrung der Rechnung bildet. Eine Gutschrift erhält man gewöhnlich vom
- Lieferanten, um Posten zu korrigieren, die irrtümlich in Rechnung gestellt oder zurückgesandt wurden..</para>
- <para>Beide Dokumentenarten werden mit den gleichen Menüpunkten eingerichtet.</para>
+ <para><guilabel>Lieferantenrechnungen </guilabel> bilden die materiellen
+ Rechnungen ab, die Lieferanten senden, um von Ihnen Zahlungen zu erhalten.
+ Eine Rechnung enthält eine aufgegliederte Liste der Waren und Leistungen,
+ die Sie gekauft haben.</para>
+ <para>Zusätzlich unterstützt <application>&app;</application> auch
+ <guilabel>Gutschriften</guilabel>,
+ welche die Umkehrung der Rechnung bilden. Eine Gutschrift erhält man
+ gewöhnlich vom Lieferanten, um Posten zu korrigieren, die irrtümlich
+ in Rechnung gestellt oder zurückgesandt wurden..</para>
+ <para>Beide Dokumentenarten werden mit den gleichen Menüpunkten eingerichtet.</para>
</listitem>
<listitem>
- <para><guilabel>Aufträge</guilabel> (optional) ist, wo Sie Lieferantenaufträge eintragen. Aufträge sind eine Einrichtung, mit der man mehrere Rechnungen eines einzelnen Lieferanten gruppieren kann.</para>
+ <para>Unter <guilabel>Aufträge</guilabel> (optional) können Sie Lieferantenaufträge
+ eintragen. Aufträge sind eine Einrichtung, mit der man mehrere Rechnungen
+ eines einzelnen Lieferanten gruppieren kann.</para>
</listitem>
<listitem>
- <para>Unter <guilabel>Zahlung verarbeiten...</guilabel> können Sie Zahlungen an einen Lieferanten aufzeichnen, dem Sie Geld schulden.</para>
+ <para>Unter <guilabel>Zahlung verarbeiten…</guilabel> können Sie Zahlungen
+ an einen Lieferanten aufzeichnen, dem Sie Geld schulden.</para>
</listitem>
</itemizedlist>
@@ -61,26 +73,33 @@ corrected to be less describing of the interface and more tutorial oriented
<sect1 id="bus-ap-vendors1">
<title>Lieferanten</title>
- <para>Ein Lieferant ist eine Gesellschaft oder eine Person, von der Sie Waren oder Leistungen kaufen. Lieferanten müssen im Passiva-System registiert sein.</para>
+ <para>Ein Lieferant ist eine Gesellschaft oder eine Person, von der Sie
+ Waren oder Leistungen beziehen. Lieferanten müssen im Passiva-System
+ registiert sein.</para>
<sect2 id="bus-ap-vendornew2">
<title>Neu</title>
- <para>Um einen neuen Lieferanten zu registrieren, wählen Sie den <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neuer Lieferant</guimenuitem></menuchoice> Menüentrag. Geben Sie die allgemeinen Informationen über den Lieferanten, wie Firmenname, Adresse, Telefon- und Faxnummer, etc ein. Unten finden Sie eine Liste weiterer Optionen: </para>
+ <para>Um einen neuen Lieferanten zu registrieren, wählen Sie den Menüeintrag
+ <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
+ <guimenuitem>Neuer Lieferant</guimenuitem></menuchoice>.
+ Geben Sie die allgemeinen Informationen über den Lieferanten, wie Firmenname,
+ Adresse, Telefon- und Faxnummer, etc ein. Unten finden Sie eine Liste
+ weiterer Optionen: </para>
<para>So sieht das Registrierungsfenster für einen neuen Lieferanten aus:</para>
- <screenshot id="bus-ap-vendornew">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_vendornew.png"
- srccredit="Patrick Schweiger" format="PNG"/>
+ <screenshot id="bus-ap-vendornew">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_vendornew.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Neuer Lieferant - Registrierungsfenster</phrase>
- </textobject>
- <caption>
- <para>Neuer Lieferant - Registrierungsfenster
- </para>
- </caption>
+ <textobject>
+ <phrase>Registrierungsfenster - Neuer Lieferant</phrase>
+ </textobject>
+ <caption>
+ <para>Registrierungsfenster - Neuer Lieferant
+ </para>
+ </caption>
</mediaobject>
</screenshot>
@@ -88,49 +107,63 @@ corrected to be less describing of the interface and more tutorial oriented
<sect2 id="bus-ap-vendorfind2">
<title>Lieferant suchen</title>
- <para>Um einen existierenden Lieferanten zu suchen, nutzen Sie das <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Lieferanten suchen...</guimenuitem></menuchoice> Fenster. Sie wählen einen Lieferanten mit <guibutton>Lieferant anzeigen/bearbeiten</guibutton> aus den Suchergebnissen. Dieses Fenster wird auch benutzt, um einen Lieferanten zu suchen, wenn Rechnungen eingehen und Zahlungen geleistet werden.</para>
- <screenshot id="bus-ar-vendorfind">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_vendorfind.png"
- srccredit="Patrick Schweiger" format="PNG"/>
+ <para>Um einen existierenden Lieferanten zu suchen, nutzen Sie das Fenster
+ <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
+ <guimenuitem>Lieferanten suchen…</guimenuitem></menuchoice>.
+ Sie wählen einen Lieferanten mit <guibutton>Lieferant anzeigen/bearbeiten</guibutton>
+ aus den Suchergebnissen aus. Dieses Fenster wird auch benutzt, um einen
+ Lieferanten zu suchen, wenn Rechnungen eingehen und Zahlungen geleistet werden.</para>
+ <screenshot id="bus-ar-vendorfind">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_vendorfind.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Lieferanten suchen Fenster</phrase>
- </textobject>
- <caption>
- <para>Lieferanten suchen </para>
- </caption>
+ <textobject>
+ <phrase>Fenster - Lieferanten suchen</phrase>
+ </textobject>
+ <caption>
+ <para>Lieferanten suchen </para>
+ </caption>
</mediaobject>
</screenshot>
- <para>Wenn viele Lieferanten den Suchkriterien entsprechen, kann die gewählte Suche
- durch eine zusätzliche Suche in den aktuellen Suchergebnissen
- verfeinert werden. Das aktuelle Ergebnis wird durchsucht, wenn der <guilabel>Verfeinern der
- aktuellen Suche</guilabel> Radiobutton ausgewählt ist. Tatsächlich wählt <application>&app;</application>
- diese Option für Sie, nachdem Sie die anfängliche Suche haben laufen lassen.</para>
+ <para>Wenn viele Lieferanten den Suchkriterien entsprechen, kann die
+ gewählte Suche durch eine zusätzliche Suche in den aktuellen Suchergebnissen
+ verfeinert werden. Das aktuelle Ergebnis wird durchsucht, wenn der
+ Radiobutton <guilabel>Verfeinern der aktuellen Suche</guilabel> ausgewählt
+ ist. Tatsächlich wählt <application>&app;</application> diese Option
+ für Sie, nachdem Sie die anfängliche Suche haben laufen lassen.</para>
<para>Wenn der Lieferant, den Sie suchen, nicht den gewählten
- Suchkriterien entspricht, können Sie die Suchkriterien ändern durch Klicken des <guilabel>Neue
- Suche</guilabel> Radiobutton und dann des <guibutton>Suchen</guibutton>
- Button. Der wichtige Schritt ist die Auswahl <guilabel>Neue Suche</guilabel>.
+ Suchkriterien entspricht, können Sie die Suchkriterien durch Klicken
+ des Radiobutton <guilabel>Neue
+ Suche</guilabel> und dann der Schaltfläche <guibutton>Suchen</guibutton>
+ ändern. Der wichtige Schritt ist die Auswahl <guilabel>Neue Suche</guilabel>.
Wenn der Lieferant nicht im Ergebnis der ursprünglichen Suche ist
und Sie nur in diesem Ergebnissatz suchen, kann der Lieferant trotz
neuer Suchkriterien nicht gefunden werden.</para>
- <note>
- <para>Um eine Liste aller registrierten aktiven Lieferanten zu erhalten, setzen Sie das Suchkriterium auf <guilabel>entspricht regulärem Ausdruck</guilabel> und setzen einen einzelnen Punkt <quote>.</quote> in das Texteingabefeld. Stellen Sie sicher, dass <guilabel>Nur aktive Daten durchsuchen</guilabel> ausgewählt ist. Dann klicken Sie <guibutton>Suchen</guibutton>. Der reguläre Ausdruck <quote>.</quote> findet alles.</para>
- </note>
+ <note>
+ <para>Um eine Liste aller registrierten aktiven Lieferanten zu erhalten,
+ setzen Sie das Suchkriterium auf <guilabel>entspricht regulärem Ausdruck</guilabel>
+ und setzen einen einzelnen Punkt <quote>.</quote> in das Texteingabefeld.
+ Stellen Sie sicher, dass <guilabel>Nur aktive Daten durchsuchen</guilabel>
+ ausgewählt ist. Dann klicken Sie <guibutton>Suchen</guibutton>. Der reguläre
+ Ausdruck <quote>.</quote> findet alles.</para>
+ </note>
</sect2>
</sect1>
<sect1 id="bus-ap-bills1">
<title>Lieferantenrechnung</title>
- <para>Eine Lieferantenrechnung ist eine Zahlungsaufforderung von einem Lieferanten. <application>&app;</application> kann Rechnungen nachverfolgen.</para>
+ <para>Eine Lieferantenrechnung ist eine Zahlungsaufforderung von einem
+ Lieferanten. <application>&app;</application> kann Rechnungen verfolgen.</para>
- <para>Eine Gutschrift ist ein Dokument, dass Sie vom Lieferanten erhalten, um geleistete Lieferungen oder Leistungen
- zu berichtigen, die in einer Rechnung falsch berechnet wurden. <application>&app;</application> kann Gutschriften erzeugen und
- verfolgen durch dieselben Menüeinträge wie bei Rechnungen.</para>
+ <para>Eine Gutschrift ist ein Dokument, dass Sie vom Lieferanten erhalten,
+ um geleistete Lieferungen oder Leistungen zu berichtigen, die in einer
+ Rechnung falsch berechnet wurden. <application>&app;</application> kann
+ Gutschriften durch dieselben Menüeinträge wie bei Rechnungen erzeugen und verfolgen .</para>
<note>
<para>Dieser Abschnitt trifft sowohl auf Rechnungen als auch auf
@@ -142,138 +175,171 @@ corrected to be less describing of the interface and more tutorial oriented
<sect2 id="bus-ap-billnew2">
<title>Neu</title>
- <para>Wenn Sie eine Rechnung von einem Lieferanten erhalten und diese in <application>&app;</application> eingeben wollen, müssen Sie eine neue Rechnung erstellen. Um eine neue Rechnung zu erstellen, nutzen Sie den Menüeintrag <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Leferant</guisubmenu><guimenuitem>Neue Rechnung</guimenuitem></menuchoice>, und füllen das erscheinende Fenster entsprechend aus.</para>
- <screenshot id="bus-ap-billnew">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_billnew.png"
- srccredit="Patrick Schweiger" format="PNG"/>
+ <para>Wenn Sie eine Rechnung von einem Lieferanten erhalten und diese
+ in <application>&app;</application> eingeben wollen, müssen Sie eine
+ neue Rechnung erstellen. Um eine neue Rechnung zu erstellen, nutzen Sie
+ den Menüeintrag <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
+ <guimenuitem>Neue Rechnung</guimenuitem></menuchoice>, und füllen das
+ erscheinende Fenster entsprechend aus.</para>
+ <screenshot id="bus-ap-billnew">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_billnew.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Neue Rechnung - Registrierungsfenster</phrase>
- </textobject>
- <caption>
- <para>Neue Rechnung - Registrierungsfenster</para>
- </caption>
+ <textobject>
+ <phrase>Registrierungsfenster: Neue Rechnung</phrase>
+ </textobject>
+ <caption>
+ <para>Registrierungsfenster: Neue Rechnung</para>
+ </caption>
</mediaobject>
</screenshot>
- <para>Wenn Sie nun auf <guibutton>OK</guibutton> klicken, öffnet sich <guilabel>Neue Lieferantenrechnung bearbeiten</guilabel>.</para>
+ <para>Wenn Sie nun auf <guibutton>OK</guibutton> klicken, öffnet sich
+ <guilabel>Neue Lieferantenrechnung bearbeiten</guilabel>.</para>
</sect2>
<sect2 id="bus-ap-billedit2">
<title>Neue Lieferantenrechnung bearbeiten</title>
- <para>Im Neue Lieferantenrechnung bearbeiten Fenster können Sie eine aufgeschlüsselte Liste der
- Waren und Leistungen, die Sie erworben haben, in einer Weise eingeben, ähnlich wie die Kontenregistrierung
- arbeitet. Für Gutschriften geben Sie eine aufgeschlüsselte Liste der
- Waren und Leistungen ein, die der Lieferant stattdessen erstattet.</para>
- <screenshot id="bus-ap-billedit">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_billedit.png"
- srccredit="Patrick Schweiger" format="PNG"/>
+ <para>Im Fenster Neue Lieferantenrechnung bearbeiten können Sie eine
+ aufgeschlüsselte Liste der Waren und Leistungen, die Sie erworben haben,
+ in ähnlicher Weise wie die Kontenregistrierung eingeben. Für Gutschriften
+ geben Sie stattdessen eine aufgeschlüsselte Liste der Waren und Leistungen
+ ein, die der Lieferant erstattet.</para>
+ <screenshot id="bus-ap-billedit">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_billedit.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Neue Lieferantenrechnung bearbeiten</phrase>
- </textobject>
- <caption>
- <para>Neue Lieferantenrechnung bearbeiten</para>
- </caption>
+ <textobject>
+ <phrase>Neue Lieferantenrechnung bearbeiten</phrase>
+ </textobject>
+ <caption>
+ <para>Neue Lieferantenrechnung bearbeiten</para>
+ </caption>
</mediaobject>
</screenshot>
- <para>Wenn Sie die Eingabe aller Elemente beendet haben, müssen Sie<guilabel>Diese Rechnung in Ihre Konten buchen</guilabel>. </para>
+ <para>Wenn Sie die Eingabe aller Elemente beendet haben, müssen Sie <guilabel>
+ diese Rechnung in Ihre Konten buchen</guilabel>. </para>
</sect2>
<sect2 id="bus-ap-billpost2">
<title>Diese Rechnung in Ihre Konten buchen</title>
- <para>Wenn Sie die Eingabe einer Rechnung beendet haben, müssen Sie <guilabel>Diese Rechnung in Ihre Konten buchen</guilabel>. Sie müssen nicht gleich die Rechnung in die Konten buchen,
- Sie können das Fenster schließen und später dahin zurückkehren. In diesem Fall müssen Sie dann noch die Rechnung buchen. Erst das Buchen der Rechnung stellt ihre Geschäftsvorfälle in ein Verbindlichkeitskonto.
- Das Buchungsfenster erscheint und fordert von Ihnen, Informationen einzugeben:</para>
-
- <screenshot id="bus-ap-billpost">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_billpost.png"
- srccredit="Patrick Schweiger" format="PNG"/>
+ <para>Wenn Sie die Eingabe einer Rechnung beendet haben, müssen Sie
+ <guilabel>diese Rechnung in Ihre Konten buchen</guilabel>. Sie müssen
+ nicht sofort die Rechnung in die Konten buchen; Sie können das Fenster
+ schließen und später dahin zurückkehren. In diesem Fall müssen Sie dann
+ noch die Rechnung buchen. Erst das Buchen der Rechnung stellt ihre
+ Geschäftsvorfälle in ein Verbindlichkeitskonto ein.
+ Das Buchungsfenster erscheint und fordert von Ihnen, Informationen einzugeben:</para>
+
+ <screenshot id="bus-ap-billpost">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_billpost.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Buchungsfenster</phrase>
- </textobject>
- <caption>
- <para>Buchungsfenster
- </para>
- </caption>
+ <textobject>
+ <phrase>Buchungsfenster</phrase>
+ </textobject>
+ <caption>
+ <para>Buchungsfenster
+ </para>
+ </caption>
</mediaobject>
</screenshot>
</sect2>
<sect2 id="bus-ap-billfind2">
<title>Suchen</title>
- <para>Um eine vorhandene Rechnung zu suchen, nutzen Sie den Menüeintrag<menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Leferantenrechnung suchen...</guimenuitem></menuchoice>. Von den Suchergebnissen können Sie eine Rechnung zur Bearbeitung oder zur Ansicht auswählen.</para>
- <note>
- <para>Bevor Sie eine gebuchte Rechnung bearbeiten können, müssen Sie die <guilabel>Rechnungsbuchung rückgängig</guilabel> machen.</para>
- </note>
-
- <note>
- <para>Es gibt andere Wege, auf eine vorhandene Rechnung zuzugreifen. Diese sind ähnlich wie der Zugriff auf Ausgangsrechnungen für Ihre Kunden. Siehe auch <xref linkend="bus-ar-invoicefind2" /> für mehr Informationen.</para>
- </note>
+ <para>Um eine vorhandene Rechnung zu suchen, nutzen Sie den Menüeintrag
+ <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
+ <guimenuitem>Lieferantenrechnung suchen…</guimenuitem></menuchoice>.
+ Von den Suchergebnissen können Sie eine Rechnung zur Bearbeitung oder
+ zur Ansicht auswählen.</para>
+ <note>
+ <para>Bevor Sie eine gebuchte Rechnung bearbeiten können, müssen Sie
+ die <guilabel>Rechnungsbuchung rückgängig</guilabel> machen.</para>
+ </note>
+
+ <note>
+ <para>Es gibt andere Wege, auf eine vorhandene Rechnung zuzugreifen.
+ Diese sind ähnlich wie der Zugriff auf Ausgangsrechnungen für Ihre
+ Kunden. Siehe auch <xref linkend="bus-ar-invoicefind2" /> für mehr Informationen.</para>
+ </note>
</sect2>
</sect1>
<sect1 id="bus-ap-jobs1">
<title>Lieferantenaufträge</title>
- <para>Lieferantenaufträge werden benutzt, um mehrere Rechnungen und Gutschriften von einem einzelnen Lieferanten zu gruppieren. Die Nutzung dieser Funktion ist freigestellt. Die Funktion ist nützlich, wenn Sie mehrere <guilabel>Aufträge</guilabel> für denselben Lieferanten haben und alle Rechnungen und Gutschriften für einen einzelnen Auftrag anschauen wollen.</para>
- <para>Um Aufträge zu nutzen, müssen Sie diesen unter <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neuer Auftrag</guimenuitem></menuchoice> erstellen. Sie werden nun das <guilabel>Neuer Auftrag</guilabel> Fenster sehen.</para>
-
- <screenshot id="bus-ap-jobnew">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_jobnew.png"
- srccredit="Jon Lapham" format="PNG"/>
+ <para>Lieferantenaufträge werden benutzt, um mehrere Rechnungen und
+ Gutschriften von einem einzelnen Lieferanten zusammenzufassen. Die Nutzung
+ dieser Funktion ist freigestellt. Die Funktion ist nützlich, wenn Sie
+ mehrere <guilabel>Aufträge</guilabel> für denselben Lieferanten haben
+ und alle Rechnungen und Gutschriften für einen einzelnen Auftrag anschauen
+ wollen.</para>
+ <para>Um Aufträge zu nutzen, müssen Sie diese unter <menuchoice><guimenu>
+ Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neuer Auftrag
+ </guimenuitem></menuchoice> erstellen. Sie werden nun das Fenster
+ <guilabel>Neuer Auftrag</guilabel> sehen.</para>
+
+ <screenshot id="bus-ap-jobnew">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_jobnew.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Neuer Lieferantenauftrag</phrase>
- </textobject>
- <caption>
- <para>Neuer Lieferantenauftrag</para>
- </caption>
+ <textobject>
+ <phrase>Neuer Lieferantenauftrag</phrase>
+ </textobject>
+ <caption>
+ <para>Neuer Lieferantenauftrag</para>
+ </caption>
</mediaobject>
</screenshot>
- <para>Um einen vorhandenen Lieferantenauftrag zu bearbeiten, nutzen Sie den <menuchoice>
- <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
- <guimenuitem>Aufträge suchen</guimenuitem></menuchoice> Menüeintrag. Wählen Sie den gewünschten Auftrag in den
- Suchergebnissem und klicken Sie <guilabel>Auftrag anzeigen/bearbeiten</guilabel>
- Button.</para>
+ <para>Um einen vorhandenen Lieferantenauftrag zu bearbeiten, nutzen
+ Sie den Menüeintrag <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>
+ Lieferant</guisubmenu><guimenuitem>Aufträge suchen</guimenuitem></menuchoice>.
+ Wählen Sie den gewünschten Auftrag in den Suchergebnissem und klicken
+ Sie die Schaltfläche <guilabel>Auftrag anzeigen/bearbeiten</guilabel>.</para>
- <para>Um eine Auswahl unter den Rechnungen, die mit einem gegebenen Auftrag verbunden sind, zu treffen, nutzen Sie den <menuchoice>
+ <para>Um eine Auswahl unter den Rechnungen, die mit einem gegebenen
+ Auftrag verbunden sind, zu treffen, nutzen Sie den Menüeintrag <menuchoice>
<guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
- <guimenuitem>Auftrag suchen</guimenuitem></menuchoice> Menüeintrag. Wählen Sie den gewünschten Auftrag in den
- Suchergebnissen und klicken Sie den <guilabel>Rechnungen anzeigen</guilabel>Button. Ein Fenster erscheint,
- das die Rechnungen und Gutschriften, die mit diesem Auftrag verbunden sind, auflistet. Wählen Sie eine
- Rechnung oder Gutschrift und klicken Sie den <guilabel>Rechnung anzeigen</guilabel>Button, um den
+ <guimenuitem>Auftrag suchen</guimenuitem></menuchoice>. Wählen Sie den
+ gewünschten Auftrag in den Suchergebnissen und klicken Sie die Schaltfläche
+ <guilabel>Rechnungen anzeigen</guilabel>. Ein Fenster erscheint, das
+ die Rechnungen und Gutschriften, die mit diesem Auftrag verbunden sind,
+ auflistet. Wählen Sie eine Rechnung oder Gutschrift und klicken Sie
+ die Schaltfläche <guilabel>Rechnung anzeigen</guilabel>, um den
Rechnungseditor im Hauptanwendungsfenster zu öffnen.</para>
</sect1>
<sect1 id="bus-ap-payment1">
<title>Zahlung verarbeiten</title>
- <para>Irgendwann müssen Sie Ihre Rechnungen auch bezahlen. Dazu nutzen Sie die Zahlungsanwendung unter <menuchoice><guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Zahlung verarbeiten...</guimenuitem></menuchoice>.</para>
-
- <para>Darunter ist das Fenster <application>&app;</application> Zahlungen veranbeiten.</para>
- <screenshot id="bus-ap-payment">
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/bus_ap_payment.png"
- srccredit="Patrick Schweiger" format="PNG"/>
+ <para>Irgendwann müssen Sie Ihre Rechnungen auch bezahlen. Dazu nutzen
+ Sie die Zahlungsanwendung unter <menuchoice><guimenu>Geschäft</guimenu>
+ <guisubmenu>Lieferant</guisubmenu><guimenuitem>Zahlung verarbeiten…</guimenuitem>
+ </menuchoice>.</para>
+
+ <para>Darunter ist das Fenster <application>&app;</application> Zahlungen verarbeiten.</para>
+ <screenshot id="bus-ap-payment">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/bus_ap_payment.png"
+ srccredit="Mechtilde Stehmann" format="PNG"/>
</imageobject>
- <textobject>
- <phrase>Zahlungen verarbeiten</phrase>
- </textobject>
- <caption>
- <para>Zahlungen verarbeiten
- </para>
- </caption>
+ <textobject>
+ <phrase>Zahlungen verarbeiten</phrase>
+ </textobject>
+ <caption>
+ <para>Zahlungen verarbeiten
+ </para>
+ </caption>
</mediaobject>
</screenshot>
diff --git a/guide/de/ch_bus_ar.xml b/guide/de/ch_bus_ar.xml
index 680fb26..c3c48f9 100644
--- a/guide/de/ch_bus_ar.xml
+++ b/guide/de/ch_bus_ar.xml
@@ -66,7 +66,25 @@ beschrieben.
</listitem>
<listitem>
- <para><guilabel>Zahlung verarbeiten…</guimenuitem></menuchoice>. Geben Sie die Kundeninformationen ein, wie
+ <para><guilabel>Zahlung verarbeiten…</guilabel> wird benutzt,
+ um Zahlungen zu verzeichnen, die Sie vom Kunden erhalten haben.</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
+ <sect1 id="bus-ar-customers1">
+ <title>Kunden</title>
+
+ <para>Kunden sind Leute oder Unternehmen, denen Sie Waren oder Dienstleistungen verkaufen.
+ Sie müssen in Ihrer Debitorenbuchhaltung registriert werden..</para>
+
+ <sect2 id="bus-ar-custnew2">
+ <title>Neu</title>
+
+ <para>Um einen neuen Kunden einzutragen, öffnen Sie das Menü <menuchoice>
+ <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
+ <guimenuitem>Neuer Kunde...</guimenuitem></menuchoice>.
+ Geben Sie die Kundeninformationen ein, wie
Name des Unternehmens, Adresse, Telefon-, Faxnummer, etc.</para>
<screenshot id="bus-ar-custnew">
@@ -222,7 +240,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_invoicepost.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
@@ -402,7 +420,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_payment.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
diff --git a/guide/de/figures/bus_ap_billedit.png b/guide/de/figures/bus_ap_billedit.png
index e773cf7..1f4a6d6 100644
Binary files a/guide/de/figures/bus_ap_billedit.png and b/guide/de/figures/bus_ap_billedit.png differ
diff --git a/guide/de/figures/bus_ap_billnew.png b/guide/de/figures/bus_ap_billnew.png
index b2910d9..d95a71b 100644
Binary files a/guide/de/figures/bus_ap_billnew.png and b/guide/de/figures/bus_ap_billnew.png differ
diff --git a/guide/de/figures/bus_ap_billpost.png b/guide/de/figures/bus_ap_billpost.png
index c2a4ffc..0c99d92 100644
Binary files a/guide/de/figures/bus_ap_billpost.png and b/guide/de/figures/bus_ap_billpost.png differ
diff --git a/guide/de/figures/bus_ap_jobnew.png b/guide/de/figures/bus_ap_jobnew.png
index 957ea0d..8f5f758 100644
Binary files a/guide/de/figures/bus_ap_jobnew.png and b/guide/de/figures/bus_ap_jobnew.png differ
diff --git a/guide/de/figures/bus_ap_payment.png b/guide/de/figures/bus_ap_payment.png
index abf3999..3256dbb 100644
Binary files a/guide/de/figures/bus_ap_payment.png and b/guide/de/figures/bus_ap_payment.png differ
diff --git a/guide/de/figures/bus_ap_vendorfind.png b/guide/de/figures/bus_ap_vendorfind.png
index cb5dee3..a256715 100644
Binary files a/guide/de/figures/bus_ap_vendorfind.png and b/guide/de/figures/bus_ap_vendorfind.png differ
diff --git a/guide/de/figures/bus_ap_vendornew.png b/guide/de/figures/bus_ap_vendornew.png
index d3fd679..771b6df 100644
Binary files a/guide/de/figures/bus_ap_vendornew.png and b/guide/de/figures/bus_ap_vendornew.png differ
commit d1c7da46708ba0aefd4125804f05c280a8a4de43
Author: Mechtilde <ooo at mechtilde.de>
Date: Fri Jan 1 22:32:42 2016 +0100
corrections and German screenshots for chapter bus_ar
diff --git a/guide/de/ch_bus_ar.xml b/guide/de/ch_bus_ar.xml
index 48a1514..680fb26 100644
--- a/guide/de/ch_bus_ar.xml
+++ b/guide/de/ch_bus_ar.xml
@@ -66,31 +66,14 @@ beschrieben.
</listitem>
<listitem>
- <para><guilabel>Zahlung verarbeiten...</guilabel> wird benutzt, um Zahlungen zu verzeichnen,
- die Sie vom Kunden erhalten haben.</para>
- </listitem>
- </itemizedlist>
- </sect1>
-
- <sect1 id="bus-ar-customers1">
- <title>Kunden</title>
-
- <para>Kunden sind Leute oder Unternehmen, denen Sie Waren oder Dienstleistungen verkaufen.
- Sie müssen in Ihrer Debitorenbuchhaltung registriert werden..</para>
-
- <sect2 id="bus-ar-custnew2">
- <title>Neu</title>
-
- <para>Um einen neuen Kunden einzutragen, öffnen Sie das Menü <menuchoice>
- <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
- <guimenuitem>Neuer Kunde...</guimenuitem></menuchoice>. Geben Sie die Kundeninformationen ein, wie
+ <para><guilabel>Zahlung verarbeiten…</guimenuitem></menuchoice>. Geben Sie die Kundeninformationen ein, wie
Name des Unternehmens, Adresse, Telefon-, Faxnummer, etc.</para>
<screenshot id="bus-ar-custnew">
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_custnew.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
@@ -108,7 +91,7 @@ beschrieben.
<para>Um einen existierenden Kunden zu suchen, nutzen Sie das <menuchoice>
<guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
- <guimenuitem>Kunden suchen...</guimenuitem></menuchoice> Fenster. Sie wählen einen Kunden
+ <guimenuitem>Kunde suchen…</guimenuitem></menuchoice> Fenster. Sie wählen einen Kunden
aus den Ergebnissen der Suche aus zum <guilabel>anzeigen/bearbeiten</guilabel>. Dieses
Fenster wird auch genutzt, um Kunden zur Erstellung von Ausgangsrechnungen und zur Verarbeitung
von Zahlungen nachzuschlagen.</para>
@@ -117,7 +100,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_custfind.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
@@ -177,14 +160,14 @@ beschrieben.
<para>Um eine Ausgangsrechnung an einen Kunden zu senden, müssen Sie zunächst ein neues Dokument
erstellen. Um eine Rechnung zu erstellen, nutzen Sie <menuchoice><guimenu>Geschäft</guimenu>
- <guisubmenu>Kunde</guisubmenu><guimenuitem>Neue Rechnung</guimenuitem></menuchoice>. Das Fenster Neue Rechnung
+ <guisubmenu>Kunde</guisubmenu><guimenuitem>Neue Rechnung…</guimenuitem></menuchoice>. Das Fenster Neue Rechnung
muss entsprechend ausgefüllt werden.</para>
<screenshot id="bus-ar-invoicenew">
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_invoicenew.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
@@ -211,7 +194,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_invoiceedit.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde stehmann" />
</imageobject>
<textobject>
@@ -256,7 +239,7 @@ beschrieben.
<title>Suchen</title>
<para>Um eine existierende Rechnung zu finden, nutzen Sie den Menüentrag <menuchoice><guimenu>Geschäft</guimenu>
- <guisubmenu>Kunde</guisubmenu><guimenuitem>REchnung suchen...</guimenuitem></menuchoice>.
+ <guisubmenu>Kunde</guisubmenu><guimenuitem>Rechnung suchen…</guimenuitem></menuchoice>.
In den Suchergebnissen können Sie eine Rechnung auswählen, um diese
zu betrachten oder zu bearbeiten.</para>
@@ -297,7 +280,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_invoiceprint.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann " />
</imageobject>
<textobject>
@@ -375,7 +358,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_jobnew.png" format="PNG"
- srccredit="Patrick Schweiger" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
@@ -393,11 +376,11 @@ beschrieben.
<para>Um eine vorhandene Kundenaufgabe zu bearbeiten, nutzen Sie den Menüeintrag <menuchoice>
<guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu>
- <guimenuitem>Suche Aufgabe...</guimenuitem></menuchoice>. Wählen Sie die erwünschte Aufgabe in den
+ <guimenuitem>Suche Aufgabe…</guimenuitem></menuchoice>. Wählen Sie die erwünschte Aufgabe in den
Suchergebnissen und klicken Sie die <guilabel>Aufgabe ansehen/bearbeiten</guilabel>-Schaltfläche.</para>
<para>Zum Auswählen der Rechnungen und Gutschriften, die mit einer Aufgabe verbunden sind, nutzen Sie den Menüeintrag <menuchoice>
- <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu><guimenuitem>Aufgabe suchen...
+ <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu><guimenuitem>Aufgabe suchen…
</guimenuitem></menuchoice>. Wählen Sie die gewünschte Aufgabe in den
Suchergebnissen und klicken Sie die <guilabel>Rechnungsansicht</guilabel>-Schlatfläche. Ein Fenster
mit einer Liste von Rechnungen und Gutschriften, die mit dieser Aufgabe verbunden sind, erscheint. Wählen Sie
@@ -413,7 +396,7 @@ beschrieben.
Rechnunge erhalten. Um diese Zahlungen aufzuzeichnen, Nutzen Sie die Anwendung Zahlung verarbeiten,
zu finden unter <menuchoice><guimenu>Geschäft</guimenu>
<guisubmenu>Kunden</guisubmenu><guimenuitem>Zahlung
- verarbeiten...</guimenuitem></menuchoice>.</para>
+ verarbeiten…</guimenuitem></menuchoice>.</para>
<screenshot id="bus-ar-payment">
<mediaobject>
@@ -440,12 +423,12 @@ beschrieben.
Firma drucken. Es gibt einige Dinge, wie Sie das Erscheinungsbild der Rechnung
ändern können.</para>
- <para>Nutzen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>Eigenschaften</guimenuitem></menuchoice> um
- Ihre Firmenangaben im Register <guilabel>Geschäft</guilabel> des Fenster <guilabel>Buch-Optionen</guilabel>.
+ <para>Nutzen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>Eigenschaften</guimenuitem></menuchoice>, um
+ Ihre Firmenangaben im Register <guilabel>Geschäft</guilabel> des Fenster <guilabel>Buch-Optionen</guilabel> einzugeben.
Einige der eingegebenen Informatioonen werden auf der rechten Seite der Rechnungen gedruckt.</para>
<para>Um einen individualisierten Hintergrund, ein Kopfbanner oder Logo zu den Rechnungen
- hinzuzufügen, ändern Sie die Rechnungsstilvorlagen. Um dies zu tun, Gehen Sie zu <menuchoice><guimenu>Bearbeiten</guimenu>
+ hinzuzufügen, ändern Sie die Rechnungsstilvorlagen. Um dies zu tun, gehen Sie zu <menuchoice><guimenu>Bearbeiten</guimenu>
<guimenuitem>Stilvorlagen</guimenuitem></menuchoice> und wählen die <guibutton>Neu</guibutton>
Schaltfläche im Fenster <guilabel>HTML-Stilvorlage auswählen</guilabel>, welches erscheint.
Sie werden ein Fenster wie dieses sehen:</para>
@@ -454,7 +437,7 @@ beschrieben.
<mediaobject>
<imageobject>
<imagedata fileref="figures/bus_ar_invoicechange1.png" format="PNG"
- srccredit="Cristian Marchi" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
@@ -487,12 +470,12 @@ beschrieben.
<mediaobject>
<imageobject role="html">
<imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
- srccredit="Cristian Marchi" width="510"/>
+ srccredit="Mechtilde Stehmann" width="510"/>
</imageobject>
<imageobject role="fo">
<imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
- srccredit="Cristian Marchi"/>
+ srccredit="Mechtilde Stehmann"/>
</imageobject>
<textobject>
diff --git a/guide/de/ch_bus_setup.xml b/guide/de/ch_bus_setup.xml
index 27b134b..070a83c 100644
--- a/guide/de/ch_bus_setup.xml
+++ b/guide/de/ch_bus_setup.xml
@@ -368,11 +368,11 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
<mediaobject>
<imageobject role="html">
<imagedata fileref="figures/bus_terms_new.png" format="PNG"
- srccredit="Chris Good" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="figures/bus_terms_new.png" format="PNG"
- srccredit="Chris Good" />
+ srccredit="Mechtilde Stehmann" />
</imageobject>
<textobject>
diff --git a/guide/de/figures/bus_ar_custfind.png b/guide/de/figures/bus_ar_custfind.png
index 66a3af9..9d02414 100644
Binary files a/guide/de/figures/bus_ar_custfind.png and b/guide/de/figures/bus_ar_custfind.png differ
diff --git a/guide/de/figures/bus_ar_custnew.png b/guide/de/figures/bus_ar_custnew.png
index 48b582a..ac22bc7 100644
Binary files a/guide/de/figures/bus_ar_custnew.png and b/guide/de/figures/bus_ar_custnew.png differ
diff --git a/guide/de/figures/bus_ar_invoicechange1.png b/guide/de/figures/bus_ar_invoicechange1.png
index 74e676c..7214d60 100644
Binary files a/guide/de/figures/bus_ar_invoicechange1.png and b/guide/de/figures/bus_ar_invoicechange1.png differ
diff --git a/guide/de/figures/bus_ar_invoicechange2.png b/guide/de/figures/bus_ar_invoicechange2.png
index 258d10b..4fbced6 100644
Binary files a/guide/de/figures/bus_ar_invoicechange2.png and b/guide/de/figures/bus_ar_invoicechange2.png differ
diff --git a/guide/de/figures/bus_ar_invoiceedit.png b/guide/de/figures/bus_ar_invoiceedit.png
index 8a826c5..7a58b84 100644
Binary files a/guide/de/figures/bus_ar_invoiceedit.png and b/guide/de/figures/bus_ar_invoiceedit.png differ
diff --git a/guide/de/figures/bus_ar_invoicenew.png b/guide/de/figures/bus_ar_invoicenew.png
index 11a6ac2..80a5c5d 100644
Binary files a/guide/de/figures/bus_ar_invoicenew.png and b/guide/de/figures/bus_ar_invoicenew.png differ
diff --git a/guide/de/figures/bus_ar_invoicepost.png b/guide/de/figures/bus_ar_invoicepost.png
index 061b7ff..59da587 100644
Binary files a/guide/de/figures/bus_ar_invoicepost.png and b/guide/de/figures/bus_ar_invoicepost.png differ
diff --git a/guide/de/figures/bus_ar_invoiceprint.png b/guide/de/figures/bus_ar_invoiceprint.png
index 073e47e..c7ca6f6 100644
Binary files a/guide/de/figures/bus_ar_invoiceprint.png and b/guide/de/figures/bus_ar_invoiceprint.png differ
diff --git a/guide/de/figures/bus_ar_jobnew.png b/guide/de/figures/bus_ar_jobnew.png
index b99c7f1..7b59f02 100644
Binary files a/guide/de/figures/bus_ar_jobnew.png and b/guide/de/figures/bus_ar_jobnew.png differ
diff --git a/guide/de/figures/bus_ar_payment.png b/guide/de/figures/bus_ar_payment.png
index 414cbd0..8a4b92a 100644
Binary files a/guide/de/figures/bus_ar_payment.png and b/guide/de/figures/bus_ar_payment.png differ
commit 01eb36b7287e1119bbde268a4c8632570c46e994
Merge: 719cd6e a45b18d
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 1 12:36:19 2016 -0800
Merge branch 'maint'
commit 719cd6eeaed7d66b85b05e6738968d138949c1ff
Merge: 959ec94 7a724a4
Author: fell <f.ellenberger at online.de>
Date: Thu Dec 31 02:17:51 2015 +0100
Merge branch 'maint'
commit 959ec94fb1c8bf43b986f556fa46745b5230bb2f
Merge: 0ef8a4a 5db558b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 29 10:56:37 2015 -0800
Merge branch 'maint'
commit 0ef8a4afe2f484eed9bd1f13ee9139dd94ae1959
Merge: 5fb2de8 c1904dd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 21 08:49:22 2015 -0800
Merge branch 'maint'
diff --cc configure.ac
index 55b1c44,7ef9429..542b869
--- a/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,8 @@@
# copyright (c) 2000-2002 Chris Lyttle
- # copyright (c) 2003-2013 GnuCash Development Team
+ # copyright (c) 2003-2015 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.10)
+AC_INIT(gnucash-docs, 2.6.99)
dnl ==========================================================================
dnl
commit 5fb2de8e9382686e8e3e36fcfeeb4897651db73d
Author: Chris Good <chris.good at ozemail.com.au>
Date: Sat Nov 14 18:15:42 2015 +0100
Bug 608098 - Document Transaction Rpt, including how to handle splits
Master only amendments
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 7a30f5c..e01aaa3 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -165,8 +165,27 @@
<listitem><para><guilabel>Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Use Full Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Account Code</guilabel></para></listitem>
+ <listitem><para><guilabel>Detail Level</guilabel>— One of</para>
+ <informaltable>
+ <tgroup cols="2">
+ <tbody>
+ <row><entry>Single</entry><entry>Display 1 line</entry></row>
+ <row><entry>Multi-Line</entry><entry>Display N lines</entry></row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ <note>
+ <para>Before stable version 2.8.0
+ <emphasis>Detail Level</emphasis> was called <emphasis>Style</emphasis> on the General tab.</para>
+ </note>
+
+ <para>If <emphasis>Detail Level</emphasis> is <emphasis>Multi-Line</emphasis>,
+ check boxes <emphasis>Other Account Name</emphasis> and <emphasis>Use Full Other Account Name</emphasis>
+ are automatically deselected and disabled, and the <emphasis>Transfer</emphasis> column is not reported.
+ </para>
+ </listitem>
- <listitem><para><guilabel>Other Account Name</guilabel> — For multi-split transactions, this parameter should be unticked. See below for more details.</para>
+ <listitem><para><guilabel>Other Account Name</guilabel> — For multi-split transactions, this parameter is not used and hence disabled</para>
</listitem>
<listitem><para><guilabel>Use Full Other Account Name</guilabel></para></listitem>
<listitem><para><guilabel>Other Account Code</guilabel></para></listitem>
@@ -247,20 +266,6 @@
</informaltable>
</listitem>
- <listitem><para><guilabel>Style</guilabel> — One of</para>
- <informaltable>
- <tgroup cols="2">
- <tbody>
- <row><entry>Single</entry><entry>Display 1 line</entry></row>
- <row><entry>Multi-Line</entry><entry>Display N lines</entry></row>
- </tbody>
- </tgroup>
- </informaltable>
- <note><para>In stable version 2.8.0, the <emphasis>Style</emphasis> option will be renamed to <emphasis>Detail Level</emphasis>
- and moved to the Display tab.</para>
- </note>
- </listitem>
-
<listitem><para><guilabel>Common Currency</guilabel> — Convert all transactions into a common currency</para></listitem>
<listitem><para><guilabel>Report's currency</guilabel> — Select the currency to display values</para></listitem>
<listitem><para><guilabel>Table for Exporting</guilabel> — Formats the table for cut & paste exporting with extra cells</para></listitem>
@@ -336,9 +341,9 @@
<sect3 id="report-txrpt-splits">
<title>Displaying Split Account Details</title>
- <para>This is controled by the <emphasis>Style</emphasis> option on the General tab.</para>
+ <para>This is controled by the <emphasis>Detail Level</emphasis> option on the Display tab.</para>
<note>
- <para>In stable version 2.8.0 this option will be renamed to <emphasis>Detail Level</emphasis> on the Display tab.</para>
+ <para>In stable versions before 2.8.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
</note>
<para>In <emphasis>Single</emphasis> line mode, there's only one line per transaction. So you can have
the account name on one side of the equation and
diff --git a/help/C/figures/Help_TxRptOpt_Screen.png b/help/C/figures/Help_TxRptOpt_Screen.png
old mode 100644
new mode 100755
index 471a18a..9a503db
Binary files a/help/C/figures/Help_TxRptOpt_Screen.png and b/help/C/figures/Help_TxRptOpt_Screen.png differ
commit b85a1273ab13f3bbd8595b19f5749b4b877103c7
Merge: 17f13dc 24e274f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Nov 14 18:30:11 2015 +0100
Merge branch 'maint'
commit 17f13dccef9848e6a506507686fcc440ace8855b
Merge: 3fe7235 a5ea958
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Nov 6 10:48:44 2015 -0800
Merge branch 'maint'
commit 3fe72357fe5355688d1fd35f0c7afaccae35e5fb
Merge: 3e3c6bd 8408cba
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 5 11:40:52 2015 -0800
Merge branch 'maint'
commit 3e3c6bd975fe4a6e241310eb47eb0756cd0ee3b4
Merge: 3849d0a e72a420
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Nov 2 12:08:17 2015 -0800
Merge branch 'maint'
commit 3849d0a3da0b7b1debffa872f30661402813d1c5
Merge: 10de2a2 ce0bb23
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 31 15:00:30 2015 -0700
Merge branch 'maint'
commit 10de2a232bd6c6d6ca46da6eae5a132d7b815032
Merge: 91e14b6 25a6c69
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 29 10:27:06 2015 -0700
Merge branch 'maint'
commit 91e14b601f966180b6fb49a8c917881829e97c2b
Merge: 0db4bd9 46feff0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 24 14:12:06 2015 -0700
Merge branch 'maint'
commit 0db4bd9cd2118a469c810448dfabf16d116cc959
Merge: 58af623 336e995
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 8 15:06:43 2015 -0700
Merge branch 'maint'
commit 58af623786c319b7124fd7a250130780aebb6f11
Merge: ef88bb0 ae909c8
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 5 14:24:01 2015 -0700
Merge branch 'maint'
commit ef88bb0a7d9c686001a1ce884bc4dffbc67b1298
Merge: cae3366 f8811a8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 5 19:54:30 2015 +0200
Merge branch 'maint'
commit cae33665e4d6e73d99cc77948a15a406f47309c0
Author: Alex Aycinena <alex.aycinena at gmail.com>
Date: Fri Oct 2 14:03:57 2015 -0700
Remove e-mail from AUTHORS file
diff --git a/AUTHORS b/AUTHORS
index 71946f3..7d7f8b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,7 +2,7 @@ Contributors:
Current -
Yawar Amin
-J. Alex Aycinena <alex.aycinena at gmail.com>
+J. Alex Aycinena
Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Mike Evans <mikee at saxicola.co.uk>
Chris Good <chris.good at ozemail.com.au>
commit 5df1ffae0117a420d8b8ae0f797c312141561216
Merge: ec46eeb 911ccce
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 28 12:51:12 2015 -0700
Merge branch 'maint'
commit ec46eebbf1efec01cbcfcea7e87f020b54f23b85
Merge: 4d67713 1cbaae6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 20 13:56:06 2015 -0700
Merge branch 'maint'
commit 4d6771367d260e17f1a9bdba17e98c147c080bd3
Merge: fef3a81 58afa4e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Sep 19 14:34:17 2015 +0200
Merge branch 'maint'
commit fef3a81d1e498c3e1445fd71899f8af6d9a6f959
Merge: 85eb4bd fbb5693
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 15 16:04:57 2015 -0700
Merge branch 'maint'
diff --cc help/C/Help_ch_Transactions.xml
index b5003f1,77c30fe..0edcf6f
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@@ -320,488 -269,597 +269,596 @@@ Translators
</listitem>
<listitem>
- <para>The display will expand, the titles of the amount columns will be renamed and the <guilabel>Transfer</guilabel>
- column name will be blank. The first line contains the description and the amount of the transaction.
- The second line contains the currently opened account name in the <guilabel>Account</guilabel> field and the amount of
- the transaction. The third line contains the transfer account name in the <guilabel>Account</guilabel> field. If the
- amount is not balanced, <application>&app;</application> will indicate this by placing gray check-boxes in the amount columns
- with the unbalanced amount in a blank last row.</para>
+ <para>To move to the blank transaction at the bottom of the register, press the
+ <guibutton>Blank</guibutton> <emphasis>Toolbar</emphasis> icon or go to
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Blank Transaction</guimenuitem></menuchoice>.
+ </para>
</listitem>
+ </orderedlist>
+ </sect2>
+ </sect1>
- <listitem>
- <para>When one of the short lines is selected, the column titles will change. The very first and last
- (<guilabel>Date</guilabel> and <guilabel>Balance</guilabel>) columns will have blank titles. <guilabel>Num</guilabel>
- will change to <guilabel>Action</guilabel>, <guilabel>Description</guilabel> to <guilabel>Memo</guilabel>,
- the now blank <guilabel>Transfer</guilabel> column will change to <guilabel>Account</guilabel>. The last two amount columns
- will show the name described in step seven.</para>
- </listitem>
- <listitem>
- <para>The <guilabel>Action</guilabel> and <guilabel>Memo</guilabel> columns are optional to fill out at this stage.
- <guilabel>Action</guilabel> is used to describe what kind of account transfer is involved. <guilabel>Memo</guilabel>
- is an additional description of the transfer.</para>
- </listitem>
+ <sect1 id="trans-multi-enter">
+ <title>Multiple Split Transactions</title>
- <listitem>
- <para>Move to the missing amount field on the third line and fill in the amount. Pressing the
- <keycap function="enter">Enter</keycap> key, selecting the <guibutton>Enter</guibutton> icon or going to
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Enter</guimenuitem></menuchoice>
- will now move the cursor to the next line.</para>
- </listitem>
+ <para>The register window will look slightly different depending on the style options you have chosen.
+ The following describes entering transactions with multiple splits in the basic ledger style. <application>&app;</application> describes
+ as a <quote>Split</quote> when money is transferred to or from more than two accounts in a transaction.
+ The cursor is placed in the date field by default when the register window is opened.</para>
- <listitem>
- <para>The <guilabel>Account</guilabel> column contains the list of transfer accounts. This column is the one that is used
- to add splits. The method described in step five can be used to select another account on a blank line.
- Add as many additional splits as needed.</para>
- </listitem>
+ <para>The multiple account lines will not be displayed in the Basic Ledger unless the <guibutton>Split</guibutton>
+ icon or the <menuchoice><guimenu>Action</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice> option have been selected.
+ </para>
- <listitem>
- <para>When the transaction is balanced the gray check-boxes will disappear and the last blank line will
- not have an amount.</para>
- </listitem>
+ <orderedlist>
+ <listitem>
+ <para>Selecting the triangle icon on the right of the date field drops down a date selection dialog.
+ Use the arrows to select the correct month and year for the transaction then select the date. Selecting
+ the icon once more will close the date selection calendar. It is also possible to type in the
+ date or part of the date and let <application>&app;</application> fill the rest.</para>
+ </listitem>
+
+ <listitem>
+ <para>Press <keycap>Tab</keycap> to move to or select the <guilabel>Num</guilabel> field. Here you can enter a check or
+ transaction number. Pressing <keycap>+</keycap> (plus) will automatically advance the number by one from
+ the last transaction to have a number.</para>
+ </listitem>
+
+ <listitem>
+ <para>Press <keycap>Tab</keycap> to move to or select the <guilabel>Description</guilabel> field. This field is used to enter
+ either a payee or other description for the transaction. It will automatically attempt to fill the payee name
+ as you type.</para>
+ </listitem>
+
+ <listitem>
+ <para>At this stage one of two things will happen if tab is pressed. If <application>&app;</application> matches an existing
+ transaction the cursor will jump to one of the amount fields, automatically filling in the transfer
+ account. Selecting any field with the mouse instead of tabbing will not automatically fill the
+ transferring account field. If there is no matching (existing) transaction, <application>&app;</application> will move the
+ cursor to the <guilabel>Transfer</guilabel> field with only one line of the transaction supplied.</para>
+ </listitem>
+
+ <listitem>
+ <para>When typing in the <guilabel>Transfer</guilabel> field <application>&app;</application> will also attempt to automatically match the account.
+ It does this alphabetically, so typing <emphasis>Ex</emphasis> will match the <emphasis>Expenses</emphasis> section of the account list.
+ When the section is matched, it is possible to move to a child account by pressing <keycap>:</keycap> (colon).
+ If after typing <emphasis>Ex</emphasis> you press <keycap>:</keycap> then the cursor will move to the first child account in the
+ list. Typing combinations of letters and <keycap>:</keycap> will allow movement down the tree of accounts
+ quickly. The small icon on the right of the <guilabel>Transfer</guilabel> field can be used as an alternate way of selecting accounts.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>The next field is used for reconciliation. This is described in <xref linkend="acct-reconcile"></xref></para>
+ </listitem>
+
+ <listitem>
+ <para>Press <keycap>Tab</keycap> to move to the first of the amount fields. The names of the next two columns
+ are different according to what type of account is opened. For example, Bank accounts show
+ Deposit and Withdrawal here, Credit Card accounts show Payment and Charge, and Stock accounts
+ show Shares, Price, Buy and Sell.</para>
+ </listitem>
+
+ <listitem>
+ <para>Enter the total amount for the transaction in the correct field. Before pressing <keycap>Tab</keycap>
+ or <keycap function="enter">Enter</keycap> read next step.</para>
+ </listitem>
+
+ <listitem>
+ <para>To enter the additional splits, press the <guibutton>Split</guibutton> button on the <emphasis>Toolbar</emphasis> or select
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.
+ Transactions with more than one split show the text <emphasis>--Split Transaction--</emphasis> and the
+ <guibutton>Split</guibutton> button will need to be used
+ to show the details.</para>
+ </listitem>
+
+ <listitem>
+ <para>The display will expand, the titles of the amount columns will be renamed and the <guilabel>Transfer</guilabel>
+ column name will be blank. The first line contains the description and the amount of the transaction.
+ The second line contains the currently opened account name in the <guilabel>Account</guilabel> field and the amount of
+ the transaction. The third line contains the transfer account name in the <guilabel>Account</guilabel> field. If the
+ amount is not balanced, <application>&app;</application> will indicate this by placing gray check-boxes in the amount columns
+ with the unbalanced amount in a blank last row.</para>
+ </listitem>
+
+ <listitem>
+ <para>When one of the short lines is selected, the column titles will change. The very first and last
+ (<guilabel>Date</guilabel> and <guilabel>Balance</guilabel>) columns will have blank titles. <guilabel>Num</guilabel>
+ will change to <guilabel>Action</guilabel>, <guilabel>Description</guilabel> to <guilabel>Memo</guilabel>,
+ the now blank <guilabel>Transfer</guilabel> column will change to <guilabel>Account</guilabel>. The last two amount columns
+ will show the name described in step seven.</para>
+ </listitem>
+
+ <listitem>
+ <para>The <guilabel>Action</guilabel> and <guilabel>Memo</guilabel> columns are optional to fill out at this stage.
+ <guilabel>Action</guilabel> is used to describe what kind of account transfer is involved. <guilabel>Memo</guilabel>
+ is an additional description of the transfer.</para>
+ </listitem>
+
+ <listitem>
+ <para>Move to the missing amount field on the third line and fill in the amount. Pressing the
+ <keycap function="enter">Enter</keycap> key, selecting the <guibutton>Enter</guibutton> icon or going to
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Enter</guimenuitem></menuchoice>
+ will now move the cursor to the next line.</para>
+ </listitem>
+
+ <listitem>
+ <para>The <guilabel>Account</guilabel> column contains the list of transfer accounts. This column is the one that is used
+ to add splits. The method described in step five can be used to select another account on a blank line.
+ Add as many additional splits as needed.</para>
+ </listitem>
+
+ <listitem>
+ <para>When the transaction is balanced the gray check-boxes will disappear and the last blank line will
+ not have an amount.</para>
+ </listitem>
+
+ <listitem>
+ <para>Pressing <keycap function="enter">Enter</keycap> as described above will jump to the next
+ transaction. Selecting the next transaction will close the split or it can be manually closed by pressing
+ the <guibutton>Split</guibutton> icon or selecting
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.</para>
+ </listitem>
+ </orderedlist>
- <listitem>
- <para>Pressing <keycap function="enter">Enter</keycap> as described above will jump to the next
- transaction. Selecting the next transaction will close the split or it can be manually closed by pressing
- the <guibutton>Split</guibutton> icon or selecting
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.</para>
- </listitem>
- </orderedlist>
+ </sect1>
- </sect1>
+ <sect1 id="trans-currency-enter">
+ <title>Multiple Currency/Commodity Transactions</title>
+
+ <para>Any transaction that has splits whose accounts are
+ denominated in different commodities (currencies are a subset
+ of commodities) requires an exchange rate to convert between
+ the two. For more information please see Chapter 10 of the
+ <emphasis role="italic">Tutorial and Concepts Guide</emphasis>.</para>
+ <para>Registers for accounts of type STOCK or FUND display
+ four columns, <guilabel>Shares</guilabel>,
+ <guilabel>Price</guilabel>, <guilabel>Buy</guilabel>, and
+ <guilabel>Sell</guilabel> (the last two will be
+ <guilabel>Credit</guilabel> and <guilabel>Debit</guilabel>
+ respectively if you've enabled <guilabel>Use formal accounting
+ labels</guilabel> in the <guilabel>Accounts</guilabel> tab of
+ <guilabel>Preferences</guilabel>). Enter any two and
+ <application>&app;</application> will calculate the other for
+ you; if you enter 3 and the result doesn't balance
+ <application>&app;</application> will ask which one to change
+ to make the split balance.</para>
+ <para>Registers of other types have only
+ <guilabel>Credit</guilabel> and <guilabel>Debit</guilabel> (the
+ names will be different depending on the account type if you
+ haven't enabled <guilabel>Use formal accounting labels</guilabel>)
+ and so use the <guilabel>Transfer Dialog</guilabel> with most of
+ the fields disabled to collect either an <guilabel>Exchange
+ Rate</guilabel> or a <guilabel>To Amount</guilabel> (the amount in
+ the other currency/comodity). Please see (<xref
+ linkend="trans-win-enter"></xref>) for details of using this
+ dialog.</para>
+ <note>When committing a transaction or confirming
+ an exchange rate the price on the transaction date in the
+ <guilabel>Price Editor</guilabel> may be updated. See <xref
+ linkend="tool-price"/> for details.</note>
+ </sect1>
- <sect1 id="trans-currency-enter">
- <title>Multiple Currency Transactions</title>
+ <sect1 id="trans-edit">
+ <title>Editing a Transaction</title>
- <para>Currently transfers between different currencies are only supported by using the <guilabel>Transfer Funds</guilabel>
- window described above (<xref linkend="trans-win-enter"></xref>). It is necessary to use this dialog
- to add an exchange rate.</para>
+ <para>Editing a transaction involves just selecting the part of the transaction that needs to be changed.
+ Once the changes are complete pressing the <keycap function="enter">Enter</keycap> key, selecting the
+ <guibutton>Enter</guibutton> icon or going to
+ <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Enter Transaction</guimenuitem></menuchoice> will
+ now move the cursor to the next line or transaction.
+ </para>
- <para>To setup an account as a different currency edit the account properties and change the <guilabel>Commodity</guilabel>
- field to the foreign currency. This account will now enable the <guilabel>Currency Transfer</guilabel> pane in the
- <guilabel>Transfer Funds</guilabel> window .</para>
- </sect1>
+ <para>To see a more detailed view of a transaction for editing in Basic Ledger, press the
+ <guibutton>Split</guibutton> button on the <emphasis>Toolbar</emphasis> or select
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.</para>
+ </sect1>
- <sect1 id="trans-edit">
- <title>Editing a Transaction</title>
+ <sect1 id="trans-delete">
+ <title>Deleting a Transaction</title>
- <para>Editing a transaction involves just selecting the part of the transaction that needs to be changed.
- Once the changes are complete pressing the <keycap function="enter">Enter</keycap> key, selecting the
- <guibutton>Enter</guibutton> icon or going to
- <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Enter Transaction</guimenuitem></menuchoice> will
- now move the cursor to the next line or transaction.
- </para>
+ <para>If a transaction needs to be removed from the register, select the transaction and press either
+ the <guibutton>Delete</guibutton> icon on the <emphasis>Toolbar</emphasis> or go to
+ <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Delete Transaction</guimenuitem></menuchoice>.
- <para>To see a more detailed view of a transaction for editing in Basic Ledger, press the
- <guibutton>Split</guibutton> button on the <emphasis>Toolbar</emphasis> or select
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.</para>
- </sect1>
+ A window will appear to confirm the delete, unless the preference has been changed. The window presents
+ two options; "Remember and don’t ask again", and "Remember and don’t ask again this session". The response
+ will be set according to the selected checkbox. The preference can also be reset via
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reset Warnings</guimenuitem></menuchoice>. <xref linkend="reset-warning"></xref>.</para>
- <sect1 id="trans-delete">
- <title>Deleting a Transaction</title>
+ <para>Parts of a transaction can also be removed by pressing the <guibutton>Split</guibutton> button on
+ the <emphasis>Toolbar</emphasis> or selecting
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>. The part of the
+ transaction that needs to be deleted can be then selected for deletion.</para>
+ </sect1>
- <para>If a transaction needs to be removed from the register, select the transaction and press either
- the <guibutton>Delete</guibutton> icon on the <emphasis>Toolbar</emphasis> or go to
- <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Delete Transaction</guimenuitem></menuchoice>.
+ <sect1 id="trans-split-remove">
+ <title>Removing Transaction Splits</title>
+
+ <para>Removing Transaction Splits involves erasing all splits except the one for the account that is opened.
+ This is a useful way of reusing a previous transaction that has multiple splits that need to be changed.
+ (Note this can be done without opening the split, but doing so makes the effect more visible)</para>
+
+ <orderedlist>
+ <listitem>
+ <para>If in Basic Ledger, press the <guibutton>Split</guibutton> button on the <emphasis>Toolbar</emphasis> or select
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>
+ to open the transaction. If in other modes select transaction.</para>
+ </listitem>
+
+ <listitem>
+ <para>Select <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Remove Transaction Splits</guimenuitem></menuchoice>.</para>
+ <para>A window will appear to confirm the delete, unless the preference has been changed. The window
+ presents two options; "Remember and don’t ask again", and "Remember and don’t ask again this session".
+ The response will be set according to the selected checkbox. The preference can also be reset via
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reset Warnings</guimenuitem></menuchoice>. <xref linkend="reset-warning"></xref>.</para>
+ </listitem>
+
+ <listitem>
+ <para>All Accounts and their related details will be removed except for the
+ currently opened account. </para>
+ </listitem>
+
+ <listitem>
+ <para>The amount is not balanced and <application>&app;</application> will indicate this by placing gray
+ check-boxes in the amount columns with the unbalanced amount in the blank last
+ row.</para>
+ </listitem>
+
+ <listitem>
+ <para>Edit the transaction to fill in the new details.</para>
+ </listitem>
+ </orderedlist>
+ </sect1>
- A window will appear to confirm the delete, unless the preference has been changed. The window presents
- two options; "Remember and don’t ask again", and "Remember and don’t ask again this session". The response
- will be set according to the selected checkbox. The preference can also be reset via
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reset Warnings</guimenuitem></menuchoice>. <xref linkend="reset-warning"></xref>.</para>
+ <sect1 id="trans-copy">
+ <title>Copying a Transaction</title>
- <para>Parts of a transaction can also be removed by pressing the <guibutton>Split</guibutton> button on
- the <emphasis>Toolbar</emphasis> or selecting
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>. The part of the
- transaction that needs to be deleted can be then selected for deletion.</para>
- </sect1>
+ <para>Copying Transactions is available from the <guimenu>Transaction</guimenu> menu. The
+ <guimenu>Transaction</guimenu> menu has <guimenu>Cut Transaction</guimenu>, <guimenu>Copy
+ Transaction</guimenu> and <guimenu>Paste Transaction</guimenu> which allows a whole transaction to be
+ cut or copied and pasted to a new transaction line.
+ This way of copying a transaction will use the date showing in the new transaction blank line.
+ </para>
- <sect1 id="trans-split-remove">
- <title>Removing Transaction Splits</title>
-
- <para>Removing Transaction Splits involves erasing all splits except the one for the account that is opened.
- This is a useful way of reusing a previous transaction that has multiple splits that need to be changed.
- (Note this can be done without opening the split, but doing so makes the effect more visible)</para>
-
- <orderedlist>
- <listitem>
- <para>If in Basic Ledger, press the <guibutton>Split</guibutton> button on the <emphasis>Toolbar</emphasis> or select
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>
- to open the transaction. If in other modes select transaction.</para>
- </listitem>
-
- <listitem>
- <para>Select <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Remove Transaction Splits</guimenuitem></menuchoice>.</para>
- <para>A window will appear to confirm the delete, unless the preference has been changed. The window
- presents two options; "Remember and don’t ask again", and "Remember and don’t ask again this session".
- The response will be set according to the selected checkbox. The preference can also be reset via
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reset Warnings</guimenuitem></menuchoice>. <xref linkend="reset-warning"></xref>.</para>
- </listitem>
-
- <listitem>
- <para>All Accounts and their related details will be removed except for the
- currently opened account. </para>
- </listitem>
-
- <listitem>
- <para>The amount is not balanced and <application>&app;</application> will indicate this by placing gray
- check-boxes in the amount columns with the unbalanced amount in the blank last
- row.</para>
- </listitem>
-
- <listitem>
- <para>Edit the transaction to fill in the new details.</para>
- </listitem>
- </orderedlist>
- </sect1>
+ <para>The <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Duplicate Transaction...</guimenuitem></menuchoice> or the <emphasis>Toolbar</emphasis>
+ <guimenu>Duplicate</guimenu> which, unlike the Copy method, allows for choosing a different date.</para>
- <sect1 id="trans-copy">
- <title>Copying a Transaction</title>
+ <itemizedlist>
+ <listitem>
+ <para>Select the transaction to duplicate.</para>
+ </listitem>
- <para>Copying Transactions is available from the <guimenu>Transaction</guimenu> menu. The
- <guimenu>Transaction</guimenu> menu has <guimenu>Cut Transaction</guimenu>, <guimenu>Copy
- Transaction</guimenu> and <guimenu>Paste Transaction</guimenu> which allows a whole transaction to be
- cut or copied and pasted to a new transaction line.
- This way of copying a transaction will use the date showing in the new transaction blank line.
- </para>
+ <listitem>
+ <para>Go to <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Duplicate Transaction...</guimenuitem></menuchoice></para>
+ </listitem>
- <para>The <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Duplicate Transaction...</guimenuitem></menuchoice> or the <emphasis>Toolbar</emphasis>
- <guimenu>Duplicate</guimenu> which, unlike the Copy method, allows for choosing a different date.</para>
-
- <itemizedlist>
- <listitem>
- <para>Select the transaction to duplicate.</para>
- </listitem>
-
- <listitem>
- <para>Go to <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Duplicate Transaction...</guimenuitem></menuchoice></para>
- </listitem>
-
- <listitem>
- <para>A dialog called <emphasis role="bold">Duplicate Transaction</emphasis> will prompt for a new
- Date and Num for the transaction.</para>
- </listitem>
-
- <listitem>
- <para>Press <guibutton>OK</guibutton> to add the transaction to the register.</para>
- </listitem>
- </itemizedlist>
- </sect1>
-
- <sect1 id="trans-stts">
- <title>Setting the reconcile status (<guilabel>R</guilabel> field) of a transaction</title>
- <para>In the <application>&app;</application> register there is a column named <guilabel>R</guilabel>. This field
- indicates the status of a transaction. Possible values are:</para>
-
- <variablelist>
- <varlistentry>
- <term><guilabel>n</guilabel></term>
- <listitem>
- <para>Default status when a transaction is created</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>c</guilabel></term>
- <listitem>
- <para>Cleared. Status may be assigned either manually or by an import process.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>y</guilabel></term>
- <listitem>
- <para>Status assigned solely by the reconciliation process (see <xref linkend="acct-reconcile" />).
- Places limits optionally requiring confirmation on editing fields in that line of a transaction.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>f</guilabel></term>
- <listitem>
- <para>Frozen. Not implemented at this time</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>v</guilabel></term>
- <listitem>
- <para>Voided. Status is assigned or released manually through the transaction menu (<xref linkend="Trans-transaction-menu" />)
- to a transaction and applies to every line in the transaction. It hides most of the transaction details but does not delete them.
- When a transaction is voided a reason entry is required that appears to the right of the description.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </sect1>
-
- <sect1 id="acct-jump">
- <title>Jump to another Account Register</title>
+ <listitem>
+ <para>A dialog called <emphasis role="bold">Duplicate Transaction</emphasis> will prompt for a new
+ Date and Num for the transaction.</para>
+ </listitem>
- <para>When using the Account Register Window it is frequently useful to be able to
- view another account and also the transfer account at the same time. <application>&app;</application> allows you to
- do this quickly by using the <guibutton>Jump</guibutton> button available in the <emphasis>Toolbar</emphasis> or
- the <menuchoice><guimenu>Actions</guimenu><guimenuitem>Jump</guimenuitem></menuchoice> menu item in the Account Register Window. </para>
+ <listitem>
+ <para>Press <guibutton>OK</guibutton> to add the transaction to the register.</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
- <para>Select the transaction in the Account Register Window and either click the <guibutton>Jump</guibutton> icon or select
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Jump</guimenuitem></menuchoice> to open the Account Register Window
- target. If the transaction is split
- between more than one transfer account then you will need to show all the split transfer accounts first and
- select the transfer account to jump to.</para>
- </sect1>
+ <sect1 id="trans-stts">
+ <title>Setting the reconcile status (<guilabel>R</guilabel> field) of a transaction</title>
+ <para>In the <application>&app;</application> register there is a column named <guilabel>R</guilabel>. This field
+ indicates the status of a transaction. Possible values are:</para>
- <sect1 id="trans-sched">
- <title>Scheduling Transactions</title>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>n</guilabel></term>
+ <listitem>
+ <para>Default status when a transaction is created</para>
+ </listitem>
+ </varlistentry>
- <para>Scheduled Transactions provide the ability to have reminders scheduled or transactions scheduled to be
- entered at a specified date. This is combined with the <emphasis role="bold">Since Last Run
- </emphasis> assistant (<xref linkend="trans-sched-slr"></xref>) to review and enter the transactions. The
- <guilabel>Mortgage & Loan Repayment</guilabel> assistant (<xref linkend="trans-sched-loans"></xref>) is used
- to setup a scheduled transaction to repay a compounding interest loan. The Scheduled Transaction Editor
- (<xref linkend="sched-editor"></xref>) is used to create and edit transactions that are to be added to the
- register in an automated way.</para>
-
- <para>The easiest way to setup a scheduled transaction is to use an existing transaction in an account register
- as a template. Select the transaction you wish to use as a template and then either select the
- <guibutton>Schedule</guibutton> icon on the <emphasis>Toolbar</emphasis> or go to
- <menuchoice><guimenu>Actions</guimenu><guimenuitem>Schedule...</guimenuitem></menuchoice>.
- This will bring up the <emphasis role="bold">Make Scheduled Transaction</emphasis> dialog.</para>
-
- <itemizedlist>
- <listitem>
- <para><guilabel>Name:</guilabel> Enter a name to use for the scheduled transaction. This will be
- used in the <guilabel>Description</guilabel> file of the transaction.</para>
- </listitem>
+ <varlistentry>
+ <term><guilabel>c</guilabel></term>
+ <listitem>
+ <para>Cleared. Status may be assigned either manually or by an import process.</para>
+ </listitem>
+ </varlistentry>
- <listitem>
- <para><guilabel>Frequency:</guilabel> Choose the time period you want between scheduled entries. The
- dates that the transactions will be entered will show in the mini calendar pane to the right.</para>
- </listitem>
+ <varlistentry>
+ <term><guilabel>y</guilabel></term>
+ <listitem>
+ <para>Status assigned solely by the reconciliation process (see <xref linkend="acct-reconcile" />).
+ Places limits optionally requiring confirmation on editing fields in that line of a transaction.</para>
+ </listitem>
+ </varlistentry>
- <listitem>
- <para><guilabel>Start Date:</guilabel> Choose a date for the scheduled transaction to start.</para>
- </listitem>
+ <varlistentry>
+ <term><guilabel>f</guilabel></term>
+ <listitem>
+ <para>Frozen. Not implemented at this time</para>
+ </listitem>
+ </varlistentry>
- <listitem>
- <para><guilabel>Never End:</guilabel> This scheduled transaction has no finish date.</para>
- </listitem>
+ <varlistentry>
+ <term><guilabel>v</guilabel></term>
+ <listitem>
+ <para>Voided. Status is assigned or released manually through the transaction menu (<xref linkend="Trans-transaction-menu" />)
+ to a transaction and applies to every line in the transaction. It hides most of the transaction details but does not delete them.
+ When a transaction is voided a reason entry is required that appears to the right of the description.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
- <listitem>
- <para><guilabel>End Date:</guilabel> Choose a date for the scheduled transaction to end.</para>
- </listitem>
+ </sect1>
- <listitem>
- <para><guilabel>Number of Occurrences:</guilabel> Enter the number of times you wish the scheduled
- transaction to be added to the register.</para>
- </listitem>
- </itemizedlist>
+ <sect1 id="acct-jump">
+ <title>Jump to another Account Register</title>
- <para>The <guilabel>Advanced...</guilabel> button brings up the Scheduled Transaction Editor’s dialog to
- Edit the Scheduled Transaction. This is described in the section Scheduled Transaction Editor.
- <xref linkend="sched-editor"></xref></para>
+ <para>When using the Account Register Window it is frequently useful to be able to
+ view another account and also the transfer account at the same time. <application>&app;</application> allows you to
+ do this quickly by using the <guibutton>Jump</guibutton> button available in the <emphasis>Toolbar</emphasis> or
+ the <menuchoice><guimenu>Actions</guimenu><guimenuitem>Jump</guimenuitem></menuchoice> menu item in the Account Register Window. </para>
- <sect2 id="sched-trans-win">
- <title>Scheduled Transactions Window</title>
+ <para>Select the transaction in the Account Register Window and either click the <guibutton>Jump</guibutton> icon or select
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Jump</guimenuitem></menuchoice> to open the Account Register Window
+ target. If the transaction is split
+ between more than one transfer account then you will need to show all the split transfer accounts first and
+ select the transfer account to jump to.</para>
+ </sect1>
- <para>The Scheduled Transaction Window is used to access the list of scheduled transactions and create,
- edit or remove them. It also provides a calendar which displays upcoming scheduled transactions. Clicking
- on the calendar view and hovering over any date will pop up a small dialog that shows the transactions
- scheduled for that day. The yellow highlight in the calendar indicates which days have scheduled
- transactions. To dismiss the hover dialog click once more.</para>
+ <sect1 id="trans-sched">
+ <title>Scheduling Transactions</title>
- <para>The top pane of the Scheduled Transaction Window contains the list of scheduled transactions that are
- currently setup. This window lists the Name of the transaction, if the transaction is enabled for scheduling,
- the Frequency (month and day) that the transaction is to be entered, the last time the transaction was entered
- and the next time the transaction will be entered.</para>
+ <para>Scheduled Transactions provide the ability to have reminders scheduled or transactions scheduled to be
+ entered at a specified date. This is combined with the <emphasis role="bold">Since Last Run
+ </emphasis> assistant (<xref linkend="trans-sched-slr"></xref>) to review and enter the transactions. The
+ <guilabel>Mortgage & Loan Repayment</guilabel> assistant (<xref linkend="trans-sched-loans"></xref>) is used
+ to setup a scheduled transaction to repay a compounding interest loan. The Scheduled Transaction Editor
+ (<xref linkend="sched-editor"></xref>) is used to create and edit transactions that are to be added to the
+ register in an automated way.</para>
+
+ <para>The easiest way to setup a scheduled transaction is to use an existing transaction in an account register
+ as a template. Select the transaction you wish to use as a template and then either select the
+ <guibutton>Schedule</guibutton> icon on the <emphasis>Toolbar</emphasis> or go to
+ <menuchoice><guimenu>Actions</guimenu><guimenuitem>Schedule...</guimenuitem></menuchoice>.
+ This will bring up the <emphasis role="bold">Make Scheduled Transaction</emphasis> dialog.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>Name:</guilabel> Enter a name to use for the scheduled transaction. This will be
+ used in the <guilabel>Description</guilabel> file of the transaction.</para>
+ </listitem>
- <para>The right side of this pane contains a down arrow button that when clicked will pull-down a window to
- allow selection of the characteristics displayed in the list. Unchecking the appropriate box will remove the
- characteristic from the display.</para>
+ <listitem>
+ <para><guilabel>Frequency:</guilabel> Choose the time period you want between scheduled entries. The
+ dates that the transactions will be entered will show in the mini calendar pane to the right.</para>
+ </listitem>
- <para>The <emphasis>Toolbar</emphasis> of this window contains three buttons to create, delete and edit scheduled transactions.
- <guibutton>New</guibutton> and <guibutton>Edit</guibutton> buttons opens the Edit Scheduled Transaction dialog.
- <guibutton>Delete</guibutton> removes the selected scheduled transaction.
- The same options are available thru <menuchoice><guimenu>Schedule</guimenu><guimenuitem>New/Edit/Delete</guimenuitem></menuchoice>,
- from the Scheduled Transaction Tab. </para>
+ <listitem>
+ <para><guilabel>Start Date:</guilabel> Choose a date for the scheduled transaction to start.</para>
+ </listitem>
- <para>Below the list of scheduled transactions is the Upcoming calendar. This calendar displays up to the next
- year and highlights the dates that the scheduled transactions are scheduled to occur so it is easy to see when
- the transactions are scheduled. Clicking on a date in the calendar brings up a list of scheduled transactions
- for that date. Moving the mouse over other dates changes to the list of transactions on those dates. Clicking
- once more on the calendar removes the transaction list.</para>
+ <listitem>
+ <para><guilabel>Never End:</guilabel> This scheduled transaction has no finish date.</para>
+ </listitem>
- <para>The Scheduled Transaction Window is activated from the Account tab or the Transaction Register via
- <menuchoice><guimenu>Actions</guimenu><guisubmenu>Scheduled Transaction</guisubmenu>
- <guimenuitem>Scheduled Transaction Editor...</guimenuitem></menuchoice>.</para>
+ <listitem>
+ <para><guilabel>End Date:</guilabel> Choose a date for the scheduled transaction to end.</para>
+ </listitem>
- </sect2>
- </sect1>
- <sect1 id="sched-editor">
- <title>Edit Scheduled Transaction Window</title>
+ <listitem>
+ <para><guilabel>Number of Occurrences:</guilabel> Enter the number of times you wish the scheduled
+ transaction to be added to the register.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The <guilabel>Advanced...</guilabel> button brings up the Scheduled Transaction Editor’s dialog to
+ Edit the Scheduled Transaction. This is described in the section Scheduled Transaction Editor.
+ <xref linkend="sched-editor"></xref></para>
+
+ <sect2 id="sched-trans-win">
+ <title>Scheduled Transactions Window</title>
+
+ <para>The Scheduled Transaction Window is used to access the list of scheduled transactions and create,
+ edit or remove them. It also provides a calendar which displays upcoming scheduled transactions. Clicking
+ on the calendar view and hovering over any date will pop up a small dialog that shows the transactions
+ scheduled for that day. The yellow highlight in the calendar indicates which days have scheduled
+ transactions. To dismiss the hover dialog click once more.</para>
+
+ <para>The top pane of the Scheduled Transaction Window contains the list of scheduled transactions that are
+ currently setup. This window lists the Name of the transaction, if the transaction is enabled for scheduling,
+ the Frequency (month and day) that the transaction is to be entered, the last time the transaction was entered
+ and the next time the transaction will be entered.</para>
+
+ <para>The right side of this pane contains a down arrow button that when clicked will pull-down a window to
+ allow selection of the characteristics displayed in the list. Unchecking the appropriate box will remove the
+ characteristic from the display.</para>
+
+ <para>The <emphasis>Toolbar</emphasis> of this window contains three buttons to create, delete and edit scheduled transactions.
+ <guibutton>New</guibutton> and <guibutton>Edit</guibutton> buttons opens the Edit Scheduled Transaction dialog.
+ <guibutton>Delete</guibutton> removes the selected scheduled transaction.
+ The same options are available thru <menuchoice><guimenu>Schedule</guimenu><guimenuitem>New/Edit/Delete</guimenuitem></menuchoice>,
+ from the Scheduled Transaction Tab. </para>
+
+ <para>Below the list of scheduled transactions is the Upcoming calendar. This calendar displays up to the next
+ year and highlights the dates that the scheduled transactions are scheduled to occur so it is easy to see when
+ the transactions are scheduled. Clicking on a date in the calendar brings up a list of scheduled transactions
+ for that date. Moving the mouse over other dates changes to the list of transactions on those dates. Clicking
+ once more on the calendar removes the transaction list.</para>
+
+ <para>The Scheduled Transaction Window is activated from the Account tab or the Transaction Register via
+ <menuchoice><guimenu>Actions</guimenu><guisubmenu>Scheduled Transaction</guisubmenu>
+ <guimenuitem>Scheduled Transaction Editor...</guimenuitem></menuchoice>.</para>
+
+ </sect2>
+ </sect1>
+ <sect1 id="sched-editor">
+ <title>Edit Scheduled Transaction Window</title>
- <para>The Edit Scheduled Transaction Window is divided into a Name area, Options area, Occurrences area,
- Recurrence Frequency area, mini calendar and Template Transaction pane.</para>
+ <para>The Edit Scheduled Transaction Window is divided into a Name area, Options area, Occurrences area,
+ Recurrence Frequency area, mini calendar and Template Transaction pane.</para>
- <para>The <emphasis role="bold">Name</emphasis> field is used to enter the name for the scheduled transaction. This will be
- used in the <guilabel>Description</guilabel> of the transaction.</para>
+ <para>The <emphasis role="bold">Name</emphasis> field is used to enter the name for the scheduled transaction. This will be
+ used in the <guilabel>Description</guilabel> of the transaction.</para>
- <para>The <emphasis role="bold">Options</emphasis> area contains check-boxes to set if the transaction is
- automatically created and how many days in advance the transaction is created and/or a reminder posted.
- </para>
+ <para>The <emphasis role="bold">Options</emphasis> area contains check-boxes to set if the transaction is
+ automatically created and how many days in advance the transaction is created and/or a reminder posted.
+ </para>
- <para>The <emphasis role="bold">Occurrences</emphasis> area contains selections to set for dates limits on
- transactions to be entered or the number of transactions to be entered.</para>
+ <para>The <emphasis role="bold">Occurrences</emphasis> area contains selections to set for dates limits on
+ transactions to be entered or the number of transactions to be entered.</para>
- <para>The <emphasis role="bold">Recurrence Frequency</emphasis> area contains selections to set how
- often the transaction is scheduled to be added and on what dates this occurs.</para>
+ <para>The <emphasis role="bold">Recurrence Frequency</emphasis> area contains selections to set how
+ often the transaction is scheduled to be added and on what dates this occurs.</para>
- <para>The mini calendar provides a visual indication of what transactions are already scheduled.</para>
+ <para>The mini calendar provides a visual indication of what transactions are already scheduled.</para>
- <para>The <emphasis role="bold">Template Transaction</emphasis> pane allows you to setup the transaction
- as you would like it to be entered into the register.</para>
+ <para>The <emphasis role="bold">Template Transaction</emphasis> pane allows you to setup the transaction
+ as you would like it to be entered into the register.</para>
- <para>These options are described in more detail in <xref linkend="trans-sched"></xref></para>
+ <para>These options are described in more detail in <xref linkend="trans-sched"></xref></para>
- <itemizedlist>
- <listitem><para>From the Scheduled Transaction tab selecting a transaction from the list and pressing
- the <guibutton>Edit</guibutton> or <guibutton>New</guibutton> buttons will bring up the Edit Scheduled Transaction Editor.</para>
- </listitem>
- </itemizedlist>
+ <itemizedlist>
+ <listitem><para>From the Scheduled Transaction tab selecting a transaction from the list and pressing
+ the <guibutton>Edit</guibutton> or <guibutton>New</guibutton> buttons will bring up the Edit Scheduled Transaction Editor.</para>
+ </listitem>
+ </itemizedlist>
- </sect1>
+ </sect1>
- <sect1 id="print-check">
+ <sect1 id="print-check">
<title>Printing Checks</title>
- <para>Checks are printed in <application>&app;</application> from the account register. <application>&app;</application> provides the
- ability to print to several standard Quicken Checks (including US Letter) or to make
- a custom check format. Check position and Date formats are also customizable.</para>
+ <para>Checks are printed in <application>&app;</application> from the account register. <application>&app;</application> provides the
+ ability to print to several standard Quicken Checks (including US Letter) or to make
+ a custom check format. Check position and Date formats are also customizable.</para>
- <para>To print a single check in <application>&app;</application>, select the transaction to print a check for
- and go to <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>.
- This will open the Print Checks properties dialog to print the selected transaction.</para>
+ <para>To print a single check in <application>&app;</application>, select the transaction to print a check for
+ and go to <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>.
+ This will open the Print Checks properties dialog to print the selected transaction.</para>
- <para>To print multiple checks in <application>&app;</application> execute a search to find the transactions
- you wish to print. With the search results window as the front window go to
- <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>. This will open
- the Print Checks properties dialog to print all the transactions in the search results window.</para>
+ <para>To print multiple checks in <application>&app;</application> execute a search to find the transactions
+ you wish to print. With the search results window as the front window go to
+ <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>. This will open
+ the Print Checks properties dialog to print all the transactions in the search results window.</para>
- <para>The Print Checks dialog has two tabs. The first tab, Options, is used to setup
- the most common options to print a check. The second tab, Custom format, is used to
- setup the position of various fields on the check. It is useful to print a test check
- to a plain piece of paper first and use that to make any adjustments needed.</para>
+ <para>The Print Checks dialog has two tabs. The first tab, Options, is used to setup
+ the most common options to print a check. The second tab, Custom format, is used to
+ setup the position of various fields on the check. It is useful to print a test check
+ to a plain piece of paper first and use that to make any adjustments needed.</para>
- <para>The default selection in Options is for Quicken/Quickbooks (tm) US-Letter checks.</para>
+ <para>The default selection in Options is for Quicken/Quickbooks (tm) US-Letter checks.</para>
- <itemizedlist>
- <listitem>
+ <itemizedlist>
+ <listitem>
<para>Check format: Test with Quicken first then use custom if the position is incorrect.</para>
- </listitem>
+ </listitem>
- <listitem>
+ <listitem>
<para>Check position: This sets if the Top, Middle or Bottom check is printed. Custom is used if the
- position of the checks on the page is incorrect.</para>
- </listitem>
+ position of the checks on the page is incorrect.</para>
+ </listitem>
- <listitem>
+ <listitem>
<para>Date format: The default here is set in the Preferences International section. Choose a date format.
- This can also be adjusted by the Use of the Months: and Years: lines. Custom allows the date format to be
- set in the Format: box (%m means month, %d means day, %Y means year) A Sample of the format chosen is
- displayed below.</para>
- </listitem>
- <listitem>
- <para>Address: This sets the address of the Payee, if the check format includes a
- space for it and you are printing a single check.</para>
- </listitem>
- </itemizedlist>
-
- <para>The Custom format tab has two sections. The top half of the window (above the
- dividing line) allows you to position the fields in each check. It contains two
- columns to enter in the X and Y co-ordinates of the field position on the
- check. Positions in the Custom Check Format entry area are specified with x = 0 at
- the left edge of the check with x increasing to the right, and y = 0 at the top edge
- of the check with y increasing as you travel down. (If you are using a version of
- GTK prior to 2.10, then y = 0 is at the bottom of the page and y increases as you
- travel up.)</para>
-
- <itemizedlist>
- <listitem>
- <para>Payee: </para>
- </listitem>
-
- <listitem>
- <para>Date: </para>
- </listitem>
-
- <listitem>
- <para>Amount (words): </para>
- </listitem>
+ This can also be adjusted by the Use of the Months: and Years: lines. Custom allows the date format to be
+ set in the Format: box (%m means month, %d means day, %Y means year) A Sample of the format chosen is
+ displayed below.</para>
+ </listitem>
+ <listitem>
+ <para>Address: This sets the address of the Payee, if the check format includes a
+ space for it and you are printing a single check.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The Custom format tab has two sections. The top half of the window (above the
+ dividing line) allows you to position the fields in each check. It contains two
+ columns to enter in the X and Y co-ordinates of the field position on the
+ check. Positions in the Custom Check Format entry area are specified with x = 0 at
+ the left edge of the check with x increasing to the right, and y = 0 at the top edge
+ of the check with y increasing as you travel down. (If you are using a version of
+ GTK prior to 2.10, then y = 0 is at the bottom of the page and y increases as you
+ travel up.)</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Payee: </para>
+ </listitem>
+
+ <listitem>
+ <para>Date: </para>
+ </listitem>
+
+ <listitem>
+ <para>Amount (words): </para>
+ </listitem>
+
+ <listitem>
+ <para>Amount (numbers): </para>
+ </listitem>
+
+ <listitem>
+ <para>Address: </para>
+ </listitem>
+
+ <listitem>
+ <para>Notes: </para>
+ </listitem>
+
+ <listitem>
+ <para>Memo: </para>
+ </listitem>
+
+ <listitem>
+ <para>Splits Amount: </para>
+ </listitem>
+
+ <listitem>
+ <para>Splits Memo: </para>
+ </listitem>
+
+ <listitem>
+ <para>Splits Account: </para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The part of the custom format tab below the dividing line contains fields to
+ position the entire check correctly on the page. The Translation field is the
+ distance from the top left corner and the Rotation field rotates the check
+ clockwise by the indicated amount.</para>
+
+ <para>The Units field in the bottom half of the window specifies the units used in
+ all the fields in both halves of the window.</para>
+
+ <para>Once <guibutton>OK</guibutton> is pressed on the Print Check dialog the Print <application>&app;</application> Document dialog is presented. Press <guibutton>OK</guibutton>
+ to print the check.</para>
- <listitem>
- <para>Amount (numbers): </para>
- </listitem>
-
- <listitem>
- <para>Address: </para>
- </listitem>
-
- <listitem>
- <para>Notes: </para>
- </listitem>
-
- <listitem>
- <para>Memo: </para>
- </listitem>
-
- <listitem>
- <para>Splits Amount: </para>
- </listitem>
-
- <listitem>
- <para>Splits Memo: </para>
- </listitem>
-
- <listitem>
- <para>Splits Account: </para>
- </listitem>
- </itemizedlist>
-
- <para>The part of the custom format tab below the dividing line contains fields to
- position the entire check correctly on the page. The Translation field is the
- distance from the top left corner and the Rotation field rotates the check
- clockwise by the indicated amount.</para>
-
- <para>The Units field in the bottom half of the window specifies the units used in
- all the fields in both halves of the window.</para>
-
- <para>Once <guibutton>OK</guibutton> is pressed on the Print Check dialog the Print <application>&app;</application> Document dialog is presented. Press <guibutton>OK</guibutton>
- to print the check.</para>
-
- </sect1>
+ </sect1>
- <sect1 id="trans-online">
- <title>Online Actions ...</title>
+ <sect1 id="trans-online">
+ <title>Online Actions ...</title>
- <note><para>This section is "under construction - any input will be welcome !!".</para></note>
+ <note><para>This section is "under construction - any input will be welcome !!".</para></note>
- <sect2> <title>Get Balance</title><para></para></sect2>
- <sect2> <title>Get Transactions ...</title><para></para></sect2>
- <sect2> <title>Issue Transaction</title><para></para></sect2>
- <sect2> <title>Direct Debit</title><para></para></sect2>
+ <sect2> <title>Get Balance</title><para></para></sect2>
+ <sect2> <title>Get Transactions ...</title><para></para></sect2>
+ <sect2> <title>Issue Transaction</title><para></para></sect2>
+ <sect2> <title>Direct Debit</title><para></para></sect2>
- </sect1>
+ </sect1>
- <sect1 id="general-ledger">
- <title>General Ledger</title>
- <para>The General Ledger is an advanced register used to enter transactions without needing to open
- individual accounts. The General Ledger shows the transaction entries for all accounts on one register.</para>
-
- <para>Entering transactions in the General Ledger is more complicated than entering them in the individual
- account registers. The advantage is the General Ledger provides a more comprehensive view of the
- transactions you have entered in all your accounts.</para>
-
- <para>The General Ledger defaults to showing only the previous month of transactions. This is changeable
- by using the "Filter By..." on the View menu.</para>
- </sect1>
-
+ <sect1 id="general-journal">
+ <title>General Journal</title>
+ <para>The General Journal is an advanced register used to enter transactions without needing to open
+ individual accounts. The General Journal shows the transaction entries for all accounts on one register.</para>
+
+ <para>Entering transactions in the General Journal is more complicated than entering them in the individual
+ account registers. The advantage is the General Journal provides a more comprehensive view of the
+ transactions you have entered in all your accounts.</para>
+
+ <para>The General Journal defaults to showing only the previous month of transactions. This is changeable
+ by using the "Filter By..." on the View menu.</para>
+ </sect1>
-
</chapter>
commit 85eb4bd44a8c2b125df1dbff07e10db1a1d01161
Merge: 590a69c 4ef90cb
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 14 13:23:31 2015 -0700
Merge branch 'maint'
commit 590a69cc78d4b324c04759d74329b534ad691599
Author: Mike Evans <mikee at saxicola.co.uk>
Date: Tue Sep 8 12:42:57 2015 +0100
Small spelling error fix.
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 5914f86..80a6728 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -613,7 +613,7 @@ Equity:Opening Balances:USD
<sect2 id="loans_personalLoanToSomeOne_InitialSetup">
<title>Lending the money</title>
- <para>When you have lended money to your friend, you have in fact moved
+ <para>When you have lent money to your friend, you have in fact moved
money from an Asset account (like Bank, Checking or similar) to your
Asset account <emphasis>Money owed to you</emphasis>. To record this you enter the
following transaction into the <emphasis>Assets:Money owed to you:Friend</emphasis>
commit bf117a6008024c6d2ff8653c48063b999fa4868c
Merge: 24eb5bf 96e7450
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 27 15:45:19 2015 +0200
Merge branch 'maint'
commit 24eb5bffca5ff78abd4d18bd240f7c079bfbc032
Merge: f1c6598 7fbce91
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Aug 8 10:29:36 2015 +0200
Merge branch 'maint'
commit f1c65980c4e8067578e06310ef15c28f59b2a80a
Merge: 80f4fd8 a474415
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 4 21:41:47 2015 +0200
Merge branch 'maint'
commit 80f4fd8af62131cc21ee2f2d90c3e338eff2317c
Merge: 70713d9 66bd924
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 10:58:31 2015 -0700
Merge branch 'maint'
commit 70713d9de1b9ec2326fa024344c8e62cc88f217e
Merge: 75231c1 35eb990
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 30 11:02:31 2015 -0700
Merge branch 'maint'
commit 75231c1d46b01e3e3e7ca0708bb1911399cb4b88
Merge: 59fd368 77accf9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 3 16:18:11 2015 -0700
Merge branch 'maint'
commit 59fd368bfd081ae8ffeb76cb37e80cfe77a49664
Merge: 874ac13 e790581
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Apr 11 22:28:26 2015 +0200
Merge branch 'maint'
commit 874ac13b2b2068e90e398b84ce32799cfbb1ef93
Merge: 39888bb 27be79e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Feb 11 15:35:08 2015 +0100
Merge branch 'maint'
commit 39888bb0b803c90cee33b926271a05fc2e763216
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Feb 7 15:47:35 2015 +0100
Fix typo
diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index bdaa647..a6f3fc2 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -3169,7 +3169,7 @@
<entry><para>Show all splits in the current transaction. Not highlighted if
<menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split
- Ledger</guimenuitem></menuchoice> is enableb.</para></entry>
+ Ledger</guimenuitem></menuchoice> is enabled.</para></entry>
</row>
<row>
commit 4a9ea1c3b71014c07e18ea037136a37ea952554b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Feb 7 15:41:14 2015 +0100
Bug 122895 - general ledger should be named journal
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 91702c6..e35399a 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -283,7 +283,7 @@
</listitem>
<listitem>
- <para><emphasis>General Ledger</emphasis>: One register window can
+ <para><emphasis>General Journal</emphasis>: One register window can
display multiple accounts at the same time. This eases the trouble
of tracking down typing/entry errors. It also provides a convenient
way of viewing a portfolio of many stocks, by showing all
diff --git a/guide/de/toc.xml b/guide/de/toc.xml
index 655b18c..dfdf8d6 100644
--- a/guide/de/toc.xml
+++ b/guide/de/toc.xml
@@ -68,7 +68,7 @@
<listitem><para>4.3 Eine Buchung eingeben (How-To)</para></listitem>
<listitem><para> 4.3.1 Register</para></listitem>
<listitem><para> 4.3.2 Transfer Dialog</para></listitem>
-<listitem><para> 4.3.3 General Ledger Tool</para></listitem>
+<listitem><para> 4.3.3 General Journal Tool</para></listitem>
<listitem><para>4.4 Entering Multiple Splits (How-To)</para></listitem>
<listitem><para>4.5 Using Entry Shortcuts (How-To)</para></listitem>
<listitem><para> 4.5.1 Autofill</para></listitem>
diff --git a/guide/it/it.po b/guide/it/it.po
index fed573a..be3b874 100644
--- a/guide/it/it.po
+++ b/guide/it/it.po
@@ -2396,7 +2396,7 @@ msgstr ""
#: C/gnucash-guide.xml:286(para)
msgid ""
-"<emphasis>General Ledger</emphasis>: One register window can display "
+"<emphasis>General Journal</emphasis>: One register window can display "
"multiple accounts at the same time. This eases the trouble of tracking down "
"typing/entry errors. It also provides a convenient way of viewing a "
"portfolio of many stocks, by showing all transactions in that portfolio."
diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index 8cc6285..bdaa647 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -1364,7 +1364,7 @@
<row>
<entry namest="c2">
- <para><guimenuitem>General Ledger</guimenuitem></para></entry>
+ <para><guimenuitem>General Journal</guimenuitem></para></entry>
<entry namest="c3">
<!-- <para>See <xref linkend="general-ledger-report"></xref></para>-->
@@ -1748,9 +1748,9 @@
</row>
<row>
- <entry><para><guimenuitem>General Ledger</guimenuitem></para></entry>
+ <entry><para><guimenuitem>General Journal</guimenuitem></para></entry>
- <entry><para>See <xref linkend="general-ledger"></xref></para></entry>
+ <entry><para>See <xref linkend="general-journal"></xref></para></entry>
</row>
</tbody>
</tgroup>
@@ -2001,10 +2001,10 @@
</sect1>
<sect1>
- <title>Account Register/General Ledger</title>
+ <title>Account Register/General Journal</title>
<sect2 id="account-register">
- <title>Account Register & General Ledger Window</title>
+ <title>Account Register & General Journal Window</title>
<para>This window is used to enter and edit your account data. It also
provides tools for scheduling future transactions, finding and reporting
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 03de22a..3d5fa96 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -301,7 +301,7 @@
</listitem>
<listitem>
- <para>General Ledger:</para>
+ <para>General Journal:</para>
</listitem>
<listitem>
diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index bde4fcf..b5003f1 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -790,16 +790,16 @@
</sect1>
- <sect1 id="general-ledger">
- <title>General Ledger</title>
- <para>The General Ledger is an advanced register used to enter transactions without needing to open
- individual accounts. The General Ledger shows the transaction entries for all accounts on one register.</para>
+ <sect1 id="general-journal">
+ <title>General Journal</title>
+ <para>The General Journal is an advanced register used to enter transactions without needing to open
+ individual accounts. The General Journal shows the transaction entries for all accounts on one register.</para>
- <para>Entering transactions in the General Ledger is more complicated than entering them in the individual
- account registers. The advantage is the General Ledger provides a more comprehensive view of the
+ <para>Entering transactions in the General Journal is more complicated than entering them in the individual
+ account registers. The advantage is the General Journal provides a more comprehensive view of the
transactions you have entered in all your accounts.</para>
- <para>The General Ledger defaults to showing only the previous month of transactions. This is changeable
+ <para>The General Journal defaults to showing only the previous month of transactions. This is changeable
by using the "Filter By..." on the View menu.</para>
</sect1>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 84efbd8..42a1e53 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -2496,7 +2496,7 @@
<row>
<entry><para><guimenuitem>Libro mastro generale</guimenuitem></para></entry>
- <entry><para>Vedere la <xref linkend="general-ledger"/></para></entry>
+ <entry><para>Vedere la <xref linkend="general-journal"/></para></entry>
</row>
</tbody>
</tgroup>
@@ -6256,7 +6256,7 @@
</sect1>
- <sect1 id="general-ledger">
+ <sect1 id="general-journal">
<title>Libro mastro generale</title>
<para>Il libro mastro generale è un registro avanzato che permette di inserire le transazioni senza il bisogno di aprire i singoli conti; permette anche di visualizzare tutte le transazioni per tutti i conti in un unico registro.</para>
diff --git a/help/it/it.po b/help/it/it.po
index 81b4867..50bca90 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -2283,7 +2283,7 @@ msgstr "Giornale generale"
#: C/gnucash-help.xml:1189(guimenuitem)
#: C/gnucash-help.xml:1550(guimenuitem)
#: C/gnucash-help.xml:729(title)
-msgid "General Ledger"
+msgid "General Journal"
msgstr "Libro mastro generale"
#: C/gnucash-help.xml:1198(guimenuitem)
@@ -2500,8 +2500,8 @@ msgid "Open a screen where you can enter the required information to close the c
msgstr "Apre una schermata in cui è possibile inserire le informazioni necessarie alla chiusura del libro contabile corrente."
#: C/gnucash-help.xml:1552(para)
-msgid "See <xref linkend=\"general-ledger\"/>"
-msgstr "Vedere la <xref linkend=\"general-ledger\"/>"
+msgid "See <xref linkend=\"general-journal\"/>"
+msgstr "Vedere la <xref linkend=\"general-journal\"/>"
#: C/gnucash-help.xml:1560(title)
#: C/gnucash-help.xml:1563(title)
@@ -2690,11 +2690,11 @@ msgid "The <firstterm>Statusbar</firstterm> displays informations about the curr
msgstr "La <firstterm>barra di stato</firstterm> visualizza dei suggerimenti che forniscono maggiori dettagli sulla voce del menu selezionata e mostra anche una barra di avanzamento quando si sta aprendo o salvando un file o generando un resoconto. La <emphasis>barra di stato</emphasis> può essere nascosta o resa visibile selezionando la voce <guimenuitem>Barra di stato</guimenuitem> presente nel menu <guimenu>Visualizza</guimenu>."
#: C/gnucash-help.xml:1797(title)
-msgid "Account Register/General Ledger"
+msgid "Account Register/General Journal"
msgstr "Registro del conto/Libro mastro generale"
#: C/gnucash-help.xml:1800(title)
-msgid "Account Register & General Ledger Window"
+msgid "Account Register & General Journal Window"
msgstr "Registro del conto e finestra del libro mastro generale"
#: C/gnucash-help.xml:1802(para)
@@ -5212,15 +5212,15 @@ msgid "Direct Debit"
msgstr "Addebito diretto"
#: C/gnucash-help.xml:730(para)
-msgid "The General Ledger is an advanced register used to enter transactions without needing to open individual accounts. The General Ledger shows the transaction entries for all accounts on one register."
+msgid "The General Journal is an advanced register used to enter transactions without needing to open individual accounts. The General Journal shows the transaction entries for all accounts on one register."
msgstr "Il libro mastro generale è un registro avanzato che permette di inserire le transazioni senza il bisogno di aprire i singoli conti; permette anche di visualizzare tutte le transazioni per tutti i conti in un unico registro."
#: C/gnucash-help.xml:733(para)
-msgid "Entering transactions in the General Ledger is more complicated than entering them in the individual account registers. The advantage is the General Ledger provides a more comprehensive view of the transactions you have entered in all your accounts."
+msgid "Entering transactions in the General Journal is more complicated than entering them in the individual account registers. The advantage is the General Journal provides a more comprehensive view of the transactions you have entered in all your accounts."
msgstr "L’inserimento di una transazione nel libro mastro generale è più complicato rispetto alla stessa operazione compiuta dal registro del conto. Il vantaggio del libro mastro generale risiede nella visualizzazione più esaustiva delle transazioni inserite in tutti i propri conti."
#: C/gnucash-help.xml:737(para)
-msgid "The General Ledger defaults to showing only the previous month of transactions. This is changeable by using the Date Range on the View menu."
+msgid "The General Journal defaults to showing only the previous month of transactions. This is changeable by using the Date Range on the View menu."
msgstr "Il libro mastro generale è impostato di default per visualizzare solamente le transazioni dell’ultimo mese. Questa impostazione può essere cambiata utilizzando la voce «Intervallo temporale» nel menu «Visualizza»."
#: C/gnucash-help.xml:19(title)
@@ -6451,7 +6451,7 @@ msgid "General Journal:"
msgstr "Giornale generale:"
#: C/gnucash-help.xml:120(para)
-msgid "General Ledger:"
+msgid "General Journal:"
msgstr "Libro mastro generale:"
#: C/gnucash-help.xml:124(para)
@@ -13119,7 +13119,7 @@ msgstr "Cristian Marchi, 2011"
#~ "per quel conto. (scorciatoia Alt-F,A,C)"
#~ msgid ""
-#~ "When an account is selected in the Account Tree opens a General Ledger "
+#~ "When an account is selected in the Account Tree opens a General Journal "
#~ "register for that account and all sub-accounts. (Shortcut Alt-F,O,A)"
#~ msgstr ""
#~ "Quando è selezionato un conto nella struttura dei conti, viene aperto un "
commit 8602edf4c4582ae012aeebe41ab8f25c1efcba68
Author: David T <sunfish62 at yahoo.com>
Date: Tue Jan 27 23:25:36 2015 -0800
Inserting Part designations overall
https://bugzilla.gnome.org/show_bug.cgi?id=634181
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 542f91a..09f6780 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -445,16 +445,24 @@
</bookinfo>
+<part>
+ <title>Getting Started</title>
&chapter1;
&chapter2;
&chapter3;
&chapter4;
+</part>
+<part>
+ <title>Managing Personal Finances</title>
&chapter5;
&chapter6;
&chapter7;
&chapter8;
&chapter9;
&chapter10;
+</part>
+<part>
+ <title>Managing Business Finances</title>
&chapter11;
&chapter12;
&chapter13;
@@ -463,11 +471,14 @@
&chapter16;
&chapter17;
&chapter18;
+</part>
+<part>
+ <title>Appendices</title>
&appendixa;
&appendixb;
&appendixc;
&appendixd;
-
+</part>
&GFDL;
</book>
commit 5e976a38ccaaa83b9f6370b8d32c69d5f9ee74bd
Merge: 34252dc cf1ee13
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Jan 20 13:56:45 2015 +0100
Merge branch 'maint'
- Merge 2.6.5 release commit
- Sort txf list
commit 34252dce0dd99f96883d7429efce4b1c0e36cbdf
Merge: b300553 44aaa76
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 16 15:38:44 2014 -0800
Merge branch 'maint'
commit b3005534b2c402d62a357d5ac3adaac99af7cacb
Merge: 062389d 67fbd65
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Nov 28 19:15:18 2014 +0100
Merge branch 'maint'
Conflicts:
configure.ac
commit 062389db134768c5c70c4cd4d27d98628ac3614a
Merge: 538d99d 2df2822
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Sep 27 01:19:19 2014 +0200
Merge branch 'maint'
commit 538d99d5a0e395f9d95cb3d355c84a86e7434b14
Merge: 4c545eb 5448abd
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Sep 8 00:40:04 2014 +0200
Merge branch 'maint'
commit 4c545ebfe3bdc701f33f673083a4afae2ac5fe60
Merge: bcabd18 69949a4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Aug 29 02:43:28 2014 +0200
Merge branch 'maint'
commit bcabd1896097c60eb9f28d1b0a8adb154a7b266b
Merge: 32ea7d7 1d1c489
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Aug 28 18:12:42 2014 +0200
Merge branch 'maint'
commit 32ea7d729a81efe865b35a685d29050387de64fa
Merge: 80eed8c 0868422
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 14 21:40:55 2014 +0200
Merge branch 'maint'
Fix typo that breaks doc build
commit 80eed8cc2d90353305f0f8f8dad37f60c69ef1c9
Merge: 0002d87 933ebcd
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 12 12:53:43 2014 +0200
Merge branch 'maint'
- fix typo
- add sentence about manually editing payment information for customers
commit 0002d8774e598bb111e82b87443d0ac56f8c2130
Merge: dcbd509 d848180
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Aug 2 17:39:41 2014 +0200
Merge branch 'maint'
- How to tie dividends received in cash to the appropriate stock holding (Daniel Dodson)
- German translation of the Transactions chapter (Martin Mainka)
- Correct field format in python-import-fields (Mike Evans)
commit dcbd509705f270e0ab4d446cc06a1f0fa58cba38
Author: Martin Mainka <Internet at mainka-it.de>
Date: Fri Jul 4 10:51:45 2014 +0200
German translation of Transactions chapter.
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index d5ad774..034f20d 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -1,14 +1,1582 @@
-<chapter id="chapter_txns">
+<!--
+ (Do not remove this comment block.)
+ Version: 2.0.0
+ Last modified: July 9th 2006
+ Maintainers:
+ Chris Lyttle <chris at wilddev.net>
+ Author:
+ Jon Lapham <lapham at extracta.com.br>
+ Updated Bengt Thuree <bengt at thuree.com>
+ Originally written by Carol Champagne.
+ Translators:
+ (translators put your name and email here)
+ Martin Mainka <martin at mainka-it.de>
+-->
+
+<chapter id="chapter_txns">
<title>Buchungen</title>
- <para></para>
+
+ <para>Dieses Kapitel vermittelt Ihnen grundlegende Informationen, die sie brauchen, um Buchungen
+ in <application>&app;</application> zu verstehen und anzuwenden. Während Konten das Gerüst und die
+ Struktur eines Kontenplans darstellen, sind Buchungen die Dateneinträge in jedem Konto.</para>
+
+ <sect1 id="txns-concepts1">
+ <title>Grundlagen</title>
+
+ <para>Eine <emphasis>Buchung</emphasis> in einem System der doppelten Buchführung wie z.B.
+ <application>&app;</application> ist ein Austausch zwischen mindestens zwei Konten. Deshalb
+ besteht eine Buchung immer aus mindestens zwei Teilen, einem <emphasis>von-Konto</emphasis>
+ und einem <emphasis>nach-Konto</emphasis>. Der Geldbetrag wird von einem <emphasis>von-Konto</emphasis>
+ auf ein <emphasis>nach-Konto</emphasis> transferiert.
+ Buchhalter nennen diese Teile einer Buchung <emphasis>Einträge ins Kontenblatt</emphasis>.
+ In <application>&app;</application>, werden sie <emphasis>Buchungsteile</emphasis> genannt.
+ </para>
+
+ <para>Ein Buchungsteil beschreibt das Konto zu dem er gehört, den Geldbetragt, der von diesem Konto
+ oder auf dieses Konto transferiert wurde, und kann bei Bedarf noch einige andere Informationen enthalten.
+ <application>&app;</application> unterstützt mehrere Buchungsteile in einer Buchung, und die Buchungsteile
+ können beliebig Geldbeträge auf die betroffenen Konten oder von ihnen weg transferieren.</para>
+
+ <para>Sie erhalten zum Beispiel eine Gehaltszahlung auf Ihr Girokonto bei der Bank.
+ Die daraus folgende<emphasis>Buchung</emphasis> ist, dass das Girokonto (ein Aktiva) den Betrag
+ der Gehaltszahlung von Ihrem Ertragskonto erhält. Zwei Konten werden beeinflusst, und in diesem
+ Fall erhöht sich Ihr Eigenkapital.</para>
+
+ <para>Die Arbeit mit Buchungen in <application>&app;</application> wird in der sogenannten
+ <emphasis>Buchungsansicht</emphasis> durchgeführt. Jedes von ihnen erzeugte Konto hat eine
+ Buchungsansicht. Sie wird Ihnen bekannt vorkommen, sieht sie doch aus wie die Umsatzanzeige
+ oder die Kontoauszüge Ihrer Bank.</para>
+
+ <para>Die Buchungsansicht wird im nachfolgenden Abschnitt erklärt,
+ <xref linkend="txns-registers1"/>.</para>
+ </sect1>
+
<sect1 id="txns-registers1">
- <title>...</title>
- <para></para>
+ <title>Die Buchungsansicht</title>
+
+ <para>Die <emphasis>Buchungsansicht</emphasis> ist das <application>&app;</application> Fenster,
+ in dem Sie bestehende Buchungen ansehen und verändern können. Hier können Sie auch neue Buchungen
+ für dieses Konto eingeben. In die Buchungsansicht gelangen Sie durch einen Doppelklick auf den
+ Kontennamen in der Kontenhierarchie. Alternativ können Sie auch den Kontennamen in der Kontenhierarchie,
+ markieren und gelangen durch Auswahl der <guibutton>Öffnen</guibutton> Taste in der
+ <emphasis>Werkzeugleiste</emphasis> oder das Optionsmenü (rechte Maustaste) zur Buchungsansicht.
+ <application>&app;</application> zeigt jetzt die Buchungsansicht an.</para>
+
+ <sect2 id="txns-registers-twoaccount2">
+ <title>Einfacher Buchung</title>
+
+ <para>Für unser Beispiel benutze wir den Kontenrahmen, den wir in dem vorherigen Kapitel
+ erstellt haben (<filename>gcashdata_3</filename>). Mit einem Doppelklick auf das Konto
+ <guilabel>Girokonto</guilabel> öffnen Sie die Buchungsansicht. Jetzt wollen wir eine
+ einfache Buchung auf dem Girokonto eingeben. Normalerweise geben sie einem Konto bei der
+ Einrichtung in <application>&app;</application> einen Anfangskontostand.</para>
+
+ <para>In der ersten Buchungszeile geben Sie bitte das Datum der Buchung ein (zum Beispiel
+ den 1.3.2013), eine Beschreibung (zum Beispiel <quote>Anfangskontostand</quote>).
+ Ein Klick auf <guilabel>Buchen</guilabel> öffnet ein Pop-Up Menü in dem sie jetzt
+ <emphasis>Eigenkapital:Anfangsbestand</emphasis> auswählen. Geben Sie eine Einzahlung
+ von 1000 € ein, und drücken Sie die <keycap function="enter">Enter</keycap> Taste.
+ Die Buchungsansicht sollte jetzt folgendermaßen aussehen:</para>
+
+ <screenshot id="txns-register-2account">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_register_2account.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Buchungsansicht - Girokonto</phrase>
+ </textobject>
+
+ <caption><para>Die Abbildung zeigt die Buchungsansicht des Kontos
+ <emphasis>Aktiva:Girokonto</emphasis> -
+ nach Eingabe eines Anfangskontostandes.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Die Eingabe eines Anfangskontostandes ist ein Beispiel für eine einfache
+ Buchung zwischen zwei Konten. In unserem Beispiel beeinflusst sie die Konten
+ <emphasis>Aktiva:Girokonto</emphasis> und <emphasis>Eigenkapital:Anfangsbestand</emphasis>.
+ </para>
+
+ <para>Als weiteres Beispiel für eine Buchung zwischen zwei Konten wollen wir jetzt eine
+ Buchung eingeben, die einen Lebensmitteleinkauf von 45,21 € beschreibt. Der Betrag wurde
+ Bar bezahlt, deshalb geben wir diese Buchung in der Buchungsansicht des Kontos
+ <emphasis>Aktiva:Bargeld</emphasis> ein. Wählen Sie bei dieser Buchung im Feld
+ <guilabel>Buchen</guilabel> den Eintrag <emphasis>Aufwand:Lebensmittel</emphasis>.
+ Die Buchungsansicht sollte jetzt folgendermaßen aussehen:</para>
+
+ <screenshot id="txns-register-2account2">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_register_2account2.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Buchungsansicht - Girokonto</phrase>
+ </textobject>
+
+ <caption><para>Die Abbildung zeigt die Buchungsansicht des Kontos
+ <emphasis>Aktiva:Bargeld</emphasis> -
+ nach Eingabe einer Buchung für Lebensmittel.</para></caption>
+ </mediaobject>
+ </screenshot>
+ </sect2>
+
+ <sect2 id="txns-registers-multiaccount2">
+ <title>Mehrteilige Buchung</title>
+
+ <para>Die Notwendigkeit für drei oder mehr Teilbuchungen in einer Buchung ergibt sich
+ wenn Sie bei einer Buchung entweder mehrere <quote>Von-</quote> oder mehrere
+ <quote>Nach-</quote> Konten angeben wollen. Ein klassisches Beispiel dafür ist
+ eine Gehaltsbuchung. Das Geldbetrag welchen Sie ausgezahlt bekommen, ist normalerweise
+ geringer als Ihr Bruttoverdienst. Der Unterschied kommt durch Lohnabzüge wie
+ Steuern, Rentenversicherung, Krankenkasse etc. zustande. Die einfache Buchung
+ Ihres Gehaltes beeinflusst deshalb neben <emphasis>Aktiva:Girokonto</emphasis> und
+ <emphasis>Ertrag:Gehalt</emphasis> auch andere Konten.</para>
+
+ <para>Um die Gehaltszahlung in der Buchungsansicht des Kontos <emphasis>Aktiva:Girokonto</emphasis>
+ einzugeben klicken Sie auf eine neue Buchungszeile und klicken dann auf
+ <guibutton>Vollständig</guibutton>.
+ Geben Sie jetzt in der ersten Zeile die Beschreibung der Buchung ein (zum Beispiel
+ <quote>Employers R Us</quote>). In die darunterliegenden Zeilen geben Sie nacheinander
+ die verschiedenen Buchungsteile ein, aus denen die Buchung besteht. Wählen Sie
+ zuerst das Konto, und geben danach den auf dieses Konto zu transferierenden
+ Betrag ein. Dann klicken Sie auf die nächste Zeile und wiederholen den Vorgang.</para>
+
+ <para>In diesem Beispiel wählen Sie als Konto für die Einzahlungen das Konto
+ (<emphasis>Aktiva:Girokonto</emphasis>) und geben dann unter Einzahlung (Soll) den eingezahlten
+ Geldbetrag an (zum Beispiel 670 €). Nachfolgend geben sie die Beträge für die verschiedenen
+ Abgaben ein:
+ Konto <emphasis>Aufwendungen:Steuern:Einkommensteuer</emphasis> 180 €;
+ Konto <emphasis>Aufwendungen:Steuern:Krankenversicherungs</emphasis> 90 €;
+ und Konto <emphasis>Aufwendungen:Steuern:Rentenversicherung</emphasis> 60 €.
+ Zum Schluss geben Sie den Bruttobetrag ihres Gehalts (1000 € in diesem Beispiel)
+ als Abhebung (Haben) von ihrem Konto <emphasis>Ertrag:Gehalt</emphasis> ein.</para>
+
+ <para>Die komplette mehrteilige Buchung sollte jetzt folgendermaßen aussehen
+ <xref linkend="txns-register-multiaccount"/>. Vergessen Sie nicht, nach Eingabe der
+ Buchungsteile, die Buchung durch Druck der Taste <keycap function="enter">Enter</keycap>
+ abzuschließen. Die Ansicht der Buchung wechselt durch Druck auf die Taste <keycap function="enter">Enter</keycap>
+ wieder auf die einzeilige Darstellung. Die Einträge der Teilbuchungen sind noch vorhanden,
+ und können durch klicken auf <guilabel>Vollständig</guilabel> wieder angezeigt werden.
+ Siehe auch <xref linkend="txns-registers-features2"/> für weitere Einzelheiten.</para>
+
+ <figure id="txns-register-multiaccount">
+ <title>Eingabe einer mehrteiligen Buchung</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_register_multiaccount.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+ <textobject>
+ <phrase>Buchungsansicht - mehrteilige Buchung</phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </sect2>
+
+ <sect2 id="txns-registers-features2">
+ <title>Funktionen der Buchungsansicht</title>
+
+ <para>Die <emphasis>Kopfzeile</emphasis> der Buchungsansicht zeigt den Namen des Kontos an,
+ in diesem Fall <emphasis>Aktiva:Girokonto</emphasis>. Die darunter befindliche
+ <emphasis>Werkzeugleiste</emphasis> enthält praktische Knöpfe für die Arbeit innerhalb der
+ Buchungsansicht.</para>
+
+ <para>Obwohl jede Buchung zumindest aus zwei Buchungsteilen besteht, ist alles was Sie normalerweise
+ sehen, die Zusammenfassung der Buchungsteile, welche das gewählte Konto betreffen.
+ In der Spalte <guilabel>Buchen</guilabel> können Sie das korrespondierende Konto sehen, von dem
+ oder zu dem Geld <emphasis>übertragen</emphasis> wird. Wenn die Buchung mehr als zwei Konten beeinflusst
+ zeigt <application>&app;</application> an dieser Stelle den Text <guilabel>-- Mehrteilige Buchung --</guilabel>
+ an, um zu dokumentieren, dass es sich bei dieser Buchung um eine mehrteilige Buchung handelt.
+ Sie können sich die einzelnen Buchungsteile zu jeder Buchung anzeigen lassen, indem sie
+ die gewünschte Buchung anwählen, und danach auf die Taste <guibutton>Vollständig</guibutton>
+ in der Werkzeugleiste drücken.</para>
+
+ <para>
+ Bei mehrteiligen Buchungen ist die erste Zeile der Buchung die <emphasis>Buchungszeile</emphasis>.
+ Sie enthält ein <guilabel>Datum</guilabel>, optional eine <guilabel>Nummer</guilabel>
+ (zum Beispiel eine Schecknummer oder eine Buchungsnummer), eine <guilabel>Beschreibung</guilabel>
+ der Buchung, den Gesamtbetrag, der das gewählte Konto beeinflusst (in unserem Beispiel
+ <guilabel>Gesamt Einzahlung</guilabel>), und den aktualisierten <guilabel>Kontostand</guilabel>
+ nach der Buchung. Beachten Sie, dass in der vollständigen Ansicht die Spaltenüberschrift
+ <guilabel>Buchen</guilabel> verschwindet, und in diesem Feld auch kein Kontoname angegeben wird.
+ Die <emphasis>Buchungszeile</emphasis> zeigt ihnen lediglich die Auswirkung der Buchung
+ auf das angezeigte Konto. Für Einzelheiten müssen Sie die zu Grunde liegenden
+ Buchungsteile betrachten.</para>
+
+ <para>Die Teilzeilen unter der Buchungszeile sind die <emphasis>Buchungsteil-Zeilen</emphasis>.
+ Sie werden durch graue Linien voneinander getrennt. Wenn Sie einen Buchungsteil markieren
+ ändern sich die Spaltenüberschriften, um die den Buchungsteil betreffenden Felder anzuzeigen:</para>
+
+ <screenshot id="txns-registersplit2">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_registersplit2.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Wie sich Spaltenüberschriften für Buchungsteile ändern</phrase>
+ </textobject>
+
+ <caption><para>Dieses Bild zeigt, wie sich Spaltenüberschriften
+ für Buchungsteile ändern.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Jeder Buchungsteil enthält ein optionales Feld <guilabel>Aktion</guilabel>, oder
+ Art des Buchungsteils, welches sie entweder durch eintippen, oder durch Auswahl
+ in einer Auswahlliste eingeben können. Weiterhin enthält er ein optionales
+ Feld <guilabel>Buchungstext</guilabel> welches den Buchungsteil beschreibt.
+ Jeder Buchungsteil beeinflusst ein <guilabel>Konto</guilabel>, welches aus einer
+ mit Ihren Kontenbezeichungen gefüllten Auswahlliste gewählt werden kann.
+ Das Feld <guilabel>J</guilabel> zeigt an, ob ein Buchungsteile schon abgeglichen wurde.
+ die letzten zwei Spalten zeigen den Betrag des Buchungsteils, und ob das Geld
+ auf das Konto (Soll), oder von dem Konto (Haben) transferiert wurde.</para>
+
+ <para>Wie schon in Kapitel <xref linkend="basics-accounting1" /> besprochen,
+ muss für jede Buchung die Gesamt-Zunahme (Beträge in der linken Spalte oder das Soll)
+ gleich der Gesamt-Abname (Beträge in der rechten Spalte oder Haben) sein.
+ im oben oben gezeigten Beispiel ist die Gesamt-Zunahme gleich der Gesamt-Abnahme,
+ die Buchung ist also ausgeglichen. Wie Sie feststellen können, ist der Geldbetrag
+ in der Buchungszeile derselbe wie unter Buchungsteil <guilabel>Girokonto</guilabel>.
+ Warum wird dieser zweimal gezeigt? Weil die Buchungszeile lediglich eine
+ <emphasis>Zusammenfassung</emphasis> des Effekts der Buchung auf das zur Zeit
+ angezeigte Konto darstellt. Die Buchungszeile derselben Buchung in der Buchungsansicht
+ eines anderen Kontos wurde den Effekt der Buchung auf das jeweilige Konto anzeigen.
+ Sie können das sehen, indem sie einen anderen Buchungsteil markieren, und auf den Knopf
+ <guibutton>Gegenbuchung</guibutton> in der <emphasis>Werkzeugleiste</emphasis> klicken.</para>
+
+ <para>Wenn Sie in diesem Beispiel zur Gegenbuchung im Konto <emphasis>Ertrag:Gehalt</emphasis>
+ gehen, zeigt Ihnen <application>&app;</application> dieselbe Buchung in der Buchungsansicht
+ des Kontos <emphasis>Ertrag:Gehalt</emphasis>:</para>
+
+ <screenshot id="txns-registersplit3">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_registersplit3.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Die Gegenbuchung im <emphasis>Ertrag:Gehalt</emphasis> Konto</phrase>
+ </textobject>
+
+ <caption><para>Dieses Bild zeigt Ihnen die Gegenbuchung in der Buchungsansicht des Kontos
+ <emphasis>Ertrag:Gehalt</emphasis>.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Beachten Sie, dass die Buchungszeile jetzt die Zusammenfassung der Auswirkungen
+ auf das Konto <emphasis>Ertrag:Gehalt</emphasis> und nicht mehr auf das Konto
+ <emphasis>Aktiva:Girokonto</emphasis> darstellt, da Sie jetzt die Buchungsansicht
+ des Kontos <emphasis>Ertrag:Gehalt</emphasis> betrachten. Die Teilbuchungen sind
+ die Selben, aber die Buchungszeile stellt jetzt den Einfluss auf das Konto
+ <emphasis>Ertrag:Gehalt</emphasis> dar.</para>
+
+ <para>At the bottom left of the register window, <application>&app;</application> displays
+ helpful messages as you move about the register. To the right, you can
+ see the current account balance and the total of cleared splits.</para>
+ </sect2>
+
</sect1>
+
+ <sect1 id="txns-regstyle1">
+ <title>Einstellungen Buchungsansicht</title>
+
+ <para><application>&app;</application> bietet mehrere Optionen die Buchungsansicht anzuzeigen.
+ Die Standardeinstellung ist <guilabel>Einzeilig</guilabel>, diese zeigt lediglich die
+ Zusammenfassung der Buchungsteile, die das gewählte Konto beeinflussen. Diese Ansicht
+ ähnelt der Ansicht der meisten anderen Buchführungsprogramme.</para>
+
+ <para>Sie können auch eine andere Ansicht wählen. Indem sie z.B.
+ <menuchoice>
+ <guimenu>Ansicht</guimenu>
+ <guimenuitem>Aktive-vollständig</guimenuitem>
+ </menuchoice> auswählen wird die jeweils gewählte Buchung automatisch mit all ihren
+ Buchungsteilen angezeigt.
+ Die Auswahl
+ <menuchoice>
+ <guimenu>Ansicht</guimenu>
+ <guimenuitem>Vollständig</guimenuitem>
+ </menuchoice> zeigt die Buchungsansicht im Stil eines Buchungsjournals, in dem alle
+ Buchungsteile für alle Buchungen dargestellt werden.</para>
+
+ <!--
+
+ beschriebene Option kann nicht gefunden werden 2.4.13
+ <para>All styles permit you to view your data in either single-line or
+ double-line format. Select <menuchoice><guimenu>View</guimenu>
+ <guimenuitem>Double Line</guimenuitem></menuchoice>, and you will see your transaction
+ line expand to two register lines.</para>
+ -->
+
+ <para>Wir wollen jetzt genauer betrachten, wie sich die einzeilige Darstellung und die
+ vollständige Darstellung unterscheiden.
+ </para>
+ <para>Für dieses Beispiel wollen wir annehmen, dass der Kontostand ihres Girokontos 10.000 €
+ beträgt, und Sie in einer Kauforgie drei Jeans für zusammen 1000 € gekauft haben.
+ Sie haben mit Scheck gezahlt, deshalb wird der Kauf auf dem Girokonto gebucht.
+ Sie können diesen Kauf jetzt entweder als einfache Buchung von 1000 € auf das Konto
+ <emphasis>Aufwendungen:Kleidung</emphasis> buchen, oder Sie können den Kauf jeder einzelnen
+ Jeans innerhalb einer mehrteiligen Buchung buchen.</para>
+
+ <para>Im Prinzip kommt es auf dasselbe raus, aber vom buchhalterischen Standpunkt ergibt eine
+ Buchung jeder einzelnen Jeans innerhalb einer mehrteiligen Buchung, drei unterschiedliche
+ Buchungen auf dem Konto <emphasis>Aufwand:Kleidung</emphasis>.</para>
+
+ <para>Die folgenden Bilder werden das etwas besser verdeutlichen.</para>
+
+ <para>Lassen Sie uns zuerst den Kauf der Jeans auf Ihrem Girokonto buchen</para>
+
+ <screenshot id="txns-registersplit4">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_registersplit4.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Kauf von drei Jeans</phrase>
+ </textobject>
+
+ <caption><para>
+ Dieses Bild zeigt eine mehrteilige Buchung über den Kauf von 3 Jeans
+ </para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Dann öffnen wir das Konto <emphasis>Aufwand:Kleidung</emphasis>, und betrachten es in
+ der Standardansicht (einzeilige Ansicht). Wie Sie sehen können, haben wir hier drei Einträge,
+ aber es gibt nur einen Eintrag auf dem Girokonto. Bei genauerer Betrachtung sehen Sie, dass
+ jede Zeile einen unterschiedlichen Betrag (Preis der Jeans) aufweist, 200 €, 300 €, und 500 €.
+ Jede der genannten Buchungszeilen entspricht einer Zeile in das Splitbuchung.</para>
+
+ <screenshot id="txns-registersplit5">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_registersplit5.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Ansicht des Kontos <emphasis>Aufwand:Kleidung</emphasis></phrase>
+ </textobject>
+
+ <caption><para>Dieses Bild zeigt das Konto <emphasis>Aufwand:Kleidung</emphasis>
+ in der Standardansicht.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Wenn wir das Konto <emphasis>Aufwand:Kleidung</emphasis> jetzt in der
+ vollständigen Ansicht betrachten, sehen Sie nur die originale mehrteilige Buchung.</para>
+
+ <screenshot id="txns-registersplit6">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Ansicht des Kontos <emphasis>Aufwand:Kleidung</emphasis></phrase>
+ </textobject>
+
+ <caption><para>Dieses Bild zeigt das Konto <emphasis>Aufwand:Kleidung</emphasis>
+ in der vollständigen Ansicht.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+
+ </sect1>
+
+ <sect1 id="txns-shortcuts1">
+ <title>Die Benutzung von Tastaturkürzeln</title>
+
+ <para><application>&app;</application> stellt verschiedene zeitsparende Tastaturkürzel
+ für die Dateneingabe zur Verfügung. Wenn Sie die ersten Buchstaben einer Beschreibung,
+ eingeben, die Sie vorher schon einmal verwendet haben, dann ergänzt die Ausfüllhilfe
+ automatisch die einzugebende Beschreibung zu der passenden zuletzt eingegebenen
+ Beschreibung. Wenn Sie die ersten Buchstaben eines Kontonamens entweder im Feld
+ <guilabel>Buchen</guilabel> in der Buchungszeile oder im Feld <guilabel>Konto</guilabel>
+ in der Zeile der Teilbuchungen eingeben, versucht die Ausfüllhilfe automatisch den Namen
+ entsprechend ihrer Kontenliste zu ergänzen. Sie hilft auch bei der Eingabe von Unterkonten
+ in diese Felder: geben Sie dafür die Anfangsbuchstaben des Hauptkontos gefolgt von einem :
+ und den ersten Buchstaben des Unterkontos ein. Zum Beispiel können Sie für die Eingabe
+ von <emphasis>Aktiva:Girokonto</emphasis> folgendes eingeben:
+ <userinput>A:G</userinput> und <application>&app;</application>
+ den Rest ergänzen lassen.</para>
+
+ <para><application>&app;</application> verfügt in der Buchungsansicht auch über verschiedene
+ Tastaturkürzel, die Ihnen bei der Eingabe viel Zeit und Mühe sparen können. Im Datumsfeld
+ können folgende Tastaturkürzel verwenden werden:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><keycap>+</keycap> oder <keycap>=</keycap> um zum nächsten Tag zu gehen
+ und <keycap>-</keycap> oder <keycap>_</keycap> um zum vorherigen Tag zu gehen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>]</keycap> oder <keycap>}</keycap> um zum nächsten Monat zu gehen
+ und <keycap>[</keycap> oder <keycap>{</keycap> um zum vorherigen Monat zu gehen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>M</keycap> oder <keycap>m</keycap> um zum ersten Tag eines Monats zu gehen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>H</keycap> oder <keycap>h</keycap> um zum letzten Tag eines Monats zu gehen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>Y</keycap> oder <keycap>y</keycap> um zum ersten Tag eines Jahres zu gehen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>R</keycap> oder <keycap>r</keycap> um zum letzten Tag eines Jahres zu gehen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>T</keycap> oder <keycap>t</keycap> um zum heutigen Datum zu gehen</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Im Feld <guilabel>Nr.</guilabel> einer Buchungszeile können Sie die Taste <keycap>+</keycap>
+ verwenden um die nächsthöheren Buchungsnummer einzugeben genauso wie die Taste <keycap>-</keycap>
+ um die Buchungsnummer um eins zu vermindern. Das funktioniert auch im Feld <guilabel>Aktion</guilabel>
+ einer mehrteiligen Buchung, für den Fall dass Sie auch hier nummerieren wollen. Das Feld
+ <guilabel>Aktion</guilabel> hat auch eine Ausfüllhilfe - wenn Sie die Anfangsbuchstaben
+ einer normalen Aktion, wie zum Beispiel <guilabel>Einzahlung</guilabel> eingeben, wird
+ <application>&app;</application> den Rest ergänzen.</para>
+
+ <para>Das Feld <guilabel>Buchen</guilabel> besitzt eine Ausfüllhilfe für Kontonamen.
+ Geben Sie die Anfangsbuchstaben das Kontonamens ein, und <application>&app;</application>
+ ergänzt den fehlenden Teil des Namens. Wenn sie (zu einem beliebigen Zeitpunkt) das
+ Trennzeichen (:) eingeben, wird der bisher gewählte Teil des Namens abgeschlossen,
+ und mit der Auswahl des Unterkontos begonnen. zum Beispiel wird die Eingabe <keycap>A:G</keycap>
+ in unserem Beispielkontorahmen ergänzt zum Konto <emphasis>Aktiva:Girokonto</emphasis>.
+ Sie können auch die Tasten <keycap>Menü</keycap> oder
+ <keycombo><keycap>Ctrl</keycap><keycap>Down</keycap></keycombo> in diesem Feld drücken,
+ um eine Auswahlliste aller Kontonamen zu erhalten.</para>
+
+ <para>In jedem der eingebauten Betragsfelder können Sie den eingebauten Rechner benutzen.
+ Geben Sie dazu den ersten Wert gefolgt von <keycap>+</keycap>, <keycap>-</keycap>,
+ <keycap>*</keycap>, oder <keycap>/</keycap>, gefolgt von dem zweiten Wert ein.
+ <application>&app;</application> errechnet das Ergebnis und gibt es im Betragsfeld aus,
+ sobald Sie die <keycap>Tab-</keycap>Taste betätigen.</para>
+
+ <para>Für alle Menüpunkte sind Tastaturkürzel definiert, die durch den unterstrichenen
+ Buchstaben in der Bezeichnung gekennzeichnet sind. Drücken Sie die Taste
+ <keycap>Alt</keycap> + [unterstrichenen Buchstaben] um das Menü zu öffnen, und wählen
+ dann einen Eintrag durch Drücken des unterstrichenen Buchstabens. Zum Beispiel öffnet
+ <keycombo>
+ <keycap>Alt</keycap>
+ <keycap>k</keycap>
+ </keycombo> das Aktionenmenü, ein weiterer Druck auf <keycap>m</keycap> öffnet die
+ Buchung in der vollständigen Ansicht. Einigen Menüpunkten sind zusätzlich Tastaturkürzel
+ für den direkten Aufruf zugeordnet (normalerweise im Zusammenspiel mit der
+ <keycap>Ctrl</keycap> Taste). Diese Kürzel werden hinter dem Menüpunkt angegeben.</para>
+
+ <para>Um sich schnell innerhalb der Buchungsansicht bewegen zu können, benutzen Sie folgende
+ Tasten:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><keycap>Tab</keycap> um zum nächsten Feld zu gelangen,
+ <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>
+ um zum vorherigen Feld zu gelangen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>Pos1</keycap> um zum Anfang des gewählten Feldes zu gelangen,
+ <keycap>End</keycap> um zum Ende des Gewähltenfeldes zu gelangen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap function="enter">Enter</keycap> oder <keycap>↓</keycap>
+ um zur nächsten Buchung zu gelangen, <keycap>↑</keycap> um zur vorherigen
+ Buchung zu gelangen</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>Page Up</keycap> um eine Seite hoch zu blättern, <keycap>Page
+ Down</keycap> um eine Seite herunter zu blättern</para>
+ </listitem>
+
+ <listitem>
+ <para><keycombo>
+ <keycap>Shift</keycap>
+
+ <keycap>Page Up</keycap>
+ </keycombo> um zur ersten Buchung zu gehen, <keycombo>
+ <keycap>Shift</keycap>
+
+ <keycap>Page Down</keycap>
+ </keycombo> um zur letzten Buchung zu gehen</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Im Fenster <guilabel>Abgleichen</guilabel> können sie folgende Tastaturkürzel
+ nutzen:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><keycap>Tab</keycap> bringt Sie zur nächsten Liste und
+ <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>
+ zur vorherigen Liste</para>
+ </listitem>
+
+ <listitem>
+ <para>Die Leertaste schaltet den Status der Buchung zwischen abgeglichen und
+ nicht abgeglichen hin und her.</para>
+ </listitem>
+
+ <listitem>
+ <para><keycap>↑</keycap> und <keycap>↓</keycap> bewegt die Markierung
+ innerhalb der gewählten Liste.</para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+
<sect1 id="txns-reconcile1">
- <title>...</title>
- <para></para>
+ <title>Kontoabgleich</title>
+
+ <para>Buchungen werden normalerweise mit vorliegenden Kontoauszügen der Bank
+ verglichen - ein Vorgang, der als <emphasis>Abstimmung</emphasis> oder
+ <emphasis>Abgleich</emphasis> bekannt ist. <application>&app;</application>
+ behält den Überblick über den Abgleichstatus einer jeden Buchung.</para>
+
+ <para>Der Abgleichzustand einer Buchung wird im Feld <guilabel>J</guilabel> in der
+ Buchungsansicht angezeigt. Der Buchstabe <emphasis>b</emphasis> zeigt an, dass eine
+ Buchung bereits abgeglichen ist, ein <emphasis>n</emphasis> zeigt an, dass ein Abgleich
+ noch nicht erfolgt ist, und <emphasis>b</emphasis> zeigt an, dass die Buchung gelöscht
+ aber noch nicht abgeglichen ist. Durch Klicken in das Feld <guilabel>J</guilabel> der
+ Buchung können Sie zwischen den Zuständen <emphasis>n</emphasis> und <emphasis>b</emphasis>
+ umschalten. Sie können den Zustand auf <emphasis>y</emphasis> setzen, indem Sie den
+ Dialog <guilabel>Abgleichen</guilabel> verwenden.</para>
+
+ <para>Am unteren Ende der Buchungsansicht gibt es Anzeigen für verschidene Kontostände.
+ Während die Anzeigen <guilabel>Bestätigt</guilabel> und <guilabel>Abgeglichen</guilabel>
+ Ihre Finanzen aus Sicht der Bank (aufgrund eingegangener Zahlungsbelege)
+ darstellen, werden unter <guilabel>Aktueller Wert</guilabel> auch offene
+ d.h. der Bank noch nicht mitgeteilte Finanztransaktionen berücksichtigt.</para>
+
+ <para>Wenn Sie z.B. einen Scheck für irgend etwas ausstellen, sollten Sie dies in
+ <application>&app;</application> buchen. Das Feld Abgleich (<guilabel>J</guilabel>)
+ der Buchung enthält am Anfang den Wert <guilabel>n</guilabel> (neu). Die neue
+ Buchung trägt zum Kontostand <guilabel>Aktueller Wert</guilabel> bei, aber nicht
+ zum Konstostand <guilabel>Bestätigt</guilabel> und <guilabel>Abgeglichen</guilabel>.
+ Später, wenn Sie annehmen, dass der Scheck eingelöst wurde, können Sie auf das Feld
+ Abgleich (<guilabel>J</guilabel>) dieser Buchung klicken, um den Wert auf
+ <emphasis>b</emphasis> umzustellen (bestätigt). Sobald Sie das tun ändert sich der
+ Kontostand in der Anzeige <guilabel>Bestätigt</guilabel> um jetzt auch diese
+ Transaktion zu berücksichtigen. Wenn der Kontoauszug eintrifft, können Sie dann
+ Ihre in <application>&app;</application> eingegebenen Buchungsdaten mit denen der Bank
+ vergleichen. Im Dialog Kontoabgleich können Sie die Übereinstimmung der von der Bank
+ gebuchten Transaktionen und damit den Wert im Feld <guilabel>J</guilabel> auf
+ <emphasis>j</emphasis> (abgeglichen) ändern.</para>
+
+ <note>
+ <para>Sie können Buchungen nicht direkt in der Buchungsansicht abgleichen, sondern müssen
+ das Fenster Kontoabgleich nutzen. Sobald eine Buchung als <emphasis>Abgeglichen</emphasis>
+ gekennzeichnet wurde, kann sie nicht mehr so einfach geändert werden, ohne dass der
+ <link linkend="rec-start-blnc">
+ <guilabel>Anfangskontostand</guilabel>
+ </link>
+ des nächsten Kontoabgleichs abweicht.</para>
+ </note>
+
+ <sect2 id="txns-reconcile-window2">
+ <title>Abgleichsdialog</title>
+
+ <para>Der Abgleichsdialog wird verwendet, um ein <application>&app;</application> Konto in
+ Ãœbereinstimmung zu bringen mit einem Kontoauszug den Sie von einer Bank oder einer anderen
+ Finanzinstitution bekommen haben. Ein Kontoabgleich ist nicht nur nützlich um Ihre
+ Buchführung mit der Ihrer Bank zu überprüfen, sondern auch, um ein besseres Verständnis
+ von offenen Geschäftsvorfällen zu erhalten, z.B. noch nicht eingelösten Schecks.</para>
+
+ <para>Um den Abgleichsdialog zu öffnen wählen Sie ein Konto in Ihrem Kontenrahmen und klicken
+ auf den Menüpunkt <menuchoice><guimenu>Aktionen</guimenu><guimenuitem>Abgleichen</guimenuitem></menuchoice>.
+ Das untenstehende Fenster erscheint, in welchem Sie die Informationen für den Kontoabgleich
+ eingeben können.</para>
+
+ <screenshot id="txns-reconcile-window-1">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_reconcile_window1.png"
+ format="PNG" srccredit="Cristian Marchi"></imagedata>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_reconcile_window1.png"
+ format="PNG" srccredit="Cristian Marchi"></imagedata>
+ </imageobject>
+
+ <textobject>
+ <phrase>Abgleichsfenster</phrase>
+ </textobject>
+
+ <caption><para>Das Anfangsfenster des Kontoabgleichs.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>In dem Anfangsfenster des Kontoabgleichs müssen einige <guilabel>Abgleichsparameter</guilabel>
+ eingegeben werden.</para>
+ <variablelist>
+ <varlistentry><term><guilabel>Datum des Kontoauszugs</guilabel></term>
+ <listitem>
+ <para>Das Datum bis zu dem der Abgleich erfolgen soll.</para>
+ <tip>
+ <para>Um einen Kalender zu öffnen klicken Sie auf den Pfeil nach unten rechts neben dem Eingabefeld.</para>
+ </tip>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="rec-start-blnc"><term><guilabel>Anfangssaldo</guilabel></term>
+ <listitem>
+ <para>Dies ist ein vorgegebener Wert, der den Kontostand des letzten Abgleichs
+ anzeigt. Dieser Wert sollte mit dem Anfangskontostand Ihres Kontoauszugs
+ übereinstimmen.</para>
+
+ <note>
+ <para>Manchmal stimmt der Anfangssaldo in <application>&app;</application> nicht
+ mit dem von Ihrer Bank übermittelten überein. Dies tritt beim ersten Abgleich des
+ Kontos auf, oder wenn bereits abgeglichene Buchungen verändert oder gelöscht wurden.</para>
+ </note>
+
+ <para>Beim ersten Abgleich Ihres Kontos beträgt der <guilabel>Anfangssaldo</guilabel>
+ <guilabel>0.00</guilabel>. Dies ist höchstwarscheinlich nicht der <emphasis>Anfangskontostand</emphasis>
+ Ihres Kontos. Beim Abgleich wird der <emphasis>Anfangskontostand</emphasis> des Kontos
+ im Abgleich berüchsichtigt, und das Ergebnis sollte ausgeglichen sein.</para>
+
+ <para>Im Falle dass eine vorher abgeglichene Buchung versehendlich de-reconciled wurde
+ können Sie einfach die Buchung zusammen mit den anderen Buchungen im jetzigen
+ Kontoauszug re-reconcile und das Ergebnis sollte ausgeglichen sein.</para>
+
+ <para>Die Korrektur von versehendlich gelöschten bereist abgeglichenen Buchungen ist eine
+ größere Herausforderung. Falls Sie nicht mehr feststellen können welche Buchung gelöscht
+ wurde, und Sie sie deshalb nicht mehr wieder eingeben können müssen Sie eine Dummy-Buchung
+ einfügen, um den Kontoabgleich abzuschliessen.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Schlußsaldo</guilabel></term>
+ <listitem>
+ <para>In dieses Feld sollte der Schlussaldo des Kontoauszugs Ihrer Bank eingetragen werden.</para>
+ <note>
+ <para><application>&app;</application> trägt in dieses Feld automatisch den im
+ unteren Teil der Kontoansicht angezeigten <guilabel>aktuellen Wert</guilabel> ein.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Unterkonten mit einbeziehen</guilabel></term>
+ <listitem>
+ <para>Wählen Sie diese Option, wenn Sie in dem Abgleich auch Buchungen von
+ Unterkonten des gewählten Kontos berücksichtigen möchten.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guibutton>Zahlung Habenzins eingeben...</guibutton></term>
+ <listitem>
+ <para>Ein Klick auf diesen Knopf öffnet das Fenster <guilabel>Habenzinsen</guilabel>
+ zur Eingabe einer Zinsbuchung in das abzugleichenden Konto.</para>
+ <tip>
+ <para>Das Fenster <guilabel>Habenzinsen</guilabel> kann auch beim Abgleich
+ eines Kontos vom Typ <emphasis>Bank</emphasis>, <emphasis>Kreditkarte</emphasis>,
+ <emphasis>Mutual</emphasis>, <emphasis>Aktiva</emphasis>, <emphasis>Offene Forderungen</emphasis>,
+ <emphasis>Offene Verbindlichkeiten</emphasis>, und <emphasis>Fremdkapital</emphasis>
+ automatisch geöffnet werden.
+ Wenn Sie dieses Verhalten für alle vorgenannten Kontentypen ausschalten wollen,
+ entfernen Sie die Markierung bei der Option <guilabel>Automatisch Zinsbuchungen</guilabel>
+ auf der Karteikarte <guilabel>Kontobuch</guilabel> im Fenster <guilabel>&app; Einstellungen</guilabel>.
+ Um nur das Verhalten für das gewählte Konto auszuschalten drücken Sie den Knopf
+ <guibutton>Keine automatischen Habenzins-Zahlungen für dieses Konto</guibutton> im Fenster
+ <guilabel>Habenzinsen</guilabel>.</para>
+ </tip>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>Drücken Sie die Taste <guibutton>Ok</guibutton>, und es erscheint das Fenster
+ mit der Buchungsliste zum Abgleich:</para>
+
+ <screenshot id="txns-reconcile-window-2">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_reconcile_window2.png"
+ format="PNG" srccredit="Cristian Marchi" width="510"></imagedata>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_reconcile_window2.png"
+ format="PNG" srccredit="Cristian Marchi"></imagedata>
+ </imageobject>
+
+ <textobject>
+ <phrase>Fenster Abgleichen</phrase>
+ </textobject>
+
+ <caption><para>Die Liste der Buchungen im Fenster Kontoabgleich.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Die zwei Fensterbereiche mit Namen <guilabel>Gutschrift</guilabel> und
+ <guilabel>Belastung</guilabel>, listen alle nicht abgeglichen Buchungen auf, die
+ zu dem abzugleichenden Konto gehören. Die Spalte <guilabel>J</guilabel> zeigt an,
+ ob die Buchungen bereits abgeglichen sind.</para>
+
+ <para>Betrachten Sie jetzt jeden Eintrag in Ihrem Kontoauszug, und suchen den passenden
+ Eintrag im Fenster <guilabel>Abgleichen</guilabel>.</para>
+
+ <para>Falls Sie eine Buchung nicht finden, haben Sie vielleicht vergessen sie einzugeben,
+ oder es war Ihnen unbekannt, dass die Buchung stattgefunden hat. Sie können die Taste
+ <guibutton>Neu</guibutton> in der <emphasis>Werkzeugleiste</emphasis> benutzen, oder den Menüeintrag
+ <menuchoice><guimenu>Buchung</guimenu><guimenuitem>Neu</guimenuitem></menuchoice>
+ in der Menüleiste, um in der Buchungsansicht die fehlende Buchung einzugeben.
+ Sobald Sie die Eingabe der Buchung durch Drücken der Taste <guibutton>Enter</guibutton>
+ abgeschlossen haben erscheint der Eintrag im Fenster <guilabel>Abgleichen</guilabel>.</para>
+
+ <para>Für jeden Eintrag im Fenster <guilabel>Abgleichen</guilabel> vergleichen Sie jetzt den
+ Betrag mit dem Betrag in Ihrem Kontoauszug. Wenn beide Einträge nicht übereinstimmen, haben
+ Sie vielleicht einen Fehler bei der Eingabe der Transaktion in <application>&app;</application>
+ gemacht. Sie können in diesem Fall die Taste <guibutton>Bearbeiten</guibutton> in der
+ <emphasis>Werkzeugleiste</emphasis> drücken, oder den Menüeintrag
+ <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Bearbeiten</guimenuitem></menuchoice>
+ benutzen um die Buchangsansicht zu öffnen und die Buchung zu korrigieren.</para>
+
+ <para>Wenn die Beträge übereinstimmen, klicken Sie auf den Eintrag im Fenster <guilabel>Abgleichen</guilabel>.
+ Die gewählte Transaktion wird durch ein Häkchen in der Spalte <guilabel>J</guilabel> markiert.
+ <application>&app;</application> aktualisiert automatisch die Beträge im Zusammenfassungsbereich
+ unten rechts.</para>
+
+ <tip>
+ <para>Sie können die Pfeiltasten <keycap>hoch</keycap>/<keycap>runter</keycap>
+ benützen, um zu einem Eintrag zu gelangen, die <keycap>Leertaste</keycap> um einen
+ Eintrag als Abgeglichen zu markieren und die <keycap>Tab</keycap> Taste um zwischen
+ den Bereichen umzuschalten.</para>
+ </tip>
+
+ <para>Diesen Vorgang wiederholen Sie für jeden Eintrag auf dem Kontoauszug, bestätigen
+ dass der Betrag mit Ihrer Buchungen in <application>&app;</application> übereinstimmt,
+ und haken die Buchung in <application>&app;</application> als abgeglichen ab.</para>
+
+ <para>Unten rechts gibt im Fenster <guilabel>Abgleichen</guilabel> gibt es ein Feld
+ <guilabel>Differenz</guilabel>, welches den Betrag <guilabel>0.00</guilabel> aufweisen
+ sollte, wenn Sie den Abgleich abgeschlossen haben. Wenn dort ein anderer Wert auftritt,
+ dann haben Sie entweder Buchungen ausgelassen, oder einige Buchungsbeträge wurden falsch
+ in <application>&app;</application> eingegeben, oder (was etwas unwahrscheinlicher ist)
+ die Bank hat einen Fehler gemacht.</para>
+
+ <para>Nachdem Sie alle Einträge auf dem Kontoauszug abgehakt haben, und die
+ Differenz 0.00 ist, drücken Sie den Eintrag <guibutton>Fertig</guibutton> auf
+ der <emphasis>Werkzeugleiste</emphasis> oder wählen den Eintrag
+ <menuchoice><guimenu>Abgleichen</guimenu><guimenuitem>Fertig</guimenuitem></menuchoice>
+ aus dem Menü. Das Fenster <guilabel>Abgleichen</guilabel> schließt sich.
+ In der Buchungsansicht ändert sich der Wert im Feld <guilabel>J</guilabel> der
+ abgeglichenen Buchungen auf <emphasis>j</emphasis>.</para>
+
+ <para>Im dargestellten Fall haben wir noch nicht alle Informationen erhalten, deshalb
+ drückenso wir den Eintrag <guibutton>Unterbrechen</guibutton> in der Werkzeugleiste,
+ damit wir zu einem späteren Zeitpunkt mit dem Abgleich fortfahren können.
+ Beachten Sie, dass in der Spalte <guilabel>J</guilabel> zwei Einträge als
+ bestätigt (<emphasis>b</emphasis>) gekennzeichnet werden. Sie wurden noch nicht
+ abgeglichen, aber diese zwei Buchungen wurden bestätigt. Wenn Sie sich die
+ <emphasis>Statusleiste</emphasis> am unteren Rand der Buchungsansicht ansehen,
+ finden Sie eine Zusammenfassung dessen was bestätigt wurde, und was abgeglichen
+ wurde (<guilabel>Bestätigt: 954.79€ Abgeglichen: 0.00€</guilabel>)</para>
+
+ <screenshot id="txns-reconcile-window-3">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_reconcile_window3.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Girokonto</phrase>
+ </textobject>
+
+ <caption><para>Das Girokonto nach Unterbrechen des Kontoabgleichs.</para></caption>
+ </mediaobject>
+ </screenshot>
+ </sect2>
</sect1>
+
+ <sect1 id="txns-sxn1">
+ <title>Terminierte Buchungen</title>
+
+ <para>Terminierte Buchungen werden verwendet, um wiederkehrende Finanztransaktionen
+ wie zum Beispiel Abonnements, Versicherungsbeiträge, Mietzahlungen einzugeben.
+ Durch Verwendung von terminierten Buchungen brauchen sie die betreffende Buchung
+ nur einmal zusammen mit einigen Parametern wie Startdatum, Ausführungsdatum und
+ Frequenz und einer kleinen Beschreibung einzugeben, dann erinnert <application>&app;</application>
+ Sie an die Fälligkeit einer Buchung, und erstellt sie für Sie.</para>
+
+ <para>In diesem Leitfaden nutzen wir ein monatliches Internetabo über 20 € mit
+ Ausführungsdatum am 28. eines jeden Monats als Beispiel.
+ </para>
+
+ <para>In <application>&app;</application> gibt es zwei Wege um terminierte Buchungen
+ anzulegen, <link linkend="txns-sxn-ledger2">in der Buchungsansicht</link> oder durch
+ den Editor für terminierte Buchungen
+ <link linkend="txns-sxn-editor2">Terminierte Buchungen Editor</link>.</para>
+
+ <sect2 id="txns-sxn-ledger2">
+ <title>Erstellung in der Buchungsansicht</title>
+
+ <para>Geben Sie das erste Auftreten Ihrer terminierten Buchungen in der Buchungsansicht
+ ein. Im Feld <guilabel>Buchen</guilabel> der Buchung geben Sie
+ <emphasis>Aufwendungen:Internet</emphasis> ein, wie es in der nächsten Abbildung gezeigt
+ wird.</para>
+
+ <screenshot id="txns-sxn-ledger-1">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_sxn_ledger1.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Erster Schritt zur Erstellung einer terminierten Buchung
+ in der Buchungsansicht</phrase>
+ </textobject>
+
+ <caption><para>
+ Erster Schritt zur Erstellung einer terminierten Buchung
+ in der Buchungsansicht</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <note>
+ <para>Da wir das Konto <emphasis>Aufwendungen:Internet</emphasis> noch nicht
+ erstellt haben, fordert uns <application>&app;</application> auf es anzulegen.</para>
+ </note>
+
+ <para>Klicken Sie dann mit der rechten Maustaste auf diese Buchung, und wählen
+ <guilabel>Terminiert...</guilabel></para>
+
+ <screenshot id="txns-sxn-ledger-2">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_sxn_ledger2.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Zweiter Schritt zur Erstellung einer terminierten Buchung
+ in der Buchungsansicht</phrase>
+ </textobject>
+
+ <caption><para>Zweiter Schritt zur Erstellung einer terminierten Buchung
+ in der Buchungsansicht</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Es erscheint folgendes Fenster:</para>
+
+ <screenshot id="txns-sxn-ledger-3">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_sxn_ledger3.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Dritter Schritt zur Erstellung einer terminierten Buchung
+ in der Buchungsansicht</phrase>
+ </textobject>
+
+ <caption><para>Dritter Schritt zur Erstellung einer terminierten Buchung
+ in der Buchungsansicht</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Jetzt wollen wir die Daten der Buchung eintragen. Wir wissen, dass die
+ Zahlung des Abo am 28. jedes Monats erfolgt, und die nächste Ausführung
+ im nächsten Monat stattfindet (wir haben diesen Monat ja schon manuell gebucht):</para>
+
+ <screenshot id="txns-sxn-ledger-4">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_sxn_ledger4.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Eintrag der Daten einer terminierten Buchung</phrase>
+ </textobject>
+
+ <caption><para>Eintrag der Daten einer terminierten Buchung</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Klicken Sie auf den Knopf <guibutton>OK</guibutton>, um die Eingabe der terminierten
+ Buchung abzuschließen. <application>&app;</application> hat diese Buchung jetzt gespeichert
+ und wird am 28. des nächsten Monats fragen, ob die Buchung automatisch erstellt werden soll
+ (siehe auch die Abbildung weiter unten).</para>
+ </sect2>
+
+ <sect2 id="txns-sxn-editor2">
+ <title>Erstellung im Editor für terminierte Buchungen</title>
+
+ <para>Ein anderer Weg der Eingabe von terminierten Buchungen ist die Eingabe im
+ <guilabel>Editor für terminierte Buchungen</guilabel>. Wenn wir mehrere terminierte
+ Buchungen hintereinander erstellen wollen kann das der schnellere Weg sein.</para>
+
+ <para>Wählen sie dazu in der <emphasis>Menüleiste</emphasis> des Hauptfensters den
+ Eintrag <menuchoice><guimenu>Aktionen</guimenu><guisubmenu>Terminierte Buchungen</guisubmenu>
+ <guimenuitem>Terminierte Buchungen Editor</guimenuitem></menuchoice>.
+ Eine neue Karteikarte <guilabel>Terminierte Buchungen</guilabel> wird
+ von <application>&app;</application> wie unten dargestellt im Hauptfenster angezeigt:</para>
+
+ <screenshot id="txns-sxn-editor-2">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+ srccredit="Cristian Marchi" width="510"/>
+ </imageobject>
+
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+ srccredit="Cristian Marchi"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>Leere Karteikarte <guilabel>Terminierte Buchungen</guilabel></phrase>
+ </textobject>
+
+ <caption><para>Leere Karteikarte <guilabel>Terminierte Buchungen</guilabel></para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Diese Karteikarte enthält eine (zur Zeit leere) Liste aller terminierten Buchungen.
+ Wir erzeugen eine neue terminierte Buchung durch Klicken der Taste <guibutton>Neu</guibutton>
+ in der <emphasis>Werkzeugleiste</emphasis>. Es erscheint das unten dargestellte Fenster:</para>
+
+ <screenshot id="txns-sxn-editor-3-overview">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+ srccredit="Cristian Marchi" width="510"/>
+ </imageobject>
+
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+ srccredit="Cristian Marchi" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Fenster <guilabel>Terminierte Buchung bearbeiten</guilabel> —
+ Karteikarte <guilabel>Ãœbersicht</guilabel></phrase>
+ </textobject>
+
+ <caption><para>Fenster <guilabel>Terminierte Buchung bearbeiten</guilabel> —
+ Karteikarte <guilabel>Ãœbersicht</guilabel></para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Zuerst tragen wir oben im Fenster einen Namen für die neu erstellte
+ terminierte Buchung ein.</para>
+ <note>
+ <para>Dieser Name dient nur der Kennzeichnung der Buchung in der Liste der
+ terminierten Buchungen im Fenster <guilabel>Terminierte Buchung bearbeiten</guilabel>,
+ und tritt nicht in der Buchungsansicht auf.</para>
+ </note>
+
+ <para>Im Bereich <guilabel>Optionen</guilabel> der Karteikarte <guilabel>Ãœbersicht</guilabel>
+ gibt es vier Auswahlmöglichkeiten:</para>
+
+ <variablelist>
+ <varlistentry><term><guilabel>Aktiv</guilabel></term>
+ <listitem>
+ <para>bestimmt den Status der terminierten Buchung.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Automatisch erstellen</guilabel></term>
+ <listitem>
+ <para>Wenn diese Option gewählt wird, wird die terminierte Buchung ohne
+ Rückfrage ins Hauptbuch eingetragen (siehe unten).
+ Durch die Auswahl von <guilabel>Bei Erstellung benachrichtigen</guilabel>
+ können Sie einstellen, dass Sie über den Eintrag der Buchung informiert
+ werden.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Im Voraus erstellen</guilabel></term>
+ <listitem>
+ <para>Mit dieser Option können Sie einstellen, ob, und wieviel Tage
+ im Voraus die Buchung erstellt werden soll.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Im Voraus erinnern</guilabel></term>
+ <listitem>
+ <para>Mit dieser Option können Sie einstellen, ob, und wieviel Tage
+ im Voraus Sie an eine fällige Zahlung erinnert werden wollen. Das ist sehr
+ nützlich, wenn Sie ein Zahlungsziel ausnützen wollen, und eine Erinnerung
+ eine Woche vor Ablauf der Zahlungsfrist ermöglicht es Ihnen die Zahlung
+ Termingerecht zu veranlassen (oder den Scheck zuzusenden).</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>Der Bereich <guilabel>Auftreten</guilabel> ermöglicht es Ihnen <application>&app;</application>
+ mitzuteilen, dass die terminierte Buchung nur bis zu einem bestimmten Datum
+ ausgeführt werden soll. Zum Beispiel können Sie, wenn sie ein Darlehen zurückzahlen,
+ entweder das Enddatum, oder die Anzahl der noch offenen Zahlungen einstellen.</para>
+
+ <para>Wählen Sie jetzt die Karteikate <guilabel>Häufigkeit</guilabel> im Fenster
+ <guilabel>Terminierte Buchungen bearbeiten</guilabel>.
+ Hier können Sie die zeitbezogenen Werte der Buchung einstellen.</para>
+
+ <screenshot id="txns-sxn-editor-3-frequency">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+ srccredit="Cristian Marchi" width="510"/>
+ </imageobject>
+
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+ srccredit="Cristian Marchi" />
+ </imageobject>
+
+ <textobject>
+ <phrase><guilabel>Terminierte Buchungen bearbeiten</guilabel> —
+ <guilabel>Häufigkeit</guilabel> Karteikarte</phrase>
+ </textobject>
+
+ <caption><para><guilabel>Terminierte Buchungen bearbeiten</guilabel> —
+ <guilabel>Häufigkeit</guilabel> Karteikarte</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <variablelist>
+ <varlistentry><term><guilabel>Häufigkeit</guilabel></term>
+ <listitem>
+ <para>Stellt die Häufigkeit des Auftretens der Buchung ein, mit Einstellungen
+ für <guilabel>einmal</guilabel>, <guilabel>täglich</guilabel>,
+ <guilabel>wöchentlich</guilabel>, <guilabel>halbmonatlich</guilabel>
+ und <guilabel>monatlich</guilabel>.
+ In unserem Beispiel setzen Sie die Häufigkeit auf <guilabel>monatlich</guilabel>.</para>
+ <note>
+ <para>Durch die Einstellung unter <guilabel>Alle</guilabel> ist es möglich
+ einzustellen, dass die Buchung auch in anderen Intervallen, als den in der Liste
+ <guilabel>Häufigkeit</guilabel> angegebenen, auftreten soll (siehe unten).</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Anfangsdatum</guilabel></term>
+ <listitem>
+ <para>Stellt ein, wann die Buchung des erste Mal ausgeführt werden soll.
+ In unserem Beispiel würde es auf den Beginn des nächsten Monats gesetzt.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Alle</guilabel></term>
+ <listitem>
+ <para>Diese Option erlaubt Ihnen, den Termin für die Buchung auf ein Vielfaches
+ des Wertes im Feld <guilabel>Häufigkeit</guilabel> einzustellen. Zur Planung einer
+ Buchung, die alle drei Wochen durchgeführt werden soll, stellen Sie zum Beispiel
+ <guilabel>Häufigkeit</guilabel> auf <guilabel>wöchentlich</guilabel> und
+ <guilabel>Alle</guilabel> auf <guilabel>3</guilabel>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><guilabel>Am</guilabel> und <guilabel>außer am Wochenende</guilabel></term>
+ <listitem>
+ <para>Diese Eingabefelder dienen der Auswahl des Ausführungstags, und legen fest, wie
+ <application>&app;</application> vorgehen soll, wenn dieser Tag auf ein Wochenende fällt.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <note>
+ <para>Wir wissen, dass die Gebühr am 28. jeden Monats fällig wird, deshalb geben
+ wir als <guilabel>Anfangsdatum</guilabel> zum Beispiel den 1. November 2003 ein
+ (unter der Annahme, dass im November die nächste Zahlung erfolgen soll).
+ Die <guilabel>Häufigkeit</guilabel> stellen wir auf <guilabel>monatlich</guilabel>.
+ Mit diesen Einstellungen wird die Buchung jeden Monat am 28. erzeugt. Da in
+ unserem Beispiel die Zahlungen für das Internet monatlich abgebucht werden,
+ brauchen wir die Buchung weder im Voraus zu generieren, noch müssen wir ein
+ Enddatum eingeben.</para>
+ </note>
+
+ <para>Wenn die Einstellungen auf dieser Karteikarte durchgeführt wurden, markiert
+ <application>&app;</application> das Ausführungsdatum der zukünftigen Buchungen im
+ unten auf der Karteikarte dargestellten Kalender.</para>
+
+ <para>Wählen Sie zum Schluss die Karteikarte <guilabel>Buchungsvorlage</guilabel>
+ und geben Sie die Buchung im unteren Teil der Karteikarte ein, wie Sie es
+ normalerweise im Hauptbuch tun würden. Der einzige Unterschied besteht darin, dass
+ Sie bei der Eingabe kein Datum eingeben.</para>
+
+ <para>Jetzt sollte ihr Fenster folgendermaßen aussehen:</para>
+
+ <screenshot id="txns-sxn-editor-3-template">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+ srccredit="Cristian Marchi" width="510"/>
+ </imageobject>
+
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+ srccredit="Cristian Marchi" />
+ </imageobject>
+
+ <textobject>
+ <phrase><guilabel>Terminierte Buchungen bearbeiten</guilabel> Karteikarte
+ <guilabel>Buchungsvorlage</guilabel></phrase>
+ </textobject>
+
+ <caption><para><guilabel>Terminierte Buchungen bearbeiten</guilabel> Karteikarte
+ <guilabel>Buchungsvorlage</guilabel></para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Bitte klicken Sie auf das Symbol <guibutton>Eingabe</guibutton>, um die Buchungsvorlage
+ abzuspeichern.</para>
+
+ <para>Klicken Sie jetzt auf <guibutton>OK</guibutton>, um zur Karteikarte für
+ <guilabel>Terminierte Buchungen</guilabel> zu gelangen. Diese zeigt jetzt den
+ Eintrag für die terminierte Buchung in der Liste <guilabel>Buchungen</guilabel>:</para>
+
+ <screenshot id="txns-sxn-editor-4">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+ srccredit="Cristian Marchi" width="510"/>
+ </imageobject>
+
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+ srccredit="Cristian Marchi" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Eingegebene terminierte Buchung</phrase>
+ </textobject>
+
+ <caption><para>Eingegebene terminierte Buchung</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <tip>
+ <para>Wenn Sie mit der Maus auf den Kalender klicken, wird ein kleines
+ Fenster eingeschaltet, welches für den Tag auf den die Maus zeigt
+ alle terminierten Buchungen anzeigt. Um das Fenster wieder auszuschalten
+ klicken Sie noch einmal auf den Kalender.</para>
+ </tip>
+
+ <para>Sie können jetzt die Karteikarte <guilabel>Terminierte Buchung</guilabel>
+ schließen, und Ihre Eingabe <guilabel>speichern</guilabel>.</para>
+
+ <note>
+ <para>Das Folgende ist nur eine Beschreibung, und muss nicht an dieser Stelle in die
+ <application>&app;</application> Datenbank eingetragen werden. Gemäß diesem Beispiel
+ werden die untenstehenden Dialoge erscheinen, sobald die terminierten Buchungen
+ durchgeführt werden sollen.</para>
+ </note>
+
+ <para>Sobald <application>&app;</application> gestartet wird erhalten Sie von
+ jetzt an die Anzeige des Fenster <guilabel>Seit letztem Aufruf...</guilabel>
+ mit der Zusammenfassung der aktuell anstehenden terminierten Buchungen mit
+ Status (<guilabel>Erinnerung</guilabel>, <guilabel>Zu Erstellen</guilabel> etc...)
+ eine detaillierte Beschreibung der Optionen finden Sie im
+ <application>&app;</application> Handbuch:</para>
+
+ <screenshot id="txns-sxn-editor-slr">
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+ srccredit="Cristian Marchi" width="510"/>
+ </imageobject>
+
+ <imageobject role="fo">
+ <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+ srccredit="Cristian Marchi" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Terminierte Buchungen Erinnerungsfenster</phrase>
+ </textobject>
+
+ <caption><para>Terminierte Buchungen Erinnerungsfenster</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>Falls nötig können Sie auf die Spalte <guilabel>Status</guilabel> klicken,
+ um den Status der terminierten Buchung zu ändern. Klicken Sie dann auf den
+ <guibutton>Ok</guibutton> Knopf, um das Fenster <guilabel>Seit letztem Aufruf...</guilabel>
+ zu schließen, und die anstehenden Transaktionen zu buchen. Wählen Sie
+ <guibutton>Abbrechen</guibutton> um die Eintragung der anstehenden Transaktionen in das
+ Hauptbuchto zu überspringen.</para>
+
+ <para>Wenn Sie im Feld <guilabel>Status</guilabel> die Option <guilabel>Zu Erstellen</guilabel>
+ gewählt haben, werden Sie bei einem Blick in die Buchungsansicht Ihres Kontos sehen, dass
+ die Buchung erstellt wurde:</para>
+
+ <tip>
+ <para>Wenn Sie die Option <guilabel>Erzeugte Buchungen durchsehen</guilabel>
+ in der unteren rechten Ecke des Fensters <guilabel>Seit letztem Aufruf...</guilabel>
+ wählen, öffnet <application>&app;</application> nach Bestätigung mit
+ <guibutton>Ok</guibutton> die Karteikarten aller Konten, in die automatisch
+ die terminierten Buchungen eingetragen wurden.</para>
+ </tip>
+
+ <note>
+ <para>If you entered the transaction for 28 of April at this stage,
+ then please <emphasis>revert back</emphasis> to the last saved <application>&app;</application> file
+ by selecting <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice> and
+ choosing the previously saved <filename>gcashdata_3</filename> <application>&app;</application> file.</para>
+ </note>
+ </sect2>
+ </sect1>
+
+<!--
+
+ <sect1 id="txns-puttoget1">
+ <title>Putting It All Together</title>
+
+ <para>In the previous sections of this chapter the concepts and mechanics
+ of working with transactions in <application>&app;</application> have been discussed. This section
+ will expand upon the chart of accounts initially built in the previous
+ chapter, by setting some opening balances, adding transactions and a
+ Terminierte Buchung.</para>
+
+ <sect2 id="txns-puttoget-openfile">
+ <title>Open <application>&app;</application> file</title>
+
+ <para>Start with opening the previous datafile we stored,
+ <filename>gcashdata_3emptyAccts</filename>, and store it as
+ <filename>gcashdata_4</filename> directly. The main window should look
+ something like this:</para>
+
+ <screenshot id="txns-puttoget1-Charts">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_puttoget_Charts.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Starting point for Putting It All Together</phrase>
+ </textobject>
+
+ <caption><para>This image shows the starting point for this
+ section.</para></caption>
+ </mediaobject>
+ </screenshot>
+ </sect2>
+
+ <sect2 id="txns-puttoget-open2">
+ <title>Anfangskontostände</title>
+
+ <para>As shown earlier with the <emphasis>Aktiva:Girokonto</emphasis>
+ account, the starting balances in an account are typically assigned to a
+ special account called <emphasis>Eigenkapital:Anfangsbestand</emphasis>. To
+ start filling in this chart of account, begin by setting the starting
+ balances for the accounts. Assume that there is $1000 in the savings
+ account and $500 charged on the credit card.</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Open the <emphasis>Aktiva:Sparkonto</emphasis> account register.
+ Select <guimenu>View</guimenu> from the menu and check to make sure
+ you are in Basic Ledger style. You will view your transactions in
+ the other modes later, but for now let’s enter a basic transaction
+ using the basic default style.</para>
+ </listitem>
+
+ <listitem>
+ <para>From the <emphasis>Aktiva:Sparkonto</emphasis> account register
+ window, enter a basic 2 account transaction to set your starting
+ balance to $1000, transferred from <emphasis>Eigenkapital:Anfangsbestand</emphasis>.
+ Remember, basic transactions transfer money from
+ a source account to a destination account. Record the transaction
+ (press the <keycap function="enter">Enter</keycap> key, or click on
+ the <guibutton>Enter</guibutton> icon).</para>
+ </listitem>
+
+ <listitem>
+ <para>From the <emphasis>Aktiva:Girokonto</emphasis> account register
+ window, enter a basic 2 account transaction to set your starting
+ balance to $1000, transferred from <emphasis>Eigenkapital:Anfangsbestand</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>In der Buchungsansicht des Kontos <emphasis>Fremdkapital:Visa</emphasis> geben Sie eine
+ 2 Konten Buchung ein, um den Anfangskontostand auf 500 € zu setzen
+
+ to $500, transferred from <emphasis>Eigenkapital:Anfangsbestand</emphasis>.
+ This is done by entering the $500 as a <guilabel>charge</guilabel>
+ in the <emphasis>Visa</emphasis> account (or <guilabel>decrease</guilabel> in the <emphasis>Anfangskontostand</emphasis> account),
+ since it is money you borrowed. Record the transaction (press the
+ <keycap function="enter">Enter</keycap> key, or click on
+ the <guibutton>Enter</guibutton> icon).</para>
+ </listitem>
+ </orderedlist>
+
+ <para>You should now have 3 accounts with opening balances set.
+ <emphasis>Aktiva:Girokonto</emphasis>,
+ <emphasis>Aktiva:Sparkonto</emphasis>, and
+ <emphasis>Fremdkapital:Visa</emphasis>.</para>
+
+ <screenshot id="txns-puttoget1-Charts1">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_puttoget_Charts1.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Chart accounts after setting Anfangskontostand</phrase>
+ </textobject>
+
+ <caption><para>This image shows the opening
+ balances.</para></caption>
+ </mediaobject>
+ </screenshot>
+ </sect2>
+
+ <sect2 id="txns-puttoget-add2">
+ <title>Additional Transaction Examples</title>
+
+ <para>Now add some more transactions to simulate a month’s Aufwendungen.
+ During the month, $78 is spent on electricity, $45 on phone, and $350 on
+ rent. All paid by check. We also spent $45.21 on groceries, received $670
+ as salary, and paid our Internet bill this month. Finally, let’s move
+ $100 from the savings account to the Girokonto account.</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Open the <emphasis>Aufwendungen:Electricity</emphasis> account
+ register and enter a simple 2 account transaction to pay the $78
+ electrical bill at the end of the current month (eg: March 28,
+ 2006). Enter a description (eg: Light Company) and the check number
+ (eg: 102). The <guilabel>Transfer</guilabel> account should be
+ <emphasis>Aktiva:Girokonto</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>Open the <emphasis>Aktiva:Girokonto</emphasis> account register
+ and enter a simple 2 account transaction to pay the $45 phone bill
+ at the end of the current month (eg: March 28, 2006). Enter a
+ description (eg: Phone Company Name) and the check number (eg: 103).
+ The <guilabel>Transfer</guilabel> account should be
+ <emphasis>Aufwendungen:Phone</emphasis>. Notice that you can enter
+ expense transactions from either the credit side (the expense
+ accounts) or the debit side (the asset account).</para>
+ </listitem>
+
+ <listitem>
+ <para>Öffnen Sie die Buchungsansicht des Kontos <emphasis>Aufwendungen:Miete</emphasis>
+ und geben sie eine einfache Buchung ein um 350 € Miete am Ende des laufenden Monats
+ zu zahlen (zum Beispiel am 28. März 2006). Geben Sie eine Beschreibung ein (Miete April)
+ und einer Buchungsnummer (zum Beispiel 104). Der Eintrag im Feld <guilabel>Buchen</guilabel>
+ ist hierbei <emphasis>Aktiva:Girokonto</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>Kopieren Sie die Buchung durch Drücken des <guibutton>Dublizieren</guibutton>
+ Knopfes in der <emphasis>Werkzeugleiste</emphasis>. Start by
+ clicking on the current rent transaction, and click on the
+ <guilabel>Duplicate</guilabel> icon. Enter the transaction date a
+ month out in the future (eg: April 28, 2006), and notice the blue
+ line separator that <application>&app;</application> uses to separate future transactions
+ from current ones. In this way, you can enter transactions before
+ they occur.</para>
+
+ <para>Sie können auch eine terminierte Buchung einrichten, um ihre Miete zu zahlen,
+ da der Betrag ihrer Miete voraussichtlich für die nächste Zukunft konstant ist.
+
+ <itemizedlist>
+ <listitem>
+ <para>Start by clicking on the current (April 28) rent
+ transaction, and click on the <guilabel>Schedule</guilabel>
+ icon</para>
+ </listitem>
+
+ <listitem>
+ <para>Change to <guilabel>Monthly</guilabel>, change
+ description if needed and press <guibutton>OK</guibutton></para>
+ </listitem>
+ </itemizedlist></para>
+ </listitem>
+
+ <listitem>
+ <para>Um Geld von ihrem Sparkonto auf ihr Girokonto zu übertragen, öffnen Sie die
+ Buchungsansicht des Kontos <emphasis>Aktiva:Sparkonto</emphasis>, und fügen
+ eine neue Buchungen hinzu. Geben Sie unter Datum den 6. März 2006 ein, wählen unter
+ <guilabel>Buchen</guilabel> das Konto <emphasis>Aktiva:Girokonto</emphasis> und
+ als Betrag der Abhebung (Haben) 100 €.</para>
+ </listitem>
+
+ <listitem>
+ <para>As another example of a simple 2 account transaction, add
+ another transaction to describe the purchase of $45.21 worth of
+ groceries on 5 of March. From within the <emphasis>Aktiva:Girokonto</emphasis> account, you
+ would set <guilabel>Buchen</guilabel> to
+ <emphasis>Aufwendungen:Lebensmittel</emphasis>. The account register should
+ now appear:</para>
+ </listitem>
+
+ <listitem>
+ <para>Zur Eingabe einer Gehaltsbuchung in der Buchungsansicht des Kontos
+ <emphasis>Aktiva:Girokonto</emphasis> klicken Sie auf eine neue Buchungszeile
+ und klicken danach auf <guilabel>Vollständig</guilabel>. Geben Sie in der ersten
+ Zeile zuerst das Buchungsdatum (14. März) und die Beschreibung der Buchung ein
+ (Zum Beispiel <quote>Employers R Us</quote>). In den folgenden Zeilen der
+ Teilbuchungen geben sie die Einzahlung auf das Konto <emphasis>Aktiva:Girokonto</emphasis>
+ (670 €), gefolgt von den verschiedenen Abgaben <emphasis>Aufwendungen:Steuern:Einkommenssteuer</emphasis>
+ (180 €), <emphasis>Aufwendungen:Steuern:Krankenversicherung</emphasis> (90 €), und
+ <emphasis>Aufwendungen:Steuern:Rentenversicherung</emphasis> (60 €) und zuletzt das
+ Bruttogehalt (1000 €) als Abbuchung von Ihrem Konto <emphasis>Ertrag:Gehalt</emphasis>.</para>
+ </listitem>
+
+ <listitem>
+ <para>You also need to pay for your Internet subscription of 20 USD on
+ the 28th.</para>
+ </listitem>
+ </orderedlist>
+
+ <screenshot id="txns-puttoget2-Charts1">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_puttoget_Charts2.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Chart accounts after setting all the various
+ transactions</phrase>
+ </textobject>
+
+ <caption><para>This image shows the ending balances after <xref
+ linkend="chapter_txns" />.</para></caption>
+ </mediaobject>
+ </screenshot>
+ </sect2>
+
+ <sect2 id="txns-puttoget-save">
+ <title>Save file</title>
+
+ <para>Before we go to the report section, let’s save the <application>&app;</application> data
+ file (<filename>gcashdata_4</filename>).</para>
+ </sect2>
+
+ <sect2 id="txns-puttoget-reports">
+ <title>Reports</title>
+
+ <para>But only having data available on the computer screen will not
+ make your accountant happy, therefore <application>&app;</application> comes with a large number
+ of highly customizable reports.</para>
+
+-->
+
+
+<!-- Add this note when the reports chapter is ready
+ <note>
+ <para>More details on the reports can be found in <xref linkend="chapter_reports" /></para>
+ </note>
+-->
+
+<!--
+
+
+ <para>Let’s have a look at a <guilabel>Cash Flow</guilabel>, and a
+ <guilabel>Transaction</guilabel> Report.</para>
+
+ <orderedlist>
+ <listitem>
+ <para>First let’s have a look at the <guilabel>Cash Flow</guilabel>
+ report for the month of March.</para>
+
+ <para>Select the cash flow report from <menuchoice><guimenu>Reports</guimenu>
+ <guisubmenu>Income & Expense</guisubmenu>
+ <guimenuitem>Cash Flow</guimenuitem></menuchoice>.</para>
+
+ <screenshot id="txns-puttoget2-Cash">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_CashFlow.png" format="PNG"
+ srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Cash Flow report for the month of March</phrase>
+ </textobject>
+
+ <caption><para>This image shows the Cash Flow report after <xref
+ linkend="chapter_txns" />.</para></caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>To get this customized report, right click in the report and
+ choose <guilabel>Report Options</guilabel>. Then set the time
+ period, and specify which accounts you want in the report.</para>
+ </listitem>
+
+ <listitem>
+ <para>Now let’s have a look at corresponding transaction report for
+ the Checking account.</para>
+
+ <para>Select the transaction report from <menuchoice><guimenu>Reports</guimenu>
+ <guimenuitem>Transaction Report</guimenuitem></menuchoice>.</para>
+
+ <screenshot id="txns-puttoget2-TransactionRptChecking">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_TransactionRptChecking.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Transaction Report for the Checking account during
+ March</phrase>
+ </textobject>
+
+ <caption><para>This image shows the Transaction Report for the
+ Checking account during March. </para></caption>
+ </mediaobject>
+ </screenshot>
+ </listitem>
+
+ <listitem>
+ <para>Now let’s change the transaction report to only show the
+ various Aufwendungen accounts.</para>
+
+ <screenshot id="txns-puttoget2-TransactionRptExpenses">
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/txns_TransactionRptExpenses.png"
+ format="PNG" srccredit="Bengt Thuree" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Transaction Report for the Aufwendungen accounts during
+ March</phrase>
+ </textobject>
+
+ <caption><para>This image shows the Transaction Report for the
+ various Expense accounts during March. </para></caption>
+ </mediaobject>
+ </screenshot>
+ </listitem>
+ </orderedlist>
+ </sect2>
+ </sect1>
+-->
+
</chapter>
+
commit 0bd0bc4cb758f2149709ea8ee3ca0ed7759e552b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 4 10:09:59 2014 +0200
Fix missing para tags in listitems and notes from 6a5083c3.
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 489b6ee..03de22a 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -347,32 +347,32 @@
<para>The report supports selecting a range of periods instead all of them. Periods that are out of range can be included in report as the consolidated columns around the selected range. This allows you to focus on particular periods, for example the current one, and is especially useful for budgets with many periods. For example, if you have a 12 period budget you can make a 3 column report with the format "(all periods before columns set) (current period columns set) (all periods after columns set)" that is easily fits on the screen and allows you to match values with account names.</para>
<para><emphasis>Budget report options</emphasis></para>
<para>
- <note>Here we describe only options that are specific for the Budget Report. You can find information about standard parameters in <xref linkend="report-custom"/>. </note>
+ <note><para>Here we describe only options that are specific for the Budget Report. You can find information about standard parameters in <xref linkend="report-custom"/>.</para> </note>
<itemizedlist>
- <listitem><emphasis>Show budget</emphasis> - include the budgeted values for the period</listitem>
- <listitem><emphasis>Show actual</emphasis> - include the real values for the period</listitem>
- <listitem><emphasis>Show difference</emphasis> - include the difference between budgeted and real values for the period. Enabling this option does not force including budgeted and actual values in report</listitem>
- <listitem><emphasis>Show Column with totals</emphasis> - Adds a final column set containing budgeted, real value, and difference columns summing those values across all periods of the report.</listitem>
- <listitem><emphasis>Rollup budget amounts to parent</emphasis> - not used in report, can be deleted or should be fixed</listitem>
- <listitem><emphasis>Include accounts with zero total balances and budget values</emphasis> - enables display of accounts with no budget or splits in any period.</listitem>
- <listitem><emphasis>Budget</emphasis> - Select the budget to use for report generation</listitem>
- <listitem><emphasis>Report for range of budget periods</emphasis> - Enables reporting on a subset of the budget by selecting a beginning and an ending period.</listitem>
- <listitem><emphasis>Range start</emphasis> - a combobox with a list of variants how to select start period:
+ <listitem><para><emphasis>Show budget</emphasis> - include the budgeted values for the period</para></listitem>
+ <listitem><para><emphasis>Show actual</emphasis> - include the real values for the period</para></listitem>
+ <listitem><para><emphasis>Show difference</emphasis> - include the difference between budgeted and real values for the period. Enabling this option does not force including budgeted and actual values in report</para></listitem>
+ <listitem><para><emphasis>Show Column with totals</emphasis> - Adds a final column set containing budgeted, real value, and difference columns summing those values across all periods of the report.</para></listitem>
+ <listitem><para><emphasis>Rollup budget amounts to parent</emphasis> - not used in report, can be deleted or should be fixed</para></listitem>
+ <listitem><para><emphasis>Include accounts with zero total balances and budget values</emphasis> - enables display of accounts with no budget or splits in any period.</para></listitem>
+ <listitem><para><emphasis>Budget</emphasis> - Select the budget to use for report generation</para></listitem>
+ <listitem><para><emphasis>Report for range of budget periods</emphasis> - Enables reporting on a subset of the budget by selecting a beginning and an ending period.</para></listitem>
+ <listitem><para><emphasis>Range start</emphasis> - a combobox with a list of variants how to select start period:
<orderedlist>
- <listitem><emphasis>First</emphasis> - select first budget period</listitem>
- <listitem><emphasis>Previous</emphasis> - select previous period.</listitem>
- <listitem><emphasis>Current</emphasis> - select current period.</listitem>
- <listitem><emphasis>Next</emphasis> - select next period.</listitem>
- <listitem><emphasis>Last</emphasis> - select last budget period</listitem>
- <listitem><emphasis>Manual</emphasis> - enables spinbox where you can select exact period</listitem>
- </orderedlist>
- <note>The <emphasis>current</emphasis>, <emphasis>previous</emphasis>, and <emphasis>next</emphasis> options select the period based on the date on which the report is run, with <emphasis>current</emphasis> being the period in which the date falls, <emphasis>previous</emphasis> being the one before that, and <emphasis>next</emphasis> the period after. If the current date falls outside the date range covered by the budget, the <emphasis>first</emphasis> or <emphasis>last</emphasis> period will be used as appropriate.</note>
+ <listitem><para><emphasis>First</emphasis> - select first budget period</para></listitem>
+ <listitem><para><emphasis>Previous</emphasis> - select previous period.</para></listitem>
+ <listitem><para><emphasis>Current</emphasis> - select current period.</para></listitem>
+ <listitem><para><emphasis>Next</emphasis> - select next period.</para></listitem>
+ <listitem><para><emphasis>Last</emphasis> - select last budget period</para></listitem>
+ <listitem><para><emphasis>Manual</emphasis> - enables spinbox where you can select exact period</para></listitem>
+ </orderedlist></para>
+ <note><para>The <emphasis>current</emphasis>, <emphasis>previous</emphasis>, and <emphasis>next</emphasis> options select the period based on the date on which the report is run, with <emphasis>current</emphasis> being the period in which the date falls, <emphasis>previous</emphasis> being the one before that, and <emphasis>next</emphasis> the period after. If the current date falls outside the date range covered by the budget, the <emphasis>first</emphasis> or <emphasis>last</emphasis> period will be used as appropriate.</para></note>
</listitem>
- <listitem><emphasis>Exact start period</emphasis> - options for select exact start period, enabled only if range start option is set to <emphasis>Manual</emphasis></listitem>
- <listitem><emphasis>Range end</emphasis> - a combobox with a list of variants how to select end period. Values are the same as in <emphasis>Range start</emphasis> options</listitem>
- <listitem><emphasis>Exact end period</emphasis> - the same as <emphasis>Exact start period</emphasis> but for the end of range</listitem>
- <listitem><emphasis>Include collapsed periods before selected</emphasis> - if on, then includes in report all budget periods, that are before selected period range, as a single consolidated column set</listitem>
- <listitem><emphasis>Include collapsed periods after selected</emphasis> - if on, then includes in report all budget periods, that are after selected period range, as a single consolidated column set.</listitem>
+ <listitem><para><emphasis>Exact start period</emphasis> - options for select exact start period, enabled only if range start option is set to <emphasis>Manual</emphasis></para></listitem>
+ <listitem><para><emphasis>Range end</emphasis> - a combobox with a list of variants how to select end period. Values are the same as in <emphasis>Range start</emphasis> options</para></listitem>
+ <listitem><para><emphasis>Exact end period</emphasis> - the same as <emphasis>Exact start period</emphasis> but for the end of range</para></listitem>
+ <listitem><para><emphasis>Include collapsed periods before selected</emphasis> - if on, then includes in report all budget periods, that are before selected period range, as a single consolidated column set</para></listitem>
+ <listitem><para><emphasis>Include collapsed periods after selected</emphasis> - if on, then includes in report all budget periods, that are after selected period range, as a single consolidated column set.</para></listitem>
</itemizedlist>
</para>
</listitem>
commit f3dbb1071c46d409f4d7ecf060cb2c279572ed42
Author: Mike Evans <mikee at millstreamcomputing.co.uk>
Date: Mon Jun 2 12:53:01 2014 +0100
Correct field format in python-import-fields.
diff --git a/guide/C/ch_import_business_data.xml b/guide/C/ch_import_business_data.xml
index 310519e..167f77f 100644
--- a/guide/C/ch_import_business_data.xml
+++ b/guide/C/ch_import_business_data.xml
@@ -199,7 +199,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
</listitem>
<listitem>
<para><emphasis>date_opened</emphasis> -
- Todays date is inserted if this is blank.
+ Use the same date format as setup in Preferences. Today's date is inserted if this is blank.
</para>
</listitem>
<listitem>
@@ -271,12 +271,12 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
</listitem>
<listitem>
<para><emphasis>taxable</emphasis> -
- Will tax be applied to the item? <quote>y</quote> or blank.
+ Will tax be applied to the item? <quote>yes</quote> or blank.
</para>
</listitem>
<listitem>
<para><emphasis>taxincluded</emphasis> -
- Is tax included in the item price? <quote>y</quote> or blank.
+ Is tax included in the item price? <quote>yes</quote> or blank.
</para>
</listitem>
<listitem>
@@ -287,12 +287,12 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
<listitem>
<para><emphasis>date_posted</emphasis> -
If posted, what date. Normally left blank for manual
- posting after editing the invoice.
+ posting after editing the invoice. Use the same date format as setup in Preferences.
</para>
</listitem>
<listitem>
<para><emphasis>due_date</emphasis> -
- Date payment is due.
+ Date payment is due. Use the same date format as setup in Preferences.
</para>
</listitem>
<listitem>
@@ -301,13 +301,13 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
</para>
</listitem>
<listitem>
- <para><emphasis>memo_posted </emphasis>-
+ <para><emphasis>memo_posted </emphasis> -
If posted insert memo here.
</para>
</listitem>
<listitem>
<para><emphasis>accu_splits</emphasis> -
- Accumulate splits? <quote>y</quote> or blank.
+ Accumulate splits? <quote>yes</quote> or blank.
</para>
</listitem>
</itemizedlist>
commit 6a5083c368c8b8306231c1aa6e333ceb4e359508
Author: Dmitry Pavlov <zeldigas at gmail.com>
Date: Sun Mar 2 01:26:00 2014 +0400
Help for budget report.
Include base description + updates for ranged report generation improvement
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 6e8ab28..489b6ee 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -341,7 +341,41 @@
<itemizedlist>
<listitem>
<para>Budget Report:</para>
- </listitem>
+ <para>This report is used to compare budgeted and real amounts for selected accounts. It allows you to review how well you follow the budget.</para>
+ <para>The report is generated as a table in which each row represents an account and each set of columns shows the <emphasis>budgeted amount</emphasis>, the <emphasis>real amount</emphasis>, and the <emphasis>difference</emphasis> between them for each report period.</para>
+ <para>Each entry in the <emphasis>real amount</emphasis> column is the sum of all the splits in the row's account over the column's period. For example, if the report is set up for monthly periods, the column is for May, and the row is for Expences:Groceries, then the value will be the sum of all Expenses:Groceries splits for that May.</para>
+ <para>The report supports selecting a range of periods instead all of them. Periods that are out of range can be included in report as the consolidated columns around the selected range. This allows you to focus on particular periods, for example the current one, and is especially useful for budgets with many periods. For example, if you have a 12 period budget you can make a 3 column report with the format "(all periods before columns set) (current period columns set) (all periods after columns set)" that is easily fits on the screen and allows you to match values with account names.</para>
+ <para><emphasis>Budget report options</emphasis></para>
+ <para>
+ <note>Here we describe only options that are specific for the Budget Report. You can find information about standard parameters in <xref linkend="report-custom"/>. </note>
+ <itemizedlist>
+ <listitem><emphasis>Show budget</emphasis> - include the budgeted values for the period</listitem>
+ <listitem><emphasis>Show actual</emphasis> - include the real values for the period</listitem>
+ <listitem><emphasis>Show difference</emphasis> - include the difference between budgeted and real values for the period. Enabling this option does not force including budgeted and actual values in report</listitem>
+ <listitem><emphasis>Show Column with totals</emphasis> - Adds a final column set containing budgeted, real value, and difference columns summing those values across all periods of the report.</listitem>
+ <listitem><emphasis>Rollup budget amounts to parent</emphasis> - not used in report, can be deleted or should be fixed</listitem>
+ <listitem><emphasis>Include accounts with zero total balances and budget values</emphasis> - enables display of accounts with no budget or splits in any period.</listitem>
+ <listitem><emphasis>Budget</emphasis> - Select the budget to use for report generation</listitem>
+ <listitem><emphasis>Report for range of budget periods</emphasis> - Enables reporting on a subset of the budget by selecting a beginning and an ending period.</listitem>
+ <listitem><emphasis>Range start</emphasis> - a combobox with a list of variants how to select start period:
+ <orderedlist>
+ <listitem><emphasis>First</emphasis> - select first budget period</listitem>
+ <listitem><emphasis>Previous</emphasis> - select previous period.</listitem>
+ <listitem><emphasis>Current</emphasis> - select current period.</listitem>
+ <listitem><emphasis>Next</emphasis> - select next period.</listitem>
+ <listitem><emphasis>Last</emphasis> - select last budget period</listitem>
+ <listitem><emphasis>Manual</emphasis> - enables spinbox where you can select exact period</listitem>
+ </orderedlist>
+ <note>The <emphasis>current</emphasis>, <emphasis>previous</emphasis>, and <emphasis>next</emphasis> options select the period based on the date on which the report is run, with <emphasis>current</emphasis> being the period in which the date falls, <emphasis>previous</emphasis> being the one before that, and <emphasis>next</emphasis> the period after. If the current date falls outside the date range covered by the budget, the <emphasis>first</emphasis> or <emphasis>last</emphasis> period will be used as appropriate.</note>
+ </listitem>
+ <listitem><emphasis>Exact start period</emphasis> - options for select exact start period, enabled only if range start option is set to <emphasis>Manual</emphasis></listitem>
+ <listitem><emphasis>Range end</emphasis> - a combobox with a list of variants how to select end period. Values are the same as in <emphasis>Range start</emphasis> options</listitem>
+ <listitem><emphasis>Exact end period</emphasis> - the same as <emphasis>Exact start period</emphasis> but for the end of range</listitem>
+ <listitem><emphasis>Include collapsed periods before selected</emphasis> - if on, then includes in report all budget periods, that are before selected period range, as a single consolidated column set</listitem>
+ <listitem><emphasis>Include collapsed periods after selected</emphasis> - if on, then includes in report all budget periods, that are after selected period range, as a single consolidated column set.</listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
<listitem>
<para>Cash Flow:</para>
commit 37f6a51cb587751b33eea4243780d69a1aca85db
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 12 17:11:18 2014 -0700
Set version on master to 2.6.99
diff --git a/configure.ac b/configure.ac
index 0434de7..2a0c60d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# copyright (c) 2003-2013 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.3)
+AC_INIT(gnucash-docs, 2.6.99)
dnl ==========================================================================
dnl
Summary of changes:
.gitignore | 1 +
Makefile.am | 2 +-
NEWS | 18 ++
README | 44 +++-
chm.make | 47 ++++
configure.ac | 17 +-
guide/C/Makefile.am | 4 +
guide/C/ch_oview.xml | 2 +-
guide/C/ch_reports.xml | 268 ++++++++++++++++++++-
guide/C/ch_txns.xml | 11 +-
guide/C/figures/accts_CreateAssetsAccount.png | Bin 47510 -> 43815 bytes
guide/C/figures/accts_DefaultExpenseAccounts.png | Bin 96316 -> 64785 bytes
guide/C/figures/accts_DefaultIncomeAccounts.png | Bin 64885 -> 42422 bytes
guide/C/figures/accts_toplevel.png | Bin 46826 -> 39362 bytes
guide/C/figures/accts_tree.png | Bin 108419 -> 80128 bytes
guide/C/figures/basics_Accounts.png | Bin 60946 -> 51781 bytes
.../C/figures/basics_NewAccountHierarchySetup.png | Bin 36253 -> 48980 bytes
.../basics_NewAccountHierarchySetup_Accounts.png | Bin 77490 -> 106216 bytes
.../basics_NewAccountHierarchySetup_Finish.png | Bin 29966 -> 33972 bytes
.../basics_NewAccountHierarchySetup_Setup.png | Bin 71406 -> 86786 bytes
.../basics_NewAccountHierarchySetup_currency.png | Bin 21935 -> 27300 bytes
guide/C/figures/basics_NewBookOpts.png | Bin 33310 -> 39114 bytes
guide/C/figures/basics_SaveSQL.png | Bin 23759 -> 18909 bytes
guide/C/figures/basics_SaveXML.png | Bin 63578 -> 30185 bytes
guide/C/figures/basics_TipOfDay.png | Bin 21653 -> 19375 bytes
guide/C/figures/loans_fcalc.png | Bin 54814 -> 45526 bytes
guide/C/gnucash-guide.xml | 18 +-
guide/de/Makefile.am | 4 +
guide/de/gnucash-guide.xml | 18 +-
guide/de/toc.xml | 2 +-
guide/it/Makefile.am | 4 +
guide/it/gnucash-guide.xml | 31 ++-
guide/it/it.po | 2 +-
guide/ja/Makefile.am | 4 +
guide/ja/gnucash-guide.xml | 12 +-
guide/pt/Makefile.am | 4 +
guide/pt/gnucash-guide.xml | 20 +-
guide/ru/Makefile.am | 4 +
guide/ru/gnucash-guide.xml | 18 +-
help/C/Help_ch_Customize.xml | 6 +-
help/C/Help_ch_GUIMenus.xml | 12 +-
help/C/Help_ch_Reports.xml | 151 +++++++++---
help/C/Help_ch_Transactions.xml | 14 +-
help/C/Makefile.am | 4 +
help/C/figures/Help_Pref_AccntPeriod.png | Bin 63565 -> 53781 bytes
help/C/figures/Help_Pref_Accnts.png | Bin 75025 -> 63310 bytes
help/C/figures/Help_Pref_Business.png | Bin 64451 -> 182198 bytes
help/C/figures/Help_Pref_DateTime.png | Bin 60749 -> 49319 bytes
help/C/figures/Help_Pref_General.png | Bin 91487 -> 91232 bytes
help/C/figures/Help_Pref_OnlineBanking.png | Bin 87250 -> 224127 bytes
help/C/figures/Help_Pref_Printing.png | Bin 45741 -> 37711 bytes
help/C/figures/Help_Pref_Register.png | Bin 71381 -> 67229 bytes
help/C/figures/Help_Pref_RegisterDefaults.png | Bin 58925 -> 48896 bytes
help/C/figures/Help_Pref_Reports.png | Bin 50634 -> 42862 bytes
help/C/figures/Help_Pref_Sched.png | Bin 57269 -> 48493 bytes
help/C/figures/Help_Pref_Windows.png | Bin 60521 -> 51176 bytes
help/C/figures/Help_TxRptOpt_Screen.png | Bin 53660 -> 59603 bytes
help/C/figures/Report_Screen.png | Bin 59401 -> 58854 bytes
help/C/gnucash-help.xml | 20 +-
help/de/Makefile.am | 4 +
help/de/gnucash-help.xml | 20 +-
help/it/Makefile.am | 4 +
help/it/gnucash-help.xml | 62 +++--
help/it/it.po | 16 +-
help/pt/Makefile.am | 4 +
help/pt/gnucash-help.xml | 20 +-
66 files changed, 722 insertions(+), 170 deletions(-)
create mode 100644 chm.make
mode change 100755 => 100644 help/C/figures/Help_Pref_Sched.png
More information about the gnucash-changes
mailing list