gnucash-docs master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Aug 2 13:59:44 EDT 2015
Updated via https://github.com/Gnucash/gnucash-docs/commit/80f4fd8a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/66bd9243 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/af76b91a (commit)
via https://github.com/Gnucash/gnucash-docs/commit/aa897beb (commit)
from https://github.com/Gnucash/gnucash-docs/commit/70713d9d (commit)
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 66bd92434e7f169f5e7eb87deef074878bbc3f3b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 10:57:37 2015 -0700
Comment out note in place that doesn't comply with DTD.
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index bf82244..2a95235 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -1294,7 +1294,7 @@
</screenshot>
</sect2>
-<note><para>&untranslated;</para></note>
+<!-- note><para>&untranslated;</para></note -->
<!--
<sect2 id="txns-puttoget-open2">
<title>Anfangskontostände</title>
commit af76b91a039324ced2a92e14523287189d72b72b
Author: Mechtilde Stehmann <ooo at mechtilde.de>
Date: Sun Aug 2 19:31:03 2015 +0200
add screenshots and small corrections
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index 8c89de7..bf82244 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -563,9 +563,9 @@
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 bestätigt,
also z.B. vom ausführenden Institut akzeptiert wurde, aber noch nicht abgeglichen ist.
- Ein bestätigter Buchungsteil zeigt an, dass Sie irgendeine Bestätigung haben, daß die
- Institution den Auftrag angenommen hat - beispielsweise besitzen die Quittung eines
- Restaurants, dass Sie dort mit Ihrer Kreditkarte bezahlt haben. Durch Klicken in das Feld <!-- FIXME: in 2.6.3 leer: --><guilabel>J</guilabel> der
+ Ein bestätigter Buchungsteil zeigt an, dass Sie irgendeine Bestätigung haben, dass die
+ Institution den Auftrag angenommen hat - beispielsweise besitzen Sie die Quittung eines
+ Restaurants, dass Sie dort mit Ihrer Kreditkarte bezahlt haben. 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>
@@ -768,8 +768,8 @@
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>
+ <menuchoice><guimenu>Buchung</guimenu><guimenuitem>Bearbeiten</guimenuitem></menuchoice>
+ benutzen, um die Buchungsansicht 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.
@@ -1277,8 +1277,6 @@
<filename>gcashdata_3emptyAccts</filename> gespeichert ist und spreichern Sie diese sofort unter
<filename>gcashdata_4</filename>. Das Hauptfenster sollte wie folgt aussehen:
</para>
-<note><para>&untranslated;</para></note>
-<!--
<screenshot id="txns-puttoget1-Charts">
<mediaobject>
@@ -1288,15 +1286,16 @@
</imageobject>
<textobject>
- <phrase>Starting point for Putting It All Together</phrase>
+ <phrase>Startpunkt für die Zusammenfanssung</phrase>
</textobject>
- <caption><para>This image shows the starting point for this
- section.</para></caption>
+ <caption><para>Dieses Bild zeigt den Startpunkt dieses Abschnittes.</para></caption>
</mediaobject>
</screenshot>
</sect2>
-
+
+<note><para>&untranslated;</para></note>
+<!--
<sect2 id="txns-puttoget-open2">
<title>Anfangskontostände</title>
@@ -1592,8 +1591,9 @@
</screenshot>
</listitem>
</orderedlist>
--->
+
</sect2>
+ -->
</sect1>
</chapter>
diff --git a/guide/de/figures/txns_puttoget_Charts1.png b/guide/de/figures/txns_puttoget_Charts1.png
new file mode 100644
index 0000000..324ec7e
Binary files /dev/null and b/guide/de/figures/txns_puttoget_Charts1.png differ
diff --git a/guide/de/figures/txns_reconcile_window1.png b/guide/de/figures/txns_reconcile_window1.png
new file mode 100644
index 0000000..b84e925
Binary files /dev/null and b/guide/de/figures/txns_reconcile_window1.png differ
diff --git a/guide/de/figures/txns_reconcile_window2.png b/guide/de/figures/txns_reconcile_window2.png
new file mode 100644
index 0000000..372b084
Binary files /dev/null and b/guide/de/figures/txns_reconcile_window2.png differ
diff --git a/guide/de/figures/txns_reconcile_window3.png b/guide/de/figures/txns_reconcile_window3.png
new file mode 100644
index 0000000..eda1918
Binary files /dev/null and b/guide/de/figures/txns_reconcile_window3.png differ
diff --git a/guide/de/figures/txns_register_2account.png b/guide/de/figures/txns_register_2account.png
new file mode 100644
index 0000000..4794d97
Binary files /dev/null and b/guide/de/figures/txns_register_2account.png differ
diff --git a/guide/de/figures/txns_register_2account2.png b/guide/de/figures/txns_register_2account2.png
new file mode 100644
index 0000000..8f51959
Binary files /dev/null and b/guide/de/figures/txns_register_2account2.png differ
diff --git a/guide/de/figures/txns_register_multiaccount.png b/guide/de/figures/txns_register_multiaccount.png
new file mode 100644
index 0000000..07d23fc
Binary files /dev/null and b/guide/de/figures/txns_register_multiaccount.png differ
diff --git a/guide/de/figures/txns_registersplit2.png b/guide/de/figures/txns_registersplit2.png
new file mode 100644
index 0000000..0384bd4
Binary files /dev/null and b/guide/de/figures/txns_registersplit2.png differ
diff --git a/guide/de/figures/txns_registersplit3.png b/guide/de/figures/txns_registersplit3.png
new file mode 100644
index 0000000..cb0e3a0
Binary files /dev/null and b/guide/de/figures/txns_registersplit3.png differ
diff --git a/guide/de/figures/txns_registersplit4.png b/guide/de/figures/txns_registersplit4.png
new file mode 100644
index 0000000..512c743
Binary files /dev/null and b/guide/de/figures/txns_registersplit4.png differ
diff --git a/guide/de/figures/txns_registersplit5.png b/guide/de/figures/txns_registersplit5.png
new file mode 100644
index 0000000..844e7ed
Binary files /dev/null and b/guide/de/figures/txns_registersplit5.png differ
diff --git a/guide/de/figures/txns_registersplit6.png b/guide/de/figures/txns_registersplit6.png
new file mode 100644
index 0000000..6f4f50a
Binary files /dev/null and b/guide/de/figures/txns_registersplit6.png differ
diff --git a/guide/de/figures/txns_sxn_editor-2.png b/guide/de/figures/txns_sxn_editor-2.png
new file mode 100644
index 0000000..3b28076
Binary files /dev/null and b/guide/de/figures/txns_sxn_editor-2.png differ
diff --git a/guide/de/figures/txns_sxn_editor-3-frequency.png b/guide/de/figures/txns_sxn_editor-3-frequency.png
new file mode 100644
index 0000000..879ffd9
Binary files /dev/null and b/guide/de/figures/txns_sxn_editor-3-frequency.png differ
diff --git a/guide/de/figures/txns_sxn_editor-3-overview.png b/guide/de/figures/txns_sxn_editor-3-overview.png
new file mode 100644
index 0000000..eb73468
Binary files /dev/null and b/guide/de/figures/txns_sxn_editor-3-overview.png differ
diff --git a/guide/de/figures/txns_sxn_editor-3-template.png b/guide/de/figures/txns_sxn_editor-3-template.png
new file mode 100644
index 0000000..7dd1394
Binary files /dev/null and b/guide/de/figures/txns_sxn_editor-3-template.png differ
diff --git a/guide/de/figures/txns_sxn_editor-4.png b/guide/de/figures/txns_sxn_editor-4.png
new file mode 100644
index 0000000..bc00550
Binary files /dev/null and b/guide/de/figures/txns_sxn_editor-4.png differ
diff --git a/guide/de/figures/txns_sxn_editor_slr.png b/guide/de/figures/txns_sxn_editor_slr.png
new file mode 100644
index 0000000..d70aef5
Binary files /dev/null and b/guide/de/figures/txns_sxn_editor_slr.png differ
diff --git a/guide/de/figures/txns_sxn_ledger1.png b/guide/de/figures/txns_sxn_ledger1.png
new file mode 100644
index 0000000..3acf98b
Binary files /dev/null and b/guide/de/figures/txns_sxn_ledger1.png differ
diff --git a/guide/de/figures/txns_sxn_ledger2.png b/guide/de/figures/txns_sxn_ledger2.png
new file mode 100644
index 0000000..73b4295
Binary files /dev/null and b/guide/de/figures/txns_sxn_ledger2.png differ
diff --git a/guide/de/figures/txns_sxn_ledger3.png b/guide/de/figures/txns_sxn_ledger3.png
new file mode 100644
index 0000000..d717ff7
Binary files /dev/null and b/guide/de/figures/txns_sxn_ledger3.png differ
diff --git a/guide/de/figures/txns_sxn_ledger4.png b/guide/de/figures/txns_sxn_ledger4.png
new file mode 100644
index 0000000..52301b2
Binary files /dev/null and b/guide/de/figures/txns_sxn_ledger4.png differ
commit aa897beb722c07299a40fa9b67dd30330fb59fd6
Author: Chris Good <chris.good at ozemail.com.au>
Date: Sun Jun 28 17:10:26 2015 +1000
Add warnings to not manually edit AR or AP transactions Bug 705309
diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 77642e0..28ab59d 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -207,7 +207,16 @@ Translators:
is typically a business use only account in which you place
outstanding debts owed to you. It is considered an asset because you
should be able to count on these funds arriving.</para>
- </listitem>
+
+ <para>Transactions involving an Accounts Receivable account should not be added,
+ changed or deleted in any way other than by using
+ </para>
+ <itemizedlist>
+ <listitem><para>post/unpost bill/invoice/voucher or</para>
+ </listitem>
+ <listitem><para>process payment</para></listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para><guilabel>Other Assets</guilabel> No matter how diverse they
@@ -253,9 +262,18 @@ Translators:
<listitem>
<para><guilabel>Accounts Payable</guilabel> (A/Payable) This is
- typically a business use only account in which you place bills you
- have yet to pay.</para>
- </listitem>
+ typically a business use only account in which you place bills you
+ have yet to pay.
+ </para>
+
+ <para>Transactions involving an Accounts Payable account should not be added,
+ changed or deleted in any way other than by using
+ <itemizedlist>
+ <listitem><para>post/unpost bill/invoice/voucher or</para></listitem>
+ <listitem><para>process payment</para></listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
<listitem>
<para><guilabel>Liability</guilabel> Use this type of account for
diff --git a/guide/C/ch_bus_ap.xml b/guide/C/ch_bus_ap.xml
index eb3f328..345a73b 100644
--- a/guide/C/ch_bus_ap.xml
+++ b/guide/C/ch_bus_ap.xml
@@ -58,8 +58,18 @@ Basic A/P Account Hierarchy:
-AP Expenses
</literallayout>
-
- <para>You need to add additional asset accounts and real expense accounts to make this hierarchy useful. The important aspects of this hierarchy are that you need an expense account and an Accounts Payable account, with account type set to <emphasis>A/Payable</emphasis>.</para>
+ <para>You need to add additional asset accounts and real expense accounts to make this hierarchy useful.
+ The important aspects of this hierarchy are that you need an expense account and an Accounts Payable account, with account type set to <emphasis>A/Payable</emphasis>.
+ </para>
+
+ <para>Transactions involving an Accounts Payable account should not be added,
+ changed or deleted in any way other than by using
+ <itemizedlist>
+ <listitem><para>post/unpost bill/invoice/voucher or</para></listitem>
+ <listitem><para>process payment"</para></listitem>
+ </itemizedlist>
+ </para>
+
</sect2>
<sect2 id="bus-ap-setupcname2">
diff --git a/guide/C/ch_bus_ar.xml b/guide/C/ch_bus_ar.xml
index ce13fd8..74992e8 100644
--- a/guide/C/ch_bus_ar.xml
+++ b/guide/C/ch_bus_ar.xml
@@ -100,8 +100,18 @@ Basic A/R Account Hierarchy:
<note>
<para>You do not need to create an individual A/R account for each
- customer. <application>&app;</application> keeps track of customers internally and provides
- per-customer reports based on the internal tracking.</para>
+ customer. <application>&app;</application> keeps track of customers internally and provides
+ per-customer reports based on the internal tracking.
+ </para>
+
+ <para>Transactions involving an Accounts Receivable account should not be added,
+ changed or deleted in any way other than by using
+ <itemizedlist>
+ <listitem><para>post/unpost bill/invoice/voucher or</para></listitem>
+ <listitem><para>process payment"</para></listitem>
+ </itemizedlist>
+ </para>
+
</note>
</sect2>
diff --git a/help/C/Help_ch_Account-Actions.xml b/help/C/Help_ch_Account-Actions.xml
index a875df5..f126ed9 100644
--- a/help/C/Help_ch_Account-Actions.xml
+++ b/help/C/Help_ch_Account-Actions.xml
@@ -38,9 +38,14 @@
<warning>
<para>The Accounts Payable and Accounts Receivable types are
- used internally by &app;’s business features. Users should
- not manually modify or enter transactions in these account
- types.</para>
+ used internally by &app;’s business features. Transactions involving these accounts should not be added,
+ changed or deleted in any way other than by using
+ <itemizedlist>
+ <listitem><para>post/unpost bill/invoice/voucher or</para></listitem>
+ <listitem><para>process payment</para></listitem>
+ </itemizedlist>
+ </para>
+
</warning>
<table frame="topbot" id="TypeAccounts">
Summary of changes:
guide/C/ch_accts.xml | 26 +++++++++++++++++----
guide/C/ch_bus_ap.xml | 14 +++++++++--
guide/C/ch_bus_ar.xml | 14 +++++++++--
guide/de/ch_txns.xml | 24 +++++++++----------
guide/{C => de}/figures/txns_puttoget_Charts1.png | Bin
guide/{C => de}/figures/txns_reconcile_window1.png | Bin
guide/{C => de}/figures/txns_reconcile_window2.png | Bin
guide/{C => de}/figures/txns_reconcile_window3.png | Bin
guide/{C => de}/figures/txns_register_2account.png | Bin
.../{C => de}/figures/txns_register_2account2.png | Bin
.../figures/txns_register_multiaccount.png | Bin
guide/{C => de}/figures/txns_registersplit2.png | Bin
guide/{C => de}/figures/txns_registersplit3.png | Bin
guide/{C => de}/figures/txns_registersplit4.png | Bin
guide/{C => de}/figures/txns_registersplit5.png | Bin
guide/{C => de}/figures/txns_registersplit6.png | Bin
guide/{C => de}/figures/txns_sxn_editor-2.png | Bin
.../figures/txns_sxn_editor-3-frequency.png | Bin
.../figures/txns_sxn_editor-3-overview.png | Bin
.../figures/txns_sxn_editor-3-template.png | Bin
guide/{C => de}/figures/txns_sxn_editor-4.png | Bin
guide/{C => de}/figures/txns_sxn_editor_slr.png | Bin
guide/{C => de}/figures/txns_sxn_ledger1.png | Bin
guide/{C => de}/figures/txns_sxn_ledger2.png | Bin
guide/{C => de}/figures/txns_sxn_ledger3.png | Bin
guide/{C => de}/figures/txns_sxn_ledger4.png | Bin
help/C/Help_ch_Account-Actions.xml | 11 ++++++---
27 files changed, 66 insertions(+), 23 deletions(-)
copy guide/{C => de}/figures/txns_puttoget_Charts1.png (100%)
copy guide/{C => de}/figures/txns_reconcile_window1.png (100%)
copy guide/{C => de}/figures/txns_reconcile_window2.png (100%)
copy guide/{C => de}/figures/txns_reconcile_window3.png (100%)
copy guide/{C => de}/figures/txns_register_2account.png (100%)
copy guide/{C => de}/figures/txns_register_2account2.png (100%)
copy guide/{C => de}/figures/txns_register_multiaccount.png (100%)
copy guide/{C => de}/figures/txns_registersplit2.png (100%)
copy guide/{C => de}/figures/txns_registersplit3.png (100%)
copy guide/{C => de}/figures/txns_registersplit4.png (100%)
copy guide/{C => de}/figures/txns_registersplit5.png (100%)
copy guide/{C => de}/figures/txns_registersplit6.png (100%)
copy guide/{C => de}/figures/txns_sxn_editor-2.png (100%)
copy guide/{C => de}/figures/txns_sxn_editor-3-frequency.png (100%)
copy guide/{C => de}/figures/txns_sxn_editor-3-overview.png (100%)
copy guide/{C => de}/figures/txns_sxn_editor-3-template.png (100%)
copy guide/{C => de}/figures/txns_sxn_editor-4.png (100%)
copy guide/{C => de}/figures/txns_sxn_editor_slr.png (100%)
copy guide/{C => de}/figures/txns_sxn_ledger1.png (100%)
copy guide/{C => de}/figures/txns_sxn_ledger2.png (100%)
copy guide/{C => de}/figures/txns_sxn_ledger3.png (100%)
copy guide/{C => de}/figures/txns_sxn_ledger4.png (100%)
More information about the gnucash-changes
mailing list