You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2020/02/25 21:10:00 UTC
[ofbiz-framework] 09/12: Documented: Organization-Gl-Settings
Docbook files migration to asciidoc format (OFBIZ-11352)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 3e2e71aced36be44cede2dcb57c6113870c05c7b
Author: holivier <ho...@apache.org>
AuthorDate: Thu Feb 13 17:55:14 2020 +0100
Documented: Organization-Gl-Settings Docbook files migration to asciidoc
format
(OFBIZ-11352)
All the help files associated to it are called via include in the main
document
---
.../accounting/data/helpdata/HELP_ACCOUNTING.xml | 45 ------
...ELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml | 101 ------------
...TING_EditOrganizationTaxAuthorityGlAccounts.xml | 99 ------------
.../HELP_ACCOUNTING_EditPartyGlAccount.xml | 109 -------------
...LP_ACCOUNTING_EditProductCategoryGlAccounts.xml | 110 -------------
.../HELP_ACCOUNTING_EditProductGlAccounts.xml | 113 -------------
...ELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml | 104 ------------
.../data/helpdata/HELP_ACCOUNTING_Features.xml | 31 ----
.../HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml | 155 ------------------
.../HELP_ACCOUNTING_GlAccountPurInvoice.xml | 155 ------------------
.../HELP_ACCOUNTING_GlAccountSalInvoice.xml | 165 -------------------
.../HELP_ACCOUNTING_GlAccountTypeDefaults.xml | 158 ------------------
.../HELP_ACCOUNTING_GlAccountTypePaymentType.xml | 66 --------
.../helpdata/HELP_ACCOUNTING_ListCompanies.xml | 28 ----
.../HELP_ACCOUNTING_ListGlAccountOrganization.xml | 138 ----------------
.../HELP_ACCOUNTING_PartyAcctgPreference.xml | 136 ----------------
.../helpdata/HELP_ACCOUNTING_SetupGlJournals.xml | 86 ----------
.../data/helpdata/HELP_ACCOUNTING_TimePeriods.xml | 180 ---------------------
.../HELP_ACCOUNTING_organization_gl_settings.xml | 38 -----
.../HELP_EditCreditCardTypeGlAccounts.adoc | 58 +++++++
...ELP_EditOrganizationTaxAuthorityGlAccounts.adoc | 56 +++++++
.../asciidoc/_include/HELP_EditPartyGlAccount.adoc | 66 ++++++++
.../HELP_EditProductCategoryGlAccounts.adoc | 59 +++++++
.../_include/HELP_EditProductGlAccounts.adoc | 64 ++++++++
.../HELP_EditVarianceReasonGlAccounts.adoc | 53 ++++++
.../_include/HELP_GlAccountNrPaymentMethod.adoc | 74 +++++++++
.../_include/HELP_GlAccountPurInvoice.adoc | 89 ++++++++++
.../_include/HELP_GlAccountSalInvoice.adoc | 112 +++++++++++++
.../_include/HELP_GlAccountTypeDefaults.adoc | 92 +++++++++++
.../_include/HELP_GlAccountTypePaymentType.adoc | 66 ++++++++
.../_include/HELP_ListGlAccountOrganization.adoc | 94 +++++++++++
.../_include/HELP_PartyAcctgPreference.adoc | 81 ++++++++++
.../asciidoc/_include/HELP_SetupGlJournals.adoc | 49 ++++++
.../docs/asciidoc/_include/HELP_TimePeriods.adoc | 86 ++++++++++
.../_include/acc-organization-gl-settings.adoc | 61 +++++++
.../accounting/src/docs/asciidoc/accounting.adoc | 2 +
36 files changed, 1162 insertions(+), 2017 deletions(-)
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
deleted file mode 100644
index 14dccb7..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>Accounting Introduction</title>
- <para>
- The Accounting system is organized according to age old and generally accepted principles such as double-entry accounting, a General Ledger with hierarchical accounts,
- journals and posting of transactions and corresponding entries.
- </para>
- <para>
- The structure is primary based on the OMG GL standard and the work that was done on an
- AR/AP extension of the OMG GL standard. This correlates well with other standards such as ebXML and OAGIS.
- </para>
- <para>
- The Accounting entities are structured such that accounts for multiple organizations can be managed. The multiple organizations could be multiple companies,
- or departments or other organizations within a company. Each Organization can have various GL Accounts associated with it so that it can operate
- with its own subset of the Master Chart of Accounts.
- </para>
- <para>
- Each Organization can also have its own set of Journals for flexibility, even though the
- use of Journals should be as minimal as possible in favor of allowing the system to automatically create and post transactions based on business events
- triggered by standard procedures and documents such as purchase and sales orders, invoices, inventory transfers, payments, receipts, and so forth.
- </para>
-</section>
-
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml
deleted file mode 100644
index 999e548..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Credit Card Type GL Accounts help screen</title>
- <para>The Credit Card Type / GL Account default is used to map
- different types of credit card to different general ledger accounts.
- </para>
- <para>NOTE: This setup will affect one side of a journal entry only.
- </para>
- <para>This type of mapping is useful if you need to track the amounts
- to be collected from different credit card agents. The OFBiz demo data
- comes with some setup here (NOTE: The demo entries appear to be
- duplicated...has something changed in ENUM for defining each credit
- card type.....?????)</para>
- <para>Examples are as follows:</para>
- <itemizedlist>
- <listitem>
- <para>American Express</para>
- </listitem>
- <listitem>
- <para>Visa</para>
- </listitem>
- <listitem>
- <para>Mastercard</para>
- </listitem>
- <listitem>
- <para>Diners Club </para>
- </listitem>
- </itemizedlist>
- <section>
- <title>How do I add a Credit Card Type GL Account mapping?</title>
- <para>There are 10 mappings that come as part of the OFBiz demo data
- but they do appear to be duplicated for some reason.</para>
- <orderedlist>
- <listitem>
- <para>Select the 'Card Type' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account Id' to map it to from the drop down
- list</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The new 'Credit Card / GL Account Id' mapping is displayed in
- the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Credit Card Type GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Select the 'Card Type' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the updated 'GL Account Id' to map it to from the drop
- down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The updated 'Credit Card Type / GL Account' mapping is
- displayed in the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- <para>NOTE: Used 'Visa' as an example to update and the 'CCT_VISA' was
- updated but the 'Visa' one wasnt. This is probably related to the
- duplication.</para>
- </section>
- <section>
- <title>How do I remove a Credit Card Type GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the entry that you want to
- delete</para>
- </listitem>
- <listitem>
- <para>The entry is removed from the list of entries displayed</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml
deleted file mode 100644
index 7ecff4e..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Tax Authority GL Accounts help screen</title>
- <para>The Tax Authority / GL Account default is used to map different
- tax authorities to different general ledger accounts. This setup will
- affect one side of a journal entry only.</para>
- <para>NOTE: A tax authority is legal body usually the state (country)
- that imposes a financial levy on business transactions.</para>
- <para>Normal business rules require you will to keep track amounts
- collected or paid to different tax authorities separately. This
- mapping ensures that money collected or paid to various tax
- authorities (eg through Sales Orders, Purchase Orders etc) can be
- separated into specific accounts</para>
- <para>The OFBiz demo data comes with 9 entries to show an example of
- how this can be setup using the some of the US states as separate tax
- authorities.</para>
- <section>
- <title>How do I add a Tax Authority / GL Account mapping?</title>
- <para>Unlike the other GL Account defaults you cannot add a Tax
- Authority / GL mapping through these screens. It needs to be done via
- the 'GL Accounts' sub menu under the 'Tax Authorities' menu. The
- method of how to add a mapping using the 'Tax Authorities' is shown
- below.</para>
- <orderedlist>
- <listitem>
- <para>From the Accounting Manager / Tax Authorities Menu press the
- 'Edit' button next to the Tax Authority required</para>
- </listitem>
- <listitem>
- <para>Select the sub menu 'GL Accounts'</para>
- </listitem>
- <listitem>
- <para>Enter or Lookup the party for the 'Organisation Party Id'
- field (NOTE: Use 'Company' as default)</para>
- </listitem>
- <listitem>
- <para>Enter or Lookup the GL Account to be mapped to</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The mapping will be displayed at the bottom of the screen.
- </para>
- </listitem>
- <listitem>
- <para>Return to the Tax Authority / GL Account default and this new
- mapping will be shown in the list </para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Tax Authority / GL Account mapping?</title>
- <para>Only the GL Account Id linked to the mapping can be updated.
- </para>
- <orderedlist>
- <listitem>
- <para>Locate the Tax Authority / GL Account entry that needs to be
- updated</para>
- </listitem>
- <listitem>
- <para>Select the new 'GL Account Id' from the drop down list next to
- the entry </para>
- </listitem>
- <listitem>
- <para>Press the 'Update' button next to the entry</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I remove a Tax Authority / GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Locate the Tax Authority / GL Account entry that needs to be
- removed</para>
- </listitem>
- <listitem>
- <para>Press the 'Delete' button next to the entry </para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml
deleted file mode 100644
index 3aa5e4c..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Party GL Account help screen</title>
- <para>he Party / GL Account mapping allows the translation of different
- account types (eg Accounts Receivable, Accounts Payable etc) for a
- party to be mapped to a separate general ledger account. The party
- role (eg Bill To Customer) is also used to define the mapping even
- further. OFBiz demo data setup comes with no entries here.</para>
- <para>It is used as a way of implementing subledger functionality in
- OFBiz. Subledger functionality is where a higher level account can be
- split into lower levels. In this case these lower levels can be by
- party.</para>
- <para>An example could be that a business may want to use the general
- ledger to track the Accounts Receivable (AR) by customer so the chart
- of account would be setup something like as follows:</para>
- <para>120000 Accounts Receivable</para>
- <itemizedlist>
- <listitem>
- <para>120010 Accounts Receivable - Customer A</para>
- </listitem>
- <listitem>
- <para>120020 Accounts Receiviable - Customer B</para>
- </listitem>
- <listitem>
- <para>120030 Accounts Receivalbe - Customer C</para>
- </listitem>
- </itemizedlist>
- <para>This has the main AR account is at the top of the hierarchy and 3
- sub accounts below it. Entries for Customers A, B and C would be setup
- with a role of 'Bill From Customer' as this is a role associated with
- the customer when the Sales Invoice is generated.When a transaction
- matching the criteria is processed in the system then these mappings
- will control where it is posted to.In the case of Customer A any AR
- transactions with role 'Bill To Customer' are posted to '120010'
- instead of the standard '120000</para>
- <section>
- <title>How do I add a new Party / GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Enter or Lookup the party for the 'Party Id' field</para>
- </listitem>
- <listitem>
- <para>Select the 'Role Type Id' from the drop down list (NOTE: Be
- careful that you select the correct role for the transactions you
- want to track......)</para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account Type Id' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account Id' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The new entry will be displayed at the bottom of the screen
- </para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Party / GL Account mapping?</title>
- <para>Only the GL Account Id linked to the mapping can be updated.
- </para>
- <orderedlist>
- <listitem>
- <para>Locate the Party / GL Account entry that needs to be updated
- </para>
- </listitem>
- <listitem>
- <para>Select the new 'GL Account Id' from the drop down list next to
- the entry </para>
- </listitem>
- <listitem>
- <para>Press the 'Update' button next to the entry</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I remove a Party / GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Locate the Party / GL Account entry that needs to be removed
- </para>
- </listitem>
- <listitem>
- <para>Press the 'Delete' button next to the entry</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml
deleted file mode 100644
index b96b9db..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Product Category GL Accounts help screen</title>
- <para>The Product Category GL Account is used to specify the default
- account to be used for a specific 'Product Category' and 'Account
- Type' combination. This setup will translate to one side of the
- journal entry only.</para>
- <para>It is used for tracking product category transactions at a more
- detailed level. Examples could be as follows:</para>
- <itemizedlist>
- <listitem>
- <para>Tracking Accounts Receivable by Product Category in the General
- Ledger</para>
- </listitem>
- <listitem>
- <para>Tracking Cost of Goods by Product Category in the General
- Ledger</para>
- </listitem>
- <listitem>
- <para>Tracking Commissions paid by Product Category in the General
- Ledger</para>
- </listitem>
- </itemizedlist>
- <para>The demo data gives an idea of the use of product categories to
- classify or separate different products streams. If specific
- accounting or management reporting is required at this level then the
- General Ledger can be setup to provide this detail. </para>
- <section>
- <title>How do I add a new Product Category / GL Account Type mapping?
- </title>
- <para>By default there are no Product Category / GL Account Type
- mappings that are configured as part of the OFBiz demo data.</para>
- <orderedlist>
- <listitem>
- <para>Select the 'Account Type' from the drop down list (NOTE: In
- other screens this field is call the 'GL Account Type Id'.....)
- </para>
- </listitem>
- <listitem>
- <para>Select the ' GL Account' to map it to from the drop down list
- </para>
- </listitem>
- <listitem>
- <para>Enter or look up the 'Product Category Id' to be used</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The new mapping will be displayed in the list at the bottom of
- the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Product Category / GL Account type mapping?
- </title>
- <para>A Product Category / GL Account Type mapping can be updated by
- modifying the GL Account only. If the product category or the Account
- Type needs to be updated then the mapping will need to be deleted and
- then re-entered using the new product category or Account Type.
- </para>
- <orderedlist>
- <listitem>
- <para>Locate the entry that needs to be updated in the list of
- Product Category / GL Account Type mappings</para>
- </listitem>
- <listitem>
- <para>Modify the 'GL Account 'by using the drop down list next to
- the 'GL Account' field</para>
- </listitem>
- <listitem>
- <para>Press the 'Update' button</para>
- </listitem>
- <listitem>
- <para>The updated mapping will be displayed</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I remove a Product Category / GL Account Type mapping?
- </title>
- <orderedlist>
- <listitem>
- <para>Locate the entry that needs to be deleted in the list of
- Product Category / GL Account Type mappings</para>
- </listitem>
- <listitem>
- <para>Press the 'Remove' button next to the entry</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml
deleted file mode 100644
index b617767..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Product GL Accounts help screen</title>
- <para>The Product GL Account is used to specify the default account to
- be used for a specific Product' and 'Account Type' combination. This
- setup will translate to one side of the journal entry only.</para>
- <para>NOTE: Duplicate functionality .... This setup for the Product GL
- Account can also be setup using the 'Accounts' sub menu for the
- Product in Catalog Manager. Need to confirm whether this default work
- like a hierarchy....eg Product GL Defaults will override General
- Account defaults. </para>
- <para>It is used for tracking product transactions at a more detailed
- level. Examples could be as follows:</para>
- <itemizedlist>
- <listitem>
- <para>Tracking Accounts Receivable by Product in the General Ledger
- </para>
- </listitem>
- <listitem>
- <para>Tracking Cost of Goods by product (or product variation) in the
- General Ledger</para>
- </listitem>
- <listitem>
- <para>Tracking Commissions paid by Product in the General Ledger
- </para>
- </listitem>
- </itemizedlist>
- <section>
- <title>How do I add a new Product / GL Account Type mapping?</title>
- <para>By default there are no Product / GL Account Type mappings that
- are configured as part of the OFBiz demo data.</para>
- <orderedlist>
- <listitem>
- <para>Select the 'Account Type' from the drop down list (NOTE: In
- other screens this field is call the 'GL Account Type Id'.....)
- </para>
- </listitem>
- <listitem>
- <para>Select the ' GL Account' to map it to from the drop down list
- </para>
- </listitem>
- <listitem>
- <para>Enter or look up the 'Product Id' to be used</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The new mapping will be displayed in the list at the bottom of
- the screen</para>
- </listitem>
- </orderedlist>
- <para>NOTE: This mapping can also be also be done via the 'Accounts'
- sub menu for the Product. Any mapping created here will be displayed
- under the Product 'Accounts' sub menu. Alternatively any mapping
- created in the Product 'Accounts' sub menu will also be displayed
- here.</para>
- </section>
- <section>
- <title>How do I update a Product / GL Account Type mapping?</title>
- <para>A Product / GL Account Type mapping can be updated by modifying
- the GL Account only. If the product needs to be updated then the
- mapping will need to be deleted and then re-entered using the new
- product.</para>
- <orderedlist>
- <listitem>
- <para>Locate the entry that needs to be updated in the list of
- Product / GL Account Type mappings</para>
- </listitem>
- <listitem>
- <para>Modify the 'GL Account 'by using the drop down list next to
- the 'GL Account' field</para>
- </listitem>
- <listitem>
- <para>Press the 'Update' button</para>
- </listitem>
- <listitem>
- <para>The updated mapping will be displayed </para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I delete a Product / GL Account Type mapping?</title>
- <orderedlist>
- <listitem>
- <para>Locate the entry that needs to be deleted in the list of
- Product / GL Account Type mappings</para>
- </listitem>
- <listitem>
- <para> 2. Press the 'Remove' button next to the entry</para>
- </listitem>
- </orderedlist>
- <para>NOTE: This can also be done via the 'Accounts' sub menu for the
- Product using the 'Delete Link' button.</para>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml
deleted file mode 100644
index 5a5cdde..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Variance Reason GL Accounts help screen</title>
- <para>The Variance Reason / GL Account default is used for mapping any
- stock differences to a particular general ledger account. If there are
- variances in the number of products that are in stock then this
- affects the value of inventory in the general ledger. By using this GL
- default you can offset any differences in stock to the relevant
- general ledger account.</para>
- <para>The number of products (or items) in stock can vary. These
- differences can be caused by numerous reasons. Some of these could be
- as follows:</para>
- <itemizedlist>
- <listitem>
- <para>Products have been damaged</para>
- </listitem>
- <listitem>
- <para>Products were lost or stolen</para>
- </listitem>
- <listitem>
- <para>Products were found </para>
- </listitem>
- <listitem>
- <para>Under or over supply of a Product from a Supplier (eg. You have
- ordered 10 and 11 are delivered....) </para>
- </listitem>
- <listitem>
- <para>Free samples or giveaways to potential clients</para>
- </listitem>
- </itemizedlist>
- <para>NOTE: These mappings are used in Catalog Manager when a manual
- inventory adjustment is done through the Inventory Item screens.
- </para>
- <section>
- <title>How do I add a new Variance Reason / GL Account mapping?
- </title>
- <para>There are 6 mappings that come as part of the OFBiz demo data.
- </para>
- <orderedlist>
- <listitem>
- <para>Select the 'Variance Reason Id' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account Type Id' to map it to from the drop
- down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The new 'Variance Reason / GL Account Type' mapping is
- displayed in the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Variance Reason / GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Select the 'Variance Reason Id' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the updated 'GL Account Type Id' to map it to from the
- drop down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- <listitem>
- <para>The updated 'Variance Reason / GL Account Type' mapping is
- displayed in the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I remove a Variance Reason / GL Account mapping?</title>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the entry that you want to
- delete</para>
- </listitem>
- <listitem>
- <para>The entry is removed from the list of entries displayed</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml
deleted file mode 100644
index 5c8dc46..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>Accounting Features</title>
- <para>
- <orderedlist>
- <listitem>
- <para>Invoices</para>
- </listitem>
- <listitem>
- <para>Payments</para>
- </listitem>
- </orderedlist>
- </para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml
deleted file mode 100644
index e90e9b5..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Payment Method GL Account Type help screen</title>
- <para>The Payment Method GL Account Type Id is used to map the
- different payment methods (eg Cash, Cheque etc) to a specific GL
- Account Type Id. This will translate to one side of a GL entry only.
- </para>
- <para>A Payment Method is just a way to define the ways in which
- payments can be made. Each payment method can be linked to a different
- account in the general ledger. A main GL account used would be the one
- that represents the Company bank account. In the demo data mappings
- Electronic Funds Transfer, Company Account, Financial Account are all
- linked to the Company bank account GL account.</para>
- <para>OFBiz demo data defines 15 different payment methods as follows:
- </para>
- <itemizedlist>
- <listitem>
- <para>Cash</para>
- </listitem>
- <listitem>
- <para>Certified Cheque</para>
- </listitem>
- <listitem>
- <para>Company Account</para>
- </listitem>
- <listitem>
- <para>Company Cheque</para>
- </listitem>
- <listitem>
- <para>Electronic Funds Transfer (NOTE TO CHECK: Problem with
- definition or terminology - is this a Direct Debit.... ?? A direct
- debit is controlled by the payee and an automatic payment via bank
- account is controlled by the payer)</para>
- </listitem>
- <listitem>
- <para>Billing Account</para>
- </listitem>
- <listitem>
- <para>Cash on Delivery (COD)</para>
- </listitem>
- <listitem>
- <para>eBay</para>
- </listitem>
- <listitem>
- <para>Offline Payment (NOTE: Is this ambiguous - since COD is an
- offline payment...)</para>
- </listitem>
- <listitem>
- <para>PayPal</para>
- </listitem>
- <listitem>
- <para>WorldPay</para>
- </listitem>
- <listitem>
- <para>Financial Account</para>
- </listitem>
- <listitem>
- <para>Gift Certificate</para>
- </listitem>
- <listitem>
- <para>Money Order</para>
- </listitem>
- <listitem>
- <para>Personal Cheque</para>
- </listitem>
- </itemizedlist>
- <para>NOTE: A point to note is that these payment methods dont include
- Credit Cards....(which I think is on purpose...). The majority of
- these payment methods are linked to 'Undeposited Receipts' but an
- additional accounting transaction may be needed once the funds have
- cleared and are available in the Company bank account.</para>
- <section>
- <title>How do I add a new Payment Method Id / GL Account Id mapping?
- </title>
- <orderedlist>
- <listitem>
- <para>Select the 'Payment Method Type' from the drop down list
- </para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account Id' to map it to from the drop down
- list</para>
- </listitem>
- <listitem>
- <para>Press the 'Save' button</para>
- </listitem>
- <listitem>
- <para>The new Payment Method Type / GL Account Type mapping is
- displayed in the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Payment Method Id / GL Account Id mapping?
- </title>
- <para>A Payment Method Type / GL Account Type mapping cannot be
- updated directly but needs to be removed then re-created. If you try
- to update an existing entry you will get an 'duplicate key' error
- message</para>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the entry that you want to
- update</para>
- </listitem>
- <listitem>
- <para>The entry is removed from the list of entries displayed</para>
- </listitem>
- <listitem>
- <para>Select the 'Payment Method Type' from the drop down list
- </para>
- </listitem>
- <listitem>
- <para>Select the updated 'GL Account Type' to map it to from the
- drop down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Save' button</para>
- </listitem>
- <listitem>
- <para>The new Payment Method Type / GL Account Type mapping is
- displayed in the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I remove a Payment Method Id / Gl Account Id mapping?
- </title>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the entry that you want to
- delete</para>
- </listitem>
- <listitem>
- <para>The entry is removed from the list of entries displayed</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml
deleted file mode 100644
index 9e5f7fa..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Purchase Invoice help screen</title>
- <para>The Purchase Invoice sub menu is used to specify the default
- account to be used for the individual line items that appear on a
- Purchase Invoice. The items are identified by a line description which
- can be mapped to a specific general ledger account. Purchase invoices
- can be made up of a variety of items as well as the product that is
- being bought (eg discounts, promotions, work effort or labour costs
- etc). The majority of businesses will want to track these type of
- items separately in the general ledger and this screen will allow this
- type of setup.</para>
- <para>This setup will translate to one side of the journal entry only.
- </para>
- <para>IMPORTANT: This screen is one of the screens where the default
- entries that are displayed here are entered via the Global GL Settings
- under the sub menu 'Invoice Item Type'. This screen allows users to
- override the global settings for the Purchase Invoice item type. An
- example of why this could be necessary could be that a company many
- want to isolate the sales reporting of a specific department or
- business unit separately (eg subledgers etc) but still have the option
- of a 'catch all' global general ledger account.</para>
- <para>VERY IMPORTANT NOTE: Need to do more investigation but the it
- looks like these Purchase Invoice mappings dont work when used as part
- of the Purchase Order to Purchase Invoice Process.(Have been doing
- some tests to try and get it to post to a different account than
- 'Uninvoiced Shipment Receipts' and 'Inventory' but hasnt worked so
- far.) We need to be able to specify things such as Sales Tax, Freight
- and any Purchase Order adjustments.</para>
- <para>These override mappings do work if there is no Purchase Order
- just a Purchase Invoice as shown in the simple process below. How the
- Purchase Invoice mappings are used is best shown by an example. A very
- simple description of a Purchase Invoice Process could be as follows:
- </para>
- <orderedlist>
- <listitem>
- <para>You have ordered something from a supplier (eg indirect
- purchasing such as stationery etc via phone)</para>
- </listitem>
- <listitem>
- <para>The Supplier ships the products to you (NOTE: as they are not
- stored in the Warehouse but in your offices - so dont need an
- Inventory Receive.....????)</para>
- </listitem>
- <listitem>
- <para>You receive the product and an invoice from the Supplier
- (Purchase Invoice)</para>
- </listitem>
- <listitem>
- <para>You enter the Purchase Invoice pay the Supplier the amount
- invoiced</para>
- </listitem>
- </orderedlist>
- <para>Let's focus on step of 4 in more detail.</para>
- <itemizedlist>
- <listitem>
- <para>You have received the product from the supplier with an invoice
- </para>
- </listitem>
- <listitem>
- <para>In OFBiz you enter the Purchase Invoice using 'Create New' in
- the 'Invoices' menu of Accounting Manager</para>
- </listitem>
- <listitem>
- <para>Using the 'Items' sub menu you can create individual items on
- the Purchase Invoice (eg Paper, Pens, Sales Tax etc and they dont
- need to have a Product Id associated with them)</para>
- </listitem>
- <listitem>
- <para>When you add a new invoice item to the Purchase Invoice it is
- the 'Invoice Item Type' that is affected by the Purchase Invoice
- override mappings</para>
- </listitem>
- <listitem>
- <para>The Purchase Invoice can then be moved to various statuses
- (Approved, Received, Ready or Cancelled)</para>
- </listitem>
- <listitem>
- <para>When the status is moved to 'Ready' this is a trigger for an
- 'automatic' accounting transaction</para>
- </listitem>
- <listitem>
- <para>The transaction type generated is called 'Purchase Invoice' and
- it uses the Purchase Invoice override mappings</para>
- </listitem>
- </itemizedlist>
- <para>Transaction Type: Purchase Invoice, DR 516100 Purchase Order
- Adjustments , DR ????? Sales Tax, CR 210000 Accounts Payable </para>
- <section>
- <title>How do I add a new Purchase Invoice override mapping?</title>
- <para>By default there are no Purchase Invoice override mappings that
- are configured as part of the OFBiz demo data.</para>
- <orderedlist>
- <listitem>
- <para>Select the 'Invoice Purchase Item Type' from the drop down
- list</para>
- </listitem>
- <listitem>
- <para>Select the ' Invoice Override Expense GL Account Id' to map it
- to from the drop down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Save' button</para>
- </listitem>
- <listitem>
- <para>The new mapping will be displayed in the 'Invoice Override
- Expense GL Account' column in the list at the bottom of the screen
- </para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Purchase Invoice override mapping?</title>
- <para>An existing Purchase Invoice override mapping cannot be updated
- but needs to be removed and a new mapping added. If you try to add an
- override to an item that already has an override you will get a
- duplicate record error message.</para>
- </section>
- <section>
- <title>How do I remove a Purchase Invoice override mapping?</title>
- <para>NOTE: Only the override mapping can be deleted. The default
- mapping record cannot be deleted here (even though the Remove button
- is displayed next to it!)</para>
- <orderedlist>
- <listitem>
- <para>Locate the entry that needs the override deleted in the list
- of Purchase Invoice override mappings</para>
- </listitem>
- <listitem>
- <para>Press the 'Remove' button next to the entry</para>
- </listitem>
- <listitem>
- <para>The override mapping will be removed from the 'Invoice
- Override Expense GL Account' column of the entry </para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml
deleted file mode 100644
index ac574bb..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Sales Invoice help screen</title>
- <para>The Sales Invoice sub menu is used to specify the default account
- to be used for the individual line items that appear on a Sales
- Invoice. The items are identified by a line description which can be
- mapped to a specific general ledger account. Sales invoices can be
- made up of a variety of items as well as the product that is being
- sold (eg discounts, promotions, work effort or labour costs etc). The
- majority of businesses will want to track these type of items
- separately in the general ledger and this screen will allow this type
- of setup.</para>
- <para>This setup will translate to one side of the journal entry only.
- </para>
- <para>A key mapping used is linked directly to the Product Type (eg
- Invoice Digital Good Item, Invoice Finished Good Item, Invoice
- Finished/Digital Good Item....). This controls where the sales revenue
- received from the sale of the product is stored in the general ledger
- </para>
- <para>Only a limited number of general ledger accounts that are
- available to be mapped. Currently this is 7 and limited to the
- accounts that have been assigned to the organisation from the Global
- Chart of Accounts that have a 'GL Account Class Id' = 'Revenue' (NOTE:
- You will see that Discounts on Sales is not available to be selected
- because it's GL Account Class Id = 'Cost of Goods Sold Expense'. It
- appears as a default because it is setup in the Global GL settings
- that doesnt seem to have any limitations of the account.)</para>
- <para>IMPORTANT: This screen is one of the screens where the default
- entries that are displayed here are entered via the Global GL Settings
- under the sub menu 'Invoice Item Type'. This screen allows users to
- override the global settings for the Sales Invoice item type. An
- example of why this could be necessary could be that a company many
- want to isolate the sales reporting of a specific department or
- business unit separately (eg subledgers etc) but still have the option
- of a 'catch all' global general ledger account.</para>
- <para>If an override account is added it will appear in the Override GL
- Account column on the screen.</para>
- <para>The only mapping that seems a bit out of place here is Sales Tax.
- It is blank because Sales Tax is setup using Tax Authorities so dont
- know why you would want to override the Sales Tax account to a Sales
- Revenue Account.</para>
- <para>NOTE: Also need to highlight that in the Global Settings it uses
- the ENUM description to select the item and there are duplicate
- descriptions between the Sales Invoice and the Purchase Invoice. Not
- too much of a problem here but it does cause problems in Agreements
- when setting up things like Commissions based on line items as you
- cant tell the difference between the description of a Sales Invoice
- item called 'Invoice Adjustment' and a Purchase Invoice item called
- 'Invoice Adjustment' ..... except by trial and error</para>
- <para>How the Sales Invoice mappings are used is best shown by an
- example. A very simple description of an online Sales Order Process
- could be as follows:</para>
- <orderedlist>
- <listitem>
- <para>Customer Orders a Product (and Creates a Sales Order)</para>
- </listitem>
- <listitem>
- <para>Customer Pays for Product (via Credit Card, Internet Banking
- etc)</para>
- </listitem>
- <listitem>
- <para>Vendor confirms Payment and Dispatches the Product to the
- Customer</para>
- </listitem>
- </orderedlist>
- <para>Let's focus on the second part step of 3 in more detail.</para>
- <itemizedlist>
- <listitem>
- <para>The vendor has verified that the customer payment has been
- received</para>
- </listitem>
- <listitem>
- <para>In OFBiz Order Manager they will then look up the relevant
- Sales Order and then click the 'Quick Ship Entire Order' button to
- log the dispatch of the order in the system</para>
- </listitem>
- <listitem>
- <para>The 'Quick Ship Entire Order' button is a trigger for an
- 'automatic' accounting transaction</para>
- </listitem>
- <listitem>
- <para>The transaction type that is triggered is called 'Sales
- Invoice' </para>
- </listitem>
- </itemizedlist>
- <para>Transaction Type: Sales Invoice DR 120000 Accounts Receivable, DR
- 410000 Discounts on Sales, DR 400000 Sales, CR 22????? Sales Tax
- Collected </para>
- <para>DR Sales is used for item promotions where product cost is simply
- reversed. Only order promotions are coded to Discounts. The Sales Tax
- account will be dependent on your sales tax setup. The demo data posts
- to tax accounts by US state.</para>
- <para>One of the CR (or Credit) entries for the Sales Invoice
- transaction is created using the Sales mapping defined here in the
- Sales Invoice (and the other is created another GL Account default for
- 'Tax Authority GL Accounts')</para>
- <para>All of the the DR (or Debit) entries for the Sales Invoice
- transaction (except for Accounts Receivable which is comes from the GL
- Account Type defaults) are created using the mappings defined here in
- the Sales Invoice</para>
- <section>
- <title>How do I add a Sales Invoice override mapping?</title>
- <para>By default there are no Sales Invoice override mappings that are
- configured as part of the OFBiz demo data.</para>
- <orderedlist>
- <listitem>
- <para>Select the 'Invoice Item Type' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the ' Override Revenue GL Account Id' to map it to from
- the drop down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Save' button</para>
- </listitem>
- <listitem>
- <para>The new mapping will be displayed in the 'Override GL Account'
- column in the list at the bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Sales Invoice override mapping?</title>
- <para>An existing Sales Invoice override mapping cannot be updated but
- needs to be removed and a new mapping added. If you try to add an
- override to an item that already has an override you will get a
- duplicate record error message.</para>
- </section>
- <section>
- <title>How do I remove a Sales Invoice override mapping?</title>
- <para>NOTE: Only the override mapping can be deleted. The default
- mapping record cannot be deleted here (even though the Remove button
- is displayed next to it!)</para>
- <orderedlist>
- <listitem>
- <para>Locate the entry that needs the override deleted in the list
- of Sales Invoice override mappings</para>
- </listitem>
- <listitem>
- <para>Press the 'Remove' button next to the entry</para>
- </listitem>
- <listitem>
- <para>he override mapping will be removed from the 'Override GL
- Account' column of the entry</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml
deleted file mode 100644
index 66a2b06..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The GL Account Type Defaults help screen</title>
- <para>The GL Account Defaults screens are are method to setup rules
- that are used to translate business transactions into accounting
- transactions. It currently is made up of 12 sub menus that can be used
- to map various transaction type codes to a specific general ledger
- account</para>
- <para>Accounting transactions are made up of a Debit Entry and a Credit
- Entry. The GL Account defaults screens help map which accounts are to
- be used to generate a each part of the transaction. This means that
- certain mappings will be used to generate the Debit (or DR) entry part
- of the transaction and others used to generate the Credit (or CR)
- entry part of the transaction.</para>
- <para>NOTE: Many of the accounting transactions are generated
- 'automatically' (or in the background) using the the accounting
- services SECAS / EECAS. </para>
- <para>The GL Account Type is used to specify the default account that
- certain transactions (eg Accounts Payable, Accounts Receivable, etc)
- are posted to. An accounting transaction (or journal entry) is made up
- of two parts - a Debit Entry and a Credit Entry that balance each
- other. The GL Account Type is used to translate one side of the
- journal entry. </para>
- <para>GL Account Types are stored in Entity GLAccountType which can be
- viewed via Entity Data Maintenance in the Webtools menu. There are
- currently 57 different GL Account Types that are part of the OFBiz
- demo data but only 19 of these are setup as mappings</para>
- <para>How the GL Account Type is used is best shown by an example. A
- very simple description of an online Sales Order Process could be as
- follows:</para>
- <orderedlist>
- <listitem>
- <para>Customer Orders a Product (and Creates a Sales Order)</para>
- </listitem>
- <listitem>
- <para>Customer Pays for Product (via Credit Card, Internet Banking
- etc)</para>
- </listitem>
- <listitem>
- <para>Vendor confirms Payment and Dispatches the Product to the
- Customer</para>
- </listitem>
- </orderedlist>
- <para>Let's focus on the first part step of 3 in more detail.</para>
- <itemizedlist>
- <listitem>
- <para>The vendor has checked their bank statement and seen that the
- customer has paid</para>
- </listitem>
- <listitem>
- <para>In OFBiz Order Manager they will then look up the relevant
- Sales Order and then click the 'Receive Payment' button to log the
- payment in the system</para>
- </listitem>
- <listitem>
- <para>The 'Receive Payment' button is a trigger for an 'automatic'
- accounting transaction</para>
- </listitem>
- <listitem>
- <para>The transaction type that is triggered is called 'Incoming
- Payment'</para>
- </listitem>
- <listitem>
- <para>The accounting entries generated are: DR 112000 Undeposited
- Funds , CR 120000 Accounts Receivable </para>
- </listitem>
- </itemizedlist>
- <para>The CR (or Credit) entry for the transaction is created by the GL
- Acccount Type mapping for 'Accounts Receivable' (which by using the
- demo data default will go the 120000 Accounts Receivable)</para>
- <para>The DR (or Debit) entry for the transaction is created by a
- different GL Account default, the Payment Method Id / GL Account Id
- mapping (eg Cash is setup as 112000 Undeposited Receipts)</para>
- <section>
- <title>How do I create a new GL Account Type default mapping?</title>
- <para>There are currently 57 different GL Account Types that come as
- part of the demo data with OFBiz. This should be enough to manage the
- vast majority of business transactions. These instructions show how
- to add a mapping using the default data</para>
- <orderedlist>
- <listitem>
- <para>Select the 'GL Account Type Id' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account' to map it to from the drop down list
- </para>
- </listitem>
- <listitem>
- <para>Press the 'Save' button</para>
- </listitem>
- <listitem>
- <para>The new GL Account Type mapping is displayed in the list at
- the bottom of the screen </para>
- </listitem>
- </orderedlist>
- <para>NOTE: If none of the demo data GL Account Types are sufficient
- then new ones can be added using Entity Data Maintenance and the
- entity 'GLAccountType' in the Webtools menu.</para>
- </section>
- <section>
- <title>How do I update a GL Account Type default mapping?</title>
- <para>A GL Account Type mapping cannot be updated directly but needs
- to be removed then re-created. If you try to update an existing entry
- you will get an 'duplicate key' error message.</para>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the entry that you want to
- update</para>
- </listitem>
- <listitem>
- <para>The entry is removed from the list of entries displayed</para>
- </listitem>
- <listitem>
- <para>Select the 'GL Account Type Id' from the drop down list</para>
- </listitem>
- <listitem>
- <para>Select the updated 'GL Account' to map it to from the drop
- down list</para>
- </listitem>
- <listitem>
- <para>Press the 'Save' button</para>
- </listitem>
- <listitem>
- <para>The new GL Account mapping is displayed in the list at the
- bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I delete a GL Account Type default mapping?</title>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the entry that you want to
- delete</para>
- </listitem>
- <listitem>
- <para>The entry is removed from the list of entries displayed</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml
deleted file mode 100644
index 0d70428..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Payment Type GL Account Type help screen</title>
- <para>The Payment Type GL Account Type Id is used to translate (or map) the different payment types to a specific GL Account Type Id. The GL Account Type Id is then used via the 'GL Account Type Id' defaults to translate to one side of a journal entry.</para>
- <para>NOTE: This GL Account default is used to link to another one of the GL Account defaults.</para>
- <para>A Payment Type is just a way to categorize transactions. Examples of Payment Types could be as follows:</para>
- <itemizedlist>
- <listitem><para>Commission Payments</para></listitem>
- <listitem><para>Customer Payments</para></listitem>
- <listitem><para>Vendor (or Supplier) Payments</para></listitem>
- <listitem><para>Customer Refunds</para></listitem>
- <listitem><para>Customer Prepayments or Deposits</para></listitem>
- </itemizedlist>
- <para>These payment types can then be mapped to the required account type in the Chart of Account. Examples of these type of mappings could be as follows:</para>
- <itemizedlist>
- <listitem><para>Customer Payments are mapped to Account Receivable </para></listitem>
- <listitem><para>Vendor (or Supplier) Payment are mapped to Account Payable</para></listitem>
- <listitem><para>Customer Refunds are mapped to Customer Credits</para></listitem>
- </itemizedlist>
- <section>
- <title>How do I add a Payment Type / GL Account Type Id mapping?</title>
- <para>There are currently 14 different Payment Type / GL Account Types mappings that come as part of the demo data with OFBiz and should cover a good variety of payment related transactions.</para>
- <orderedlist>
- <listitem><para>Select the 'Payment Type Id' from the drop down list</para></listitem>
- <listitem><para>Select the 'GL Account Type Id' to map it to from the drop down list</para></listitem>
- <listitem><para>Press the 'Save' button</para></listitem>
- <listitem><para>The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen</para></listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Payment Type / GL Account Type Id mapping?</title>
- <para>A Payment Type / GL Account Type mapping cannot be updated directly but needs to be removed then re-created. If you try to update an existing entry you will get an 'duplicate key' error message.</para>
- <orderedlist>
- <listitem><para>Press the 'Remove' button next to the entry that you want to update</para></listitem>
- <listitem><para>The entry is removed from the list of entries displayed</para></listitem>
- <listitem><para>Select the 'Payment Type Id' from the drop down list</para></listitem>
- <listitem><para>Select the updated 'GL Account Type Id' to map it to from the drop down list</para></listitem>
- <listitem><para>Press the 'Save' button</para></listitem>
- <listitem><para>The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen</para></listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I remove a Payment Type / GL Account Type Id mapping?</title>
- <orderedlist>
- <listitem><para>Press the 'Remove' button next to the entry that you want to delete</para></listitem>
- <listitem><para>The entry is removed from the list of entries displayed</para></listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml
deleted file mode 100644
index bf3ccc9..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Available Internal Organizations help screen</title>
- <para>The default screen shows a list of Party Groups that have the
- role of 'Internal Organization' associated with them. If you have
- installed the demo data then the default company 'Company' as well as
- departments / business units and regional subsidiaries will be
- displayed.</para>
- <para>For each 'Internal Organization' there is the ability to set the
- currency, fiscal periods and invoice prefixes.</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml
deleted file mode 100644
index 6250e34..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Chart of Accounts help screen</title>
- <para>OFBiz comes with a master template for a very comprehensive chart
- of accounts. This can be found in 'Global GL Defaults' under the
- 'Accounting' tab.</para>
- <para>A couple of points to note</para>
- <itemizedlist>
- <listitem>
- <para>you do not need to use all the accounts defined in this master
- template (but it may be simpler to look for the accounts that you
- can use or rename)</para>
- </listitem>
- <listitem>
- <para>you can create your own additional accounts if you dont want to
- use the ones in the master template</para>
- </listitem>
- </itemizedlist>
- <para>The chart of accounts for the default organisation (Company) is
- built up by selecting the accounts that you want to use from the
- global chart of accounts master template. This means that if you want
- to create a new account then you need to create it first in the Global
- Chart of Accounts and then link (or assign) it to the chart of
- accounts for Company.</para>
- <para>Details of the Chart of Accounts can be exported as a CSV file or
- PDF using the buttons displayed.</para>
- <para>IMPORTANT NOTE: You need to be careful if you do decide to create
- your own accounts that they contain all the details required and that
- they are linked into the relevant configuation for the setup of the GL
- defaults. This means that if you change an account (eg Inventory) to
- one of your own - you need to check the GL defaults setup and replace
- any reference to the Inventory account to the one you have created.
- </para>
- <para>This Chart of Accounts screen is used to define the list of
- accounts (or chart) that will be actively used by the company.For
- example the Global chart of accounts may contain 100 different
- accounts but only 20 need to be used for your specific business. This
- means the you need only to create assignments to the accounts that you
- actively want to use.</para>
- <para>The Chart of Accounts is a mixture of business needs (ie being
- able to track the information you need for your business) and tax
- requirements (i.e. legal or government requirements necessary for
- operating a business). The type of Chart that you setup will be
- dependent of your business type.</para>
- <section>
- <title>How do I create a Chart of Accounts?</title>
- <para>As mentioned above the chart of accounts for the default
- organisation (Company) is built up by selecting the accounts that you
- want to use from the global chart of accounts master template. This
- means that if you want to create a new account then you need to
- create it first in the Global Chart of Accounts and then link (or
- assign) it to the chart of accounts for Company. By creating an
- assignment to an account it is then added to the Chart of Accounts.
- </para>
- <orderedlist>
- <listitem>
- <para>Select the account Gl Account Id that you need from the drop
- down box</para>
- </listitem>
- <listitem>
- <para>Press the 'Create Assignment' button</para>
- </listitem>
- <listitem>
- <para>The account is added to the Chart of Account</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a Chart of Accounts?</title>
- <para>Updating the Chart of Accounts will involve either creating a
- new assignment or removing an existing one. A new assignment is
- created using the instructions above. The added complication may be
- that the account that you need does not exist in the Global Chart of
- Accounts. As mentioned above it will need to be created and then
- linked.</para>
- <para>See the instructions below to remove an existing account
- assignment. </para>
- <para>NOTE: If a completely new account is required that does not
- already exist as part of the Global Chart of Accounts template then
- it will need to be created as part of the Global template first
- before it can be used as an assignment in the Organisation Chart of
- Accounts.</para>
- </section>
- <section>
- <title>How do I delete a Chart of Accounts?</title>
- <para>Accounts are not deleted from the Chart of Accounts - they are
- simply no longer selected to be used.</para>
- <para>It is important that you do not remove accounts that are active
- and have already been used for transactions. Even if the net balance
- of the account is zero then from an audit perspective then you should
- not be removing accounts.</para>
- <para>You should only be looking to remove accounts that have not been
- used. To un-link or un-assign accounts from the default company then
- use the Entity Data Maintenance from the Webtools menu. Look for the
- entity 'GlAccountOrganization' and delete the record to remove the
- link.</para>
- </section>
- <section>
- <title>How do I update the details for an account in the Chart of
- Accounts?</title>
- <para>Details of the accounts that make up the Chart of Accounts can
- be accessed from this screen. </para>
- <orderedlist>
- <listitem>
- <para>Click on the 'GL Account Id' of the account required</para>
- </listitem>
- <listitem>
- <para>The 'Edit GL Account' screen is displayed showing the details
- of the account selected (NOTE:This screen is also accessible via
- 'Global GL Settings / Chart of Account / Navigate Accounts '</para>
- </listitem>
- <listitem>
- <para>Amend the fields required (NOTE: The GL Account Id and Posted
- Balance fields cannot be amended)</para>
- </listitem>
- <listitem>
- <para>Press the 'Update' button </para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml
deleted file mode 100644
index eafa3c6..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting Preferences help screen</title>
- <para>Accounting Preferences are a set of configuration details that
- are related to a party. To appear on this screen the party must be
- setup with the role of 'Internal Organisation'. This means that you
- can add the internal organisation role to a party and they will be
- added to this screen and then can be configured.</para>
- <para>The master default party is 'Company' but preferences can also be
- setup for internal departments. The demo data shows some examples of
- this (eg Marketing, Accounting, Sales, Development etc). Unless
- overridden then then all other parties appearing on this screen will
- take their default setup from 'Company'</para>
- <para>NOTE: The majority of the configuration information displayed in
- Accounting Preferences are taken from the Enumeration entity.</para>
- <para>It is used for setting specifying information related to the
- accounting setup for a specific organisation or parties that exist
- within an organisation such as business units, cost centres,
- departments ,subsidiaries etc. Information that can be setup include
- the following:</para>
- <itemizedlist>
- <listitem>
- <para>The start date of the Time Periods and Fiscal or Accounting
- Year (eg 1st April, 1st January, 1st June etc)</para>
- </listitem>
- <listitem>
- <para>Tax Return Form (NOTE: Need to check how important this is and
- where it is used.......possibly some kind of reporting???)</para>
- </listitem>
- <listitem>
- <para>The method to be used for calculating Cost of Goods Sold (COGS)
- </para>
- </listitem>
- <listitem>
- <para>Base Currency - eg USD, GBP, EUR etc (NOTE: May have main
- company in USD but a subsidiary in EUR etc)</para>
- </listitem>
- <listitem>
- <para>Invoice prefix, numbering and sequencing (eg you may want each
- business unit / subsidiary to have its own invoice numbering or
- sequence etc)</para>
- </listitem>
- <listitem>
- <para>Quote prefix, number and sequencing</para>
- </listitem>
- <listitem>
- <para>Method to be used for refunds (eg cheque, direct bank credit,
- voucher credit etc...)</para>
- </listitem>
- <listitem>
- <para>Specify which journal will be used to store error transactions
- </para>
- </listitem>
- </itemizedlist>
- <para>NOTE: Key things that are usually need to be amended include the
- base currency for the company, fiscal year information and invoice
- numbering prefix or sequencing.</para>
- <section>
- <title>How do I create or setup a new Accounting Preference?</title>
- <para>IMPORTANT NOTE: A party must be setup with the role of 'Internal
- Organisation' before it will appear on the Accounting Preferences
- screen so that it can be setup.</para>
- <orderedlist>
- <listitem>
- <para>Select the 'Setup' button next to the party to be setup</para>
- </listitem>
- <listitem>
- <para>The Accounting Preferences screen is displayed. (IMPORTANT:
- The first time this screen is displayed all of the fields will be
- modifiable. Once this has been saved only certain fields will be
- modifiable!!)</para>
- </listitem>
- <listitem>
- <para>The default entries will be based on (or inherited from)
- 'Company'</para>
- </listitem>
- <listitem>
- <para>Enter any changes that are required (eg Invoice Prefix, Error
- Journal name - as you may want error transactions from separate
- departments to be handled differently...)</para>
- </listitem>
- <listitem>
- <para>Press the 'Add' button</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update an Accounting Preference?</title>
- <orderedlist>
- <listitem>
- <para>Select the 'Setup' button next to the party to be setup</para>
- </listitem>
- <listitem>
- <para>The Accounting Preferences screen is displayed but only
- certain fields will be modifiable</para>
- </listitem>
- <listitem>
- <para>Enter any changes required</para>
- </listitem>
- <listitem>
- <para>Press the 'Update' button</para>
- </listitem>
- </orderedlist>
- <para>NOTE: If you need to change any of the fields that are not
- modifiable then it can be done via the Entity Data Maintenance on
- Webtools menu using the PartyAcctgPreference entity. You will need to
- be careful in editing an existing preference especially if the
- configuration already been used for transactions.</para>
- </section>
- <section>
- <title>How to I delete an Accounting Preference?</title>
- <para>There is currently no delete option via the user interface but
- an Accounting Preference can be removed by deleting the role of
- 'Internal Organisation' from the party record.</para>
- <para>NOTE TO CHECK: Need to investigate the impact of using an
- accounting preference then removing it. What happens to the
- transactions in process etc......???</para>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml
deleted file mode 100644
index 49ddeb6..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Journals help screen</title>
- <para>A journal is a detailed accounting transaction that is recorded
- (or posted) to the General Ledger. It is made up of a debit and a
- credit component.(IMPORTANT NOTE TO CHECK: Is this screen really about
- Journals or is it about Suspense Accounts.....??????)</para>
- <para>NOTE: By default in OFBIZ a journal called 'ERROR_JOURNAL' is
- created as part of the demo data installation.This 'ERROR_JOURNAL' is
- referenced in the Accounting Preferences setup for 'Company'. The
- 'ERROR_JOURNAL' is used to store details of any transaction that fails
- and cannot be posted to a general ledger account. Transactions falling
- into error can be as the result of incomplete setup or an invalid
- transaction (eg a transaction that should never occur).</para>
- <section>
- <title>How do I create a journal?</title>
- <orderedlist>
- <listitem>
- <para>Enter a journal name in the Gl Journal Name field (eg
- MY_JOURNAL)</para>
- </listitem>
- <listitem>
- <para>Press the 'Submit' button</para>
- </listitem>
- <listitem>
- <para>The journal is created and will appear in the journal list at
- the bottom of the screen (Note that the Journal ID is automatically
- generated)</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a journal?</title>
- <orderedlist>
- <listitem>
- <para>Select the journal to be updated from the list of journals at
- the bottom of the screen</para>
- </listitem>
- <listitem>
- <para>The journal details will be displayed on the screen</para>
- </listitem>
- <listitem>
- <para>Update the Gl Journal Name (as this is currently the only
- field that can be updated)</para>
- </listitem>
- <listitem>
- <para>Press the 'Submit' button</para>
- </listitem>
- <listitem>
- <para>The updated journal will appear in the journal list at the
- bottom of the screen</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I delete a journal?</title>
- <para>Be careful if you need to remove an existing journal as it may
- have transactions associated with it.</para>
- <orderedlist>
- <listitem>
- <para>Press the 'Remove' button next to the journal that you want to
- delete</para>
- </listitem>
- <listitem>
- <para>The journal is deleted and the screen is redisplayed</para>
- </listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml
deleted file mode 100644
index 2fa0643..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Time Periods help screen</title>
- <para>Time periods are a defined period of time (usually a month,
- quarter or year) that is used to group business transactions. It is a
- key part of any general accounting setup.</para>
- <para>Time periods can be used for the definition of :</para>
- <itemizedlist>
- <listitem>
- <para>Company Financial Year</para>
- </listitem>
- <listitem>
- <para>Fiscal / Tax Periods (weeks, months, quarters)</para>
- </listitem>
- <listitem>
- <para>VAT / GST Periods</para>
- </listitem>
- <listitem>
- <para>Sales Periods</para>
- </listitem>
- </itemizedlist>
- <para>The screen is divided into 3 main areas. The first two show lists
- of the open and closed time periods. The area at the bottom allows you
- to define and enter a new time period.</para>
- <section>
- <title>How do I add a new Financial Year time period?</title>
- <orderedlist>
- <listitem>
- <para>Using the area at the bottom of the screen labelled 'New'
- </para>
- </listitem>
- <listitem>
- <para>Leave the Parent Period Id field blank (NOTE: The financial
- year will be the parent of other time periods eg fiscal months or
- GST / VAT periods)</para>
- </listitem>
- <listitem>
- <para>Select 'Fiscal Year' from the 'Period Type Id' drop down box
- </para>
- </listitem>
- <listitem>
- <para>Enter '13' in the Period Num field (NOTE: You can use any
- number that does not conflict with the other time periods you want
- to use. We plan to define 12 fiscal or tax months so will use 13
- for the year)</para>
- </listitem>
- <listitem>
- <para>Enter 'FY 2010-2011' in the Period Name field (NOTE: You can
- use any name you want but make sure it makes sense. This example is
- an abbreviation for Fiscal Year 2010-2011)</para>
- </listitem>
- <listitem>
- <para>Select '1st April 2010' using the calendar lookup in the 'From
- Date' field</para>
- </listitem>
- <listitem>
- <para>Select '1st April 2011' using the calendar lookup in the 'Thru
- Date' field (NOTE: Even though we want our financial year to end on
- 31st March 2011 the test used is based on less than not an equal
- to)</para>
- </listitem>
- <listitem>
- <para>Leave the 'Is Closed' field at its default of 'No'</para>
- </listitem>
- <listitem>
- <para>Press the 'Create' button</para>
- </listitem>
- <listitem>
- <para>The new time period will now be displayed in the list of open
- time periods.</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I add a new GST/ VAT time period?</title>
- <orderedlist>
- <listitem>
- <para>Using the area at the bottom of the screen labelled 'New'
- </para>
- </listitem>
- <listitem>
- <para>Select the previously created financial year 'FY 2010-2011' in
- the Parent Period Id field</para>
- </listitem>
- <listitem>
- <para>Select 'Fiscal Month' from the 'Period Type Id' drop down box
- </para>
- </listitem>
- <listitem>
- <para>Enter '1' in the Period Num field (NOTE: This is the first of
- 12 periods that we want to define.) </para>
- </listitem>
- <listitem>
- <para>Enter 'FM April 2010' in the Period Name field (NOTE: You can
- use any name you want but make sure it makes sense. This example is
- an abbreviation for Fiscal Month April 2010)</para>
- </listitem>
- <listitem>
- <para>Select '1st April 2010' using the calendar lookup in the 'From
- Date' field</para>
- </listitem>
- <listitem>
- <para>Select '1st May 2010' using the calendar lookup in the 'Thru
- Date' field (NOTE: Even though we want our fiscal month to end on
- 30th April 2010 the test is used is based on less than not an equal
- to)</para>
- </listitem>
- <listitem>
- <para>Leave the Is Closed field at its default of 'No'</para>
- </listitem>
- <listitem>
- <para>Press the 'Create' button</para>
- </listitem>
- <listitem>
- <para>The new time period will now be displayed in the list of open
- time periods.</para>
- </listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I update a time period?</title>
- <para>NOTE: Time periods cannot be updated via the current time
- periods screen. If you need to amend time period details then it can
- be done via Entity Data Maintenance in the Webtools menu.</para>
- </section>
- <section>
- <title>How do I close a time period?</title>
- <orderedlist>
- <listitem>
- <para>To close a time period select the 'Close' button next to the
- time period.</para>
- </listitem>
- <listitem>
- <para>The time period will be removed from the current open time
- periods area and re-displayed in the closed time periods section of
- the screen.</para>
- </listitem>
- </orderedlist>
- <para>NOTE: Closing a time period is a trigger for an automatic
- accounting transaction as follows:</para>
- <itemizedlist>
- <listitem>
- <para>Transaction Type: Period Closing</para>
- </listitem>
- <listitem>
- <para>DR ?????? (based on the GL account type mapping for Profit
- Loss) </para>
- </listitem>
- <listitem>
- <para>CR 336000 Retained Earnings (based on GL account type mapping
- for Retained Earnings)</para>
- </listitem>
- </itemizedlist>
- <para>NOTE: Both sides of this accounting transaction uses the same GL
- account type default mapping. The account mapping for 'Profit Loss'
- is not setup as part of the demo data so this transaction will not
- automatically post to the general ledger but will instead be put in
- the ERROR_JOURNAL as an unposted transaction. The transaction value
- is zero for both sides of journal...Even if it does have a value do
- we want to move it from P and L to Equity during the financial year?
- Normally this is done once at the end of the financial year.</para>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml
deleted file mode 100644
index 065ce5e..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>Organization GL Settings.</title>
- <xi:include href="HELP_ACCOUNTING_ListCompanies.xml"/>
- <xi:include href="HELP_ACCOUNTING_PartyAcctgPreference.xml"/>
- <xi:include href="HELP_ACCOUNTING_ListGlAccountOrganization.xml"/>
- <xi:include href="HELP_ACCOUNTING_SetupGlJournals.xml"/>
- <xi:include href="HELP_ACCOUNTING_GlAccountTypeDefaults.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditProductGlAccounts.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml"/>
- <xi:include href="HELP_ACCOUNTING_GlAccountSalInvoice.xml"/>
- <xi:include href="HELP_ACCOUNTING_GlAccountPurInvoice.xml"/>
- <xi:include href="HELP_ACCOUNTING_GlAccountTypePaymentType.xml"/>
- <xi:include href="HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml"/>
- <xi:include href="HELP_ACCOUNTING_EditPartyGlAccount.xml"/>
- <xi:include href="HELP_ACCOUNTING_TimePeriods.xml"/>
-</section>
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc
new file mode 100644
index 0000000..9ebd23a
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc
@@ -0,0 +1,58 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Credit Card Type GL Accounts
+The Credit Card Type / GL Account default is used to map different types of credit card to different general ledger accounts.
+
+NOTE: This setup will affect one side of a journal entry only.
+
+This type of mapping is useful if you need to track the amounts to be collected from different credit card agents.
+
+The OFBiz demo data comes with some setup here
+
+NOTE: TO CHECK The demo entries appear to be duplicated...has something changed in ENUM for defining
+ each credit card type.....?????)
+
+Examples are as follows:
+
+* American Express
+* Visa
+* Mastercard
+* Diners Club
+
+== How do I add a Credit Card Type GL Account mapping?
+There are 10 mappings that come as part of the OFBiz demo data but they do appear to be duplicated for some reason.
+
+. Select the 'Card Type' from the drop down list
+. Select the 'GL Account Id' to map it to from the drop down list
+. Press the 'Add' button
+. The new 'Credit Card / GL Account Id' mapping is displayed in the list at the bottom of the screen
+
+== How do I update a Credit Card Type GL Account mapping?
+. Select the 'Card Type' from the drop down list
+. Select the updated 'GL Account Id' to map it to from the drop down list
+. Press the 'Add' button
+. The updated 'Credit Card Type / GL Account' mapping is displayed in the list at the bottom of the screen
+
+NOTE: TO CHECK Used 'Visa' as an example to update and the 'CCT_VISA' was updated but the 'Visa' one was'nt.
+ This is probably related to the duplication.
+
+== How do I remove a Credit Card Type GL Account mapping?
+. Press the 'Remove' button next to the entry that you want to delete
+. The entry is removed from the list of entries displayed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc
new file mode 100644
index 0000000..49b4ac2
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc
@@ -0,0 +1,56 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Tax Authority GL Accounts
+The Tax Authority / GL Account default is used to map different tax authorities to different general ledger accounts.
+This setup will affect one side of a journal entry only.
+
+NOTE: A tax authority is legal body usually the state (country) that imposes a financial levy on business transactions.
+
+Normal business rules require you will to keep track amounts collected or paid to different tax authorities separately.
+This mapping ensures that money collected or paid to various tax authorities (eg through Sales Orders, Purchase Orders etc)
+ can be separated into specific accounts
+
+The OFBiz demo data comes with 9 entries to show an example of how this can be setup using the some of the US states
+ as separate tax authorities.
+
+== How do I add a Tax Authority / GL Account mapping?
+Unlike the other GL Account defaults you cannot add a Tax Authority / GL mapping through these screens.
+It needs to be done via the 'GL Accounts' sub menu under the 'Tax Authorities' menu.
+
+The method of how to add a mapping using the 'Tax Authorities' is shown below.
+
+. From the Accounting Manager / Tax Authorities Menu press the 'Edit' button next to the Tax Authority required
+. Select the sub menu 'GL Accounts'
+. Enter or Lookup the party for the 'Organisation Party Id' field (NOTE: Use 'Company' as default)
+. Enter or Lookup the GL Account to be mapped to
+. Press the 'Add' button
+. The mapping will be displayed at the bottom of the screen.
+. Return to the Tax Authority / GL Account default and this new mapping will be shown in the list
+
+== How do I update a Tax Authority / GL Account mapping?
+Only the GL Account Id linked to the mapping can be updated.
+
+. Locate the Tax Authority / GL Account entry that needs to be updated
+. Select the new 'GL Account Id' from the drop down list next to the entry
+. Press the 'Update' button next to the entry
+
+== How do I remove a Tax Authority / GL Account mapping?
+. Locate the Tax Authority / GL Account entry that needs to be removed
+. Press the 'Delete' button next to the entry
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc
new file mode 100644
index 0000000..378e716
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc
@@ -0,0 +1,66 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Party GL Account mapping
+The Party / GL Account mapping allows the translation of different account types (eg Accounts Receivable, Accounts Payable etc)
+ for a party to be mapped to a separate general ledger account.
+
+The party role (eg Bill To Customer) is also used to define the mapping even further.
+
+OFBiz demo data setup comes with no entries here.
+
+It is used as a way of implementing subledger functionality in OFBiz.
+Subledger functionality is where a higher level account can be split into lower levels.
+In this case these lower levels can be by party.
+
+An example could be that a business may want to use the general ledger to track the Accounts Receivable (AR) by customer
+ so the chart of account would be setup something like as follows:
+
+120000 Accounts Receivable
+
+* 120010 Accounts Receivable - Customer A
+* 120020 Accounts Receiviable - Customer B
+* 120030 Accounts Receivalbe - Customer C
+
+This has the main AR account is at the top of the hierarchy and 3 sub accounts below it.
+
+Entries for Customers A, B and C would be setup with a role of 'Bill From Customer' as this is a role associated
+ with the customer when the Sales Invoice is generated.When a transaction matching the criteria is processed in the system
+ then these mappings will control where it is posted to.In the case of Customer A any AR transactions with
+ role 'Bill To Customer' are posted to '120010' instead of the standard '120000
+
+== How do I add a new Party / GL Account mapping?
+. Enter or Lookup the party for the 'Party Id' field
+. Select the 'Role Type Id' from the drop down list +
+ (NOTE: Be careful that you select the correct role for the transactions you want to track......)
+. Select the 'GL Account Type Id' from the drop down list
+. Select the 'GL Account Id' from the drop down list
+. Press the 'Add' button
+. The new entry will be displayed at the bottom of the screen
+
+== How do I update a Party / GL Account mapping?
+Only the GL Account Id linked to the mapping can be updated.
+
+. Locate the Party / GL Account entry that needs to be updated
+. Select the new 'GL Account Id' from the drop down list next to the entry
+. Press the 'Update' button next to the entry
+
+== How do I remove a Party / GL Account mapping?
+. Locate the Party / GL Account entry that needs to be removed
+. Press the 'Delete' button next to the entry
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc
new file mode 100644
index 0000000..7399906
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc
@@ -0,0 +1,59 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Product Category GL Accounts
+The Product Category GL Account is used to specify the default account to be used for a specific 'Product Category' and
+ 'Account Type' combination.
+This setup will translate to one side of the journal entry only.
+
+It is used for tracking product category transactions at a more detailed level.
+
+Examples could be as follows:
+
+* Tracking Accounts Receivable by Product Category in the General Ledger
+* Tracking Cost of Goods by Product Category in the General Ledger
+* Tracking Commissions paid by Product Category in the General Ledger
+
+The demo data gives an idea of the use of product categories to classify or separate different products streams.
+If specific accounting or management reporting is required at this level then the General Ledger can be setup
+ to provide this detail.
+
+== How do I add a new Product Category / GL Account Type mapping?
+By default there are no Product Category / GL Account Type mappings that are configured as part of the OFBiz demo data.
+
+. Select the 'Account Type' from the drop down list +
+ (NOTE: In other screens this field is call the 'GL Account Type Id'.....)
+. Select the ' GL Account' to map it to from the drop down list
+. Enter or look up the 'Product Category Id' to be used
+. Press the 'Add' button
+. The new mapping will be displayed in the list at the bottom of the screen
+
+== How do I update a Product Category / GL Account type mapping?
+A Product Category / GL Account Type mapping can be updated by modifying the GL Account only.
+If the product category or the Account Type needs to be updated then the mapping will need to be deleted and
+ then re-entered using the new product category or Account Type.
+
+. Locate the entry that needs to be updated in the list of Product Category / GL Account Type mappings
+. Modify the 'GL Account 'by using the drop down list next to the 'GL Account' field
+. Press the 'Update' button
+. The updated mapping will be displayed
+
+== How do I remove a Product Category / GL Account Type mapping?
+. Locate the entry that needs to be deleted in the list of Product Category / GL Account Type mappings
+. Press the 'Remove' button next to the entry
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc
new file mode 100644
index 0000000..fefc06f
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc
@@ -0,0 +1,64 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Product GL Account
+The Product GL Account is used to specify the default account to be used for a specific Product' and 'Account Type' combination.
+This setup will translate to one side of the journal entry only.
+
+NOTE: Duplicate functionality .... This setup for the Product GL Account can also be setup using the 'Accounts' sub menu for
+ the Product in Catalog Manager. +
+ TO CHECK: Need to confirm whether this default work like a hierarchy....eg Product GL Defaults will override
+ General Account defaults.
+
+It is used for tracking product transactions at a more detailed level.
+
+Examples could be as follows:
+
+* Tracking Accounts Receivable by Product in the General Ledger
+* Tracking Cost of Goods by product (or product variation) in the General Ledger
+* Tracking Commissions paid by Product in the General Ledger
+
+== How do I add a new Product / GL Account Type mapping?
+By default there are no Product / GL Account Type mappings that are configured as part of the OFBiz demo data.
+
+. Select the 'Account Type' from the drop down list +
+ (NOTE: In other screens this field is call the 'GL Account Type Id'.....)
+. Select the ' GL Account' to map it to from the drop down list
+. Enter or look up the 'Product Id' to be used
+. Press the 'Add' button
+. The new mapping will be displayed in the list at the bottom of the screen
+
+NOTE: This mapping can also be also be done via the 'Accounts' sub menu for the Product. +
+ Any mapping created here will be displayed under the Product 'Accounts' sub menu.
+ Alternatively any mapping created in the Product 'Accounts' sub menu will also be displayed here.
+
+== How do I update a Product / GL Account Type mapping?
+A Product / GL Account Type mapping can be updated by modifying the GL Account only.
+If the product needs to be updated then the mapping will need to be deleted and then re-entered using the new product.
+
+. Locate the entry that needs to be updated in the list of Product / GL Account Type mappings
+. Modify the 'GL Account 'by using the drop down list next to the 'GL Account' field
+. Press the 'Update' button
+. The updated mapping will be displayed
+
+== How do I delete a Product / GL Account Type mapping?
+. Locate the entry that needs to be deleted in the list of Product / GL Account Type mappings
+. Press the 'Remove' button next to the entry
+
+NOTE: This can also be done via the 'Accounts' sub menu for the Product using the 'Delete Link' button.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc
new file mode 100644
index 0000000..952901d
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc
@@ -0,0 +1,53 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Variance Reason GL Accounts
+The Variance Reason / GL Account default is used for mapping any stock differences to a particular general ledger account.
+If there are variances in the number of products that are in stock then this affects the value of inventory in the general ledger.
+By using this GL default you can offset any differences in stock to the relevant general ledger account.
+
+The number of products (or items) in stock can vary. +
+These differences can be caused by numerous reasons. +
+Some of these could be as follows:
+
+* Products have been damaged
+* Products were lost or stolen
+* Products were found
+* Under or over supply of a Product from a Supplier (eg. You have ordered 10 and 11 are delivered....)
+* Free samples or giveaways to potential clients
+
+NOTE: These mappings are used in Catalog Manager when a manual inventory adjustment is done through the Inventory Item screens.
+
+== How do I add a new Variance Reason / GL Account mapping?
+There are 6 mappings that come as part of the OFBiz demo data.
+
+. Select the 'Variance Reason Id' from the drop down list
+. Select the 'GL Account Type Id' to map it to from the drop down list
+. Press the 'Add' button
+. The new 'Variance Reason / GL Account Type' mapping is displayed in the list at the bottom of the screen
+
+== How do I update a Variance Reason / GL Account mapping?
+. Select the 'Variance Reason Id' from the drop down list
+. Select the updated 'GL Account Type Id' to map it to from the drop down list
+. Press the 'Add' button
+. The updated 'Variance Reason / GL Account Type' mapping is displayed in the list at the bottom of the screen
+
+== How do I remove a Variance Reason / GL Account mapping?
+. Press the 'Remove' button next to the entry that you want to delete
+. The entry is removed from the list of entries displayed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc
new file mode 100644
index 0000000..8854165
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc
@@ -0,0 +1,74 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Payment Method GL Account Type
+The Payment Method GL Account Type Id is used to map the different payment methods (eg Cash, Cheque etc)
+ to a specific GL Account Type Id. This will translate to one side of a GL entry only.
+
+A Payment Method is just a way to define the ways in which payments can be made. +
+Each payment method can be linked to a different account in the general ledger. +
+A main GL account used would be the one that represents the Company bank account. +
+In the demo data mappings Electronic Funds Transfer, Company Account, Financial Account are all linked
+ to the Company bank account GL account.
+
+OFBiz demo data defines 15 different payment methods as follows:
+
+* Cash
+* Certified Cheque
+* Company Account
+* Company Cheque
+* Electronic Funds Transfer +
+ (NOTE TO CHECK: Problem with definition or terminology - is this a Direct Debit.... ??
+ A direct debit is controlled by the payee and an automatic payment via bank account is controlled by the payer)
+* Billing Account
+* Cash on Delivery (COD)
+* eBay
+* Offline Payment +
+ (NOTE: Is this ambiguous - since COD is an offline payment...)
+* PayPal
+* WorldPay
+* Financial Account
+* Gift Certificate
+* Money Order
+* Personal Cheque
+
+NOTE: A point to note is that these payment methods dont include Credit Cards....(which I think is on purpose...).
+ The majority of these payment methods are linked to 'Undeposited Receipts' but an additional accounting transaction
+ may be needed once the funds have cleared and are available in the Company bank account.
+
+== How do I add a new Payment Method Id / GL Account Id mapping?
+. Select the 'Payment Method Type' from the drop down list
+. Select the 'GL Account Id' to map it to from the drop down list
+. Press the 'Save' button
+. The new Payment Method Type / GL Account Type mapping is displayed in the list at the bottom of the screen
+
+== How do I update a Payment Method Id / GL Account Id mapping?
+A Payment Method Type / GL Account Type mapping cannot be updated directly but needs to be removed then re-created.
+If you try to update an existing entry you will get an 'duplicate key' error message
+
+. Press the 'Remove' button next to the entry that you want to update
+. The entry is removed from the list of entries displayed
+. Select the 'Payment Method Type' from the drop down list
+. Select the updated 'GL Account Type' to map it to from the drop down list
+. Press the 'Save' button
+. The new Payment Method Type / GL Account Type mapping is displayed in the list at the bottom of the screen
+
+== How do I remove a Payment Method Id / Gl Account Id mapping?
+. Press the 'Remove' button next to the entry that you want to delete
+. The entry is removed from the list of entries displayed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc
new file mode 100644
index 0000000..bacb83a
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc
@@ -0,0 +1,89 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Purchase Invoice default account
+The Purchase Invoice sub menu is used to specify the default account to be used for the individual line items that appear
+ on a Purchase Invoice.
+
+The items are identified by a line description which can be mapped to a specific general ledger account.
+
+Purchase invoices can be made up of a variety of items as well as the product that is being bought
+(eg discounts, promotions, work effort or labour costs etc). The majority of businesses will want to track these type of items
+separately in the general ledger and this screen will allow this type of setup.
+
+This setup will translate to one side of the journal entry only.
+
+IMPORTANT: This screen is one of the screens where the default entries that are displayed here are entered via
+ the Global GL Settings under the sub menu 'Invoice Item Type'.
+ This screen allows users to override the global settings for the Purchase Invoice item type. +
+ An example of why this could be necessary could be that a company many want to isolate the sales reporting of
+ a specific department or business unit separately (eg subledgers etc) but still have the option of a 'catch all'
+ global general ledger account.
+
+IMPORTANT: TO CHECK: Need to do more investigation but the it looks like these Purchase Invoice mappings dont work when
+ used as part of the Purchase Order to Purchase Invoice Process.
+ (Have been doing some tests to try and get it to post to a different account than 'Uninvoiced Shipment Receipts'
+ and 'Inventory' but hasnt worked so far.) We need to be able to specify things such as Sales Tax, Freight and
+ any Purchase Order adjustments.
+
+These override mappings do work if there is no Purchase Order just a Purchase Invoice as shown in the simple process below.
+
+How the Purchase Invoice mappings are used is best shown by an example.
+
+A very simple description of a Purchase Invoice Process could be as follows:
+
+. You have ordered something from a supplier (eg indirect purchasing such as stationery etc via phone)
+. The Supplier ships the products to you +
+ (NOTE: as they are not stored in the Warehouse but in your offices - so dont need an Inventory Receive.....????)
+. You receive the product and an invoice from the Supplier (Purchase Invoice)
+. You enter the Purchase Invoice pay the Supplier the amount invoiced
+
+Let's focus on step of 4 in more detail.
+
+* You have received the product from the supplier with an invoice
+* In OFBiz you enter the Purchase Invoice using 'Create New' in the 'Invoices' menu of Accounting Manager
+* Using the 'Items' sub menu you can create individual items on the Purchase Invoice
+ (eg Paper, Pens, Sales Tax etc and they dont need to have a Product Id associated with them)
+* When you add a new invoice item to the Purchase Invoice it is the 'Invoice Item Type' that is affected
+ by the Purchase Invoice override mappings
+* The Purchase Invoice can then be moved to various statuses (Approved, Received, Ready or Cancelled)
+* When the status is moved to 'Ready' this is a trigger for an 'automatic' accounting transaction
+* The transaction type generated is called 'Purchase Invoice' and it uses the Purchase Invoice override mappings
+
+Transaction Type: Purchase Invoice, DR 516100 Purchase Order Adjustments , DR ????? Sales Tax, CR 210000 Accounts Payable
+
+== How do I add a new Purchase Invoice override mapping?
+By default there are no Purchase Invoice override mappings that are configured as part of the OFBiz demo data.
+
+. Select the 'Invoice Purchase Item Type' from the drop down list
+. Select the ' Invoice Override Expense GL Account Id' to map it to from the drop down list
+. Press the 'Save' button
+. The new mapping will be displayed in the 'Invoice Override Expense GL Account' column in the list at the bottom of the screen
+
+== How do I update a Purchase Invoice override mapping?
+An existing Purchase Invoice override mapping cannot be updated but needs to be removed and a new mapping added.
+If you try to add an override to an item that already has an override you will get a duplicate record error message.
+
+== How do I remove a Purchase Invoice override mapping?
+NOTE: Only the override mapping can be deleted.
+ The default mapping record cannot be deleted here (even though the Remove button is displayed next to it!)
+
+. Locate the entry that needs the override deleted in the list of Purchase Invoice override mappings
+. Press the 'Remove' button next to the entry
+. The override mapping will be removed from the 'Invoice Override Expense GL Account' column of the entry
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc
new file mode 100644
index 0000000..ac36d9a
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc
@@ -0,0 +1,112 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Sales Invoice default account
+The Sales Invoice sub menu is used to specify the default account to be used for the individual line items that appear
+ on a Sales Invoice.
+
+The items are identified by a line description which can be mapped to a specific general ledger account.
+
+Sales invoices can be made up of a variety of items as well as the product that is being sold
+(eg discounts, promotions, work effort or labour costs etc).
+The majority of businesses will want to track these type of items separately in the general ledger and this screen will allow
+ this type of setup.
+
+This setup will translate to one side of the journal entry only.
+
+A key mapping used is linked directly to the Product Type (eg Invoice Digital Good Item, Invoice Finished Good Item,
+ Invoice Finished/Digital Good Item....). This controls where the sales revenue received from the sale of the product is stored
+ in the general ledger
+
+Only a limited number of general ledger accounts that are available to be mapped.
+Currently this is 7 and limited to the accounts that have been assigned to the organisation from the Global Chart of Accounts that
+ have a 'GL Account Class Id' = 'Revenue' +
+(NOTE: You will see that Discounts on Sales is not available to be selected because it's
+ GL Account Class Id = 'Cost of Goods Sold Expense'.
+ It appears as a default because it is setup in the Global GL settings that doesnt seem to have any limitations of the account.)
+
+IMPORTANT: This screen is one of the screens where the default entries that are displayed here are entered via
+ the Global GL Settings under the sub menu 'Invoice Item Type'. +
+ This screen allows users to override the global settings for the Sales Invoice item type. +
+ An example of why this could be necessary could be that a company many want to isolate the sales reporting of a
+ specific department or business unit separately (eg subledgers etc) but still have the option of a 'catch all'
+ global general ledger account.
+
+If an override account is added it will appear in the Override GL Account column on the screen.
+
+The only mapping that seems a bit out of place here is Sales Tax.
+It is blank because Sales Tax is setup using Tax Authorities so dont know why you would want to override the Sales Tax account
+ to a Sales Revenue Account.
+
+NOTE: Also need to highlight that in the Global Settings it uses the ENUM description to select the item and
+ there are duplicate descriptions between the Sales Invoice and the Purchase Invoice. +
+ Not too much of a problem here but it does cause problems in Agreements when setting up things like Commissions based on
+ line items as you cant tell the difference between the description of a Sales Invoice item called 'Invoice Adjustment'
+ and a Purchase Invoice item called 'Invoice Adjustment' ..... except by trial and error
+
+How the Sales Invoice mappings are used is best shown by an example.
+
+A very simple description of an online Sales Order Process could be as follows:
+
+. Customer Orders a Product (and Creates a Sales Order)
+. Customer Pays for Product (via Credit Card, Internet Banking etc)
+. Vendor confirms Payment and Dispatches the Product to the Customer
+
+Let's focus on the second part step of 3 in more detail.
+
+* The vendor has verified that the customer payment has been received
+* In OFBiz Order Manager they will then look up the relevant Sales Order and then click the 'Quick Ship Entire Order' button
+ to log the dispatch of the order in the system
+* The 'Quick Ship Entire Order' button is a trigger for an 'automatic' accounting transaction
+* The transaction type that is triggered is called 'Sales Invoice'
+
+Transaction Type: Sales Invoice DR 120000 Accounts Receivable, DR 410000 Discounts on Sales, DR 400000 Sales,
+ CR 22????? Sales Tax Collected
+
+DR Sales is used for item promotions where product cost is simply reversed. +
+Only order promotions are coded to Discounts. +
+The Sales Tax account will be dependent on your sales tax setup. +
+The demo data posts to tax accounts by US state.
+
+One of the CR (or Credit) entries for the Sales Invoice transaction is created using the Sales mapping defined here
+ in the Sales Invoice (and the other is created another GL Account default for 'Tax Authority GL Accounts')
+
+All of the the DR (or Debit) entries for the Sales Invoice transaction
+(except for Accounts Receivable which is comes from the GL Account Type defaults) are created using the mappings
+defined here in the Sales Invoice
+
+== How do I add a Sales Invoice override mapping?
+By default there are no Sales Invoice override mappings that are configured as part of the OFBiz demo data.
+
+. Select the 'Invoice Item Type' from the drop down list
+. Select the ' Override Revenue GL Account Id' to map it to from the drop down list
+. Press the 'Save' button
+. The new mapping will be displayed in the 'Override GL Account' column in the list at the bottom of the screen
+
+== How do I update a Sales Invoice override mapping?
+An existing Sales Invoice override mapping cannot be updated but needs to be removed and a new mapping added.
+If you try to add an override to an item that already has an override you will get a duplicate record error message.
+
+== How do I remove a Sales Invoice override mapping?
+NOTE: Only the override mapping can be deleted.
+ The default mapping record cannot be deleted here (even though the Remove button is displayed next to it!)
+
+. Locate the entry that needs the override deleted in the list of Sales Invoice override mappings
+. Press the 'Remove' button next to the entry
+. he override mapping will be removed from the 'Override GL Account' column of the entry
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc
new file mode 100644
index 0000000..33e5122
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc
@@ -0,0 +1,92 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for GL Account Type Defaults
+The GL Account Defaults screens are are method to setup rules that are used to translate business transactions
+ into accounting transactions.
+It currently is made up of 12 sub menus that can be used to map various transaction type codes to a specific general ledger account
+
+Accounting transactions are made up of a Debit Entry and a Credit Entry.
+The GL Account defaults screens help map which accounts are to be used to generate a each part of the transaction.
+This means that certain mappings will be used to generate the Debit (or DR) entry part of the transaction and others used
+ to generate the Credit (or CR) entry part of the transaction.
+
+NOTE: Many of the accounting transactions are generated 'automatically' (or in the background)
+ using the the accounting services SECAS / EECAS.
+
+The GL Account Type is used to specify the default account that certain transactions
+(eg Accounts Payable, Accounts Receivable, etc) are posted to.
+
+An accounting transaction (or journal entry) is made up of two parts - a Debit Entry and a Credit Entry that balance each other.
+The GL Account Type is used to translate one side of the journal entry.
+
+GL Account Types are stored in Entity GLAccountType which can be viewed via Entity Data Maintenance in the Webtools menu.
+There are currently 57 different GL Account Types that are part of the OFBiz demo data but only 19 of these are setup as mappings
+
+How the GL Account Type is used is best shown by an example.
+
+A very simple description of an online Sales Order Process could be as follows:
+
+. Customer Orders a Product (and Creates a Sales Order)
+. Customer Pays for Product (via Credit Card, Internet Banking etc)
+. Vendor confirms Payment and Dispatches the Product to the Customer
+
+Let's focus on the first part step of 3 in more detail.
+
+* The vendor has checked their bank statement and seen that the customer has paid
+* In OFBiz Order Manager they will then look up the relevant Sales Order and
+ then click the 'Receive Payment' button to log the payment in the system
+* The 'Receive Payment' button is a trigger for an 'automatic' accounting transaction
+* The transaction type that is triggered is called 'Incoming Payment'
+* The accounting entries generated are: DR 112000 Undeposited Funds , CR 120000 Accounts Receivable
+
+The CR (or Credit) entry for the transaction is created by the GL Acccount Type mapping for 'Accounts Receivable'
+ (which by using the demo data default will go the 120000 Accounts Receivable)
+
+The DR (or Debit) entry for the transaction is created by a different GL Account default,
+ the Payment Method Id / GL Account Id mapping (eg Cash is setup as 112000 Undeposited Receipts)
+
+== How do I create a new GL Account Type default mapping?
+There are currently 57 different GL Account Types that come as part of the demo data with OFBiz.
+This should be enough to manage the vast majority of business transactions.
+
+These instructions show how to add a mapping using the default data
+
+. Select the 'GL Account Type Id' from the drop down list
+. Select the 'GL Account' to map it to from the drop down list
+. Press the 'Save' button
+. The new GL Account Type mapping is displayed in the list at the bottom of the screen
+
+NOTE: If none of the demo data GL Account Types are sufficient then new ones can be added using
+ Entity Data Maintenance and the entity 'GLAccountType' in the Webtools menu.
+
+== How do I update a GL Account Type default mapping?
+A GL Account Type mapping cannot be updated directly but needs to be removed then re-created.
+If you try to update an existing entry you will get an 'duplicate key' error message.
+
+. Press the 'Remove' button next to the entry that you want to update
+. The entry is removed from the list of entries displayed
+. Select the 'GL Account Type Id' from the drop down list
+. Select the updated 'GL Account' to map it to from the drop down list
+. Press the 'Save' button
+. The new GL Account mapping is displayed in the list at the bottom of the screen
+
+== How do I delete a GL Account Type default mapping?
+. Press the 'Remove' button next to the entry that you want to delete
+. The entry is removed from the list of entries displayed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc
new file mode 100644
index 0000000..adc08ab
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc
@@ -0,0 +1,66 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Payment Type GL Account Type
+The Payment Type GL Account Type Id is used to translate (or map) the different payment types to a specific GL Account Type Id.
+The GL Account Type Id is then used via the 'GL Account Type Id' defaults to translate to one side of a journal entry.
+
+NOTE: This GL Account default is used to link to another one of the GL Account defaults.
+
+A Payment Type is just a way to categorize transactions.
+
+Examples of Payment Types could be as follows:
+
+* Commission Payments
+* Customer Payments
+* Vendor (or Supplier) Payments
+* Customer Refunds
+* Customer Prepayments or Deposits
+
+These payment types can then be mapped to the required account type in the Chart of Account.
+
+Examples of these type of mappings could be as follows:
+
+* Customer Payments are mapped to Account Receivable
+* Vendor (or Supplier) Payment are mapped to Account Payable
+* Customer Refunds are mapped to Customer Credits
+
+== How do I add a Payment Type / GL Account Type Id mapping?
+There are currently 14 different Payment Type / GL Account Types mappings that come as part of the demo data with OFBiz
+ and should cover a good variety of payment related transactions.
+
+. Select the 'Payment Type Id' from the drop down list
+. Select the 'GL Account Type Id' to map it to from the drop down list
+. Press the 'Save' button
+. The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen
+
+== How do I update a Payment Type / GL Account Type Id mapping?
+A Payment Type / GL Account Type mapping cannot be updated directly but needs to be removed then re-created.
+If you try to update an existing entry you will get an 'duplicate key' error message.
+
+. Press the 'Remove' button next to the entry that you want to update
+. The entry is removed from the list of entries displayed
+. Select the 'Payment Type Id' from the drop down list
+. Select the updated 'GL Account Type Id' to map it to from the drop down list
+. Press the 'Save' button
+. The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen
+
+== How do I remove a Payment Type / GL Account Type Id mapping?
+. Press the 'Remove' button next to the entry that you want to delete
+. The entry is removed from the list of entries displayed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc
new file mode 100644
index 0000000..0e17345
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc
@@ -0,0 +1,94 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Chart of Accounts
+OFBiz comes with a master template for a very comprehensive chart of accounts.
+This can be found in 'Global GL Defaults' under the 'Accounting' tab.
+
+A couple of points to note
+
+* you do not need to use all the accounts defined in this master template
+ (but it may be simpler to look for the accounts that you can use or rename)
+* you can create your own additional accounts if you dont want to use the ones in the master template
+
+The chart of accounts for the default organisation (Company) is built up by selecting the accounts that you want to use
+ from the global chart of accounts master template.
+
+This means that if you want to create a new account then you need to create it first in the Global Chart of Accounts and
+ then link (or assign) it to the chart of accounts for Company.
+
+Details of the Chart of Accounts can be exported as a CSV file or PDF using the buttons displayed.
+
+IMPORTANT: You need to be careful if you do decide to create your own accounts that they contain all the details required and
+ that they are linked into the relevant configuation for the setup of the GL defaults. +
+ This means that if you change an account (eg Inventory) to one of your own, you need to check the GL defaults setup
+ and replace any reference to the Inventory account to the one you have created.
+
+This Chart of Accounts screen is used to define the list of accounts (or chart) that will be actively used by the company.
+For example the Global chart of accounts may contain 100 different accounts but only 20 need to be used for your specific business.
+This means you need only to create assignments to the accounts that you actively want to use.
+
+The Chart of Accounts is a mixture of business needs (ie being able to track the information you need for your business) and
+ tax requirements (i.e. legal or government requirements necessary for operating a business).
+ The type of Chart that you setup will be dependent of your business type.
+
+== How do I create a Chart of Accounts?
+As mentioned above the chart of accounts for the default organisation (Company) is built up by selecting the accounts that
+ you want to use from the global chart of accounts master template. +
+This means that if you want to create a new account then you need to create it first in the Global Chart of Accounts and
+ then link (or assign) it to the chart of accounts for Company.
+
+By creating an assignment to an account it is then added to the Chart of Accounts.
+
+. Select the account Gl Account Id that you need from the drop down box
+. Press the 'Create Assignment' button
+. The account is added to the Chart of Account
+
+== How do I update a Chart of Accounts?
+Updating the Chart of Accounts will involve either creating a new assignment or removing an existing one. +
+A new assignment is created using the instructions above.
+
+The added complication may be that the account that you need does not exist in the Global Chart of Accounts.
+As mentioned above it will need to be created and then linked.
+
+See the instructions below to remove an existing account assignment.
+
+NOTE: If a completely new account is required that does not already exist as part of the Global Chart of Accounts template
+ then it will need to be created as part of the Global template first before it can be used as an assignment in
+ the Organisation Chart of Accounts.
+
+== How do I delete a Chart of Accounts?
+Accounts are not deleted from the Chart of Accounts - they are simply no longer selected to be used.
+
+It is important that you do not remove accounts that are active and have already been used for transactions.
+Even if the net balance of the account is zero then from an audit perspective then you should not be removing accounts.
+
+You should only be looking to remove accounts that have not been used.
+To un-link or un-assign accounts from the default company then use the Entity Data Maintenance from the Webtools menu.
+Look for the entity 'GlAccountOrganization' and delete the record to remove the link.
+
+== How do I update the details for an account in the Chart ofAccounts?
+Details of the accounts that make up the Chart of Accounts can be accessed from this screen.
+
+. Click on the 'GL Account Id' of the account required
+. The 'Edit GL Account' screen is displayed showing the details of the account selected +
+ (NOTE:This screen is also accessible via 'Global GL Settings / Chart of Account / Navigate Accounts '
+. Amend the fields required +
+ (NOTE: The GL Account Id and Posted Balance fields cannot be amended)
+. Press the 'Update' button
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc
new file mode 100644
index 0000000..68eabb1
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc
@@ -0,0 +1,81 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Accounting Preferences
+Accounting Preferences are a set of configuration details that are related to a party.
+To appear on this screen the party must be setup with the role of 'Internal Organisation'.
+This means that you can add the internal organisation role to a party and they will be added to this screen and
+ then can be configured.
+
+The master default party is 'Company' but preferences can also be setup for internal departments.
+The demo data shows some examples of this (eg Marketing, Accounting, Sales, Development etc).
+Unless overridden then then all other parties appearing on this screen will take their default setup from 'Company'
+
+NOTE: The majority of the configuration information displayed in Accounting Preferences are taken from the Enumeration entity.
+
+It is used for setting specifying information related to the accounting setup for a specific organisation or parties that
+ exist within an organisation such as business units, cost centres, departments ,subsidiaries etc.
+
+Information that can be setup include the following:
+
+* The start date of the Time Periods and Fiscal or Accounting Year (eg 1st April, 1st January, 1st June etc)
+* Tax Return Form +
+ (NOTE: Need TO CHECK how important this is and where it is used.......possibly some kind of reporting???)
+* The method to be used for calculating Cost of Goods Sold (COGS)
+* Base Currency - eg USD, GBP, EUR etc +
+ (NOTE: May have main company in USD but a subsidiary in EUR etc)
+* Invoice prefix, numbering and sequencing
+ (eg you may want each business unit / subsidiary to have its own invoice numbering or sequence etc)
+* Quote prefix, number and sequencing
+* Method to be used for refunds (eg cheque, direct bank credit, voucher credit etc...)
+* Specify which journal will be used to store error transactions
+
+NOTE: Key things that are usually need to be amended include the base currency for the company, fiscal year information and
+ invoice numbering prefix or sequencing.
+
+== How do I create or setup a new Accounting Preference?
+IMPORTANT: A party must be setup with the role of 'Internal Organisation' before it will appear on
+ the Accounting Preferences screen so that it can be setup.
+
+. Select the 'Setup' button next to the party to be setup
+. The Accounting Preferences screen is displayed. +
+ (IMPORTANT: The first time this screen is displayed all of the fields will be modifiable.
+ Once this has been saved only certain fields will be modifiable!!)
+. The default entries will be based on (or inherited from) 'Company'
+. Enter any changes that are required (eg Invoice Prefix, Error Journal name;
+ as you may want error transactions from separate departments to be handled differently...)
+. Press the 'Add' button
+
+== How do I update an Accounting Preference?
+. Select the 'Setup' button next to the party to be setup
+. The Accounting Preferences screen is displayed but only certain fields will be modifiable
+. Enter any changes required
+. Press the 'Update' button
+
+NOTE: If you need to change any of the fields that are not modifiable then it can be done
+ via the Entity Data Maintenance on Webtools menu using the PartyAcctgPreference entity. +
+ You will need to be careful in editing an existing preference especially if the configuration already been used
+ for transactions.
+
+== How to I delete an Accounting Preference?
+There is currently no delete option via the user interface but an Accounting Preference can be removed by deleting the role of
+ 'Internal Organisation' from the party record.
+
+NOTE: TO CHECK: Need to investigate the impact of using an accounting preference then removing it. +
+ What happens to the transactions in process etc......???
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc
new file mode 100644
index 0000000..6fcfcc4
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc
@@ -0,0 +1,49 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Journals
+A journal is a detailed accounting transaction that is recorded (or posted) to the General Ledger.
+It is made up of a debit and a credit component.
+
+NOTE: TO CHECK: Is this screen really about Journals or is it about Suspense Accounts.....??????)
+
+NOTE: By default in OFBIZ a journal called 'ERROR_JOURNAL' is created as part of the demo data installation. +
+ This 'ERROR_JOURNAL' is referenced in the Accounting Preferences setup for 'Company'. +
+ The 'ERROR_JOURNAL' is used to store details of any transaction that fails and cannot be posted to a general ledger account. +
+ Transactions falling into error can be as the result of incomplete setup or an invalid transaction
+ (eg a transaction that should never occur).
+
+== How do I create a journal?
+. Enter a journal name in the Gl Journal Name field (eg MY_JOURNAL)
+. Press the 'Submit' button
+. The journal is created and will appear in the journal list at the bottom of the screen +
+ (Note that the Journal ID is automatically generated)
+
+== How do I update a journal?
+. Select the journal to be updated from the list of journals at the bottom of the screen
+. The journal details will be displayed on the screen
+. Update the Gl Journal Name (as this is currently the only field that can be updated)
+. Press the 'Submit' button
+. The updated journal will appear in the journal list at the bottom of the screen
+
+== How do I delete a journal?
+Be careful if you need to remove an existing journal as it may have transactions associated with it.
+
+. Press the 'Remove' button next to the journal that you want to delete
+. The journal is deleted and the screen is redisplayed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc
new file mode 100644
index 0000000..5b1758a
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc
@@ -0,0 +1,86 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+
+= Help for Time Periods
+Time periods are a defined period of time (usually a month, quarter or year) that is used to group business transactions.
+It is a key part of any general accounting setup.
+
+Time periods can be used for the definition of :
+
+* Company Financial Year
+* Fiscal / Tax Periods (weeks, months, quarters)
+* VAT / GST Periods
+* Sales Periods
+
+The screen is divided into 3 main areas.
+The first two show lists of the open and closed time periods.
+The area at the bottom allows you to define and enter a new time period.
+
+== How do I add a new Financial Year time period?
+. Using the area at the bottom of the screen labelled 'New'
+. Leave the Parent Period Id field blank +
+ (NOTE: The financial year will be the parent of other time periods eg fiscal months or GST / VAT periods)
+. Select 'Fiscal Year' from the 'Period Type Id' drop down box
+. Enter '13' in the Period Num field +
+ (NOTE: You can use any number that does not conflict with the other time periods you want to use.
+ We plan to define 12 fiscal or tax months so will use 13 for the year)
+. Enter 'FY 2010-2011' in the Period Name field +
+ (NOTE: You can use any name you want but make sure it makes sense. This example is an abbreviation for Fiscal Year 2010-2011)
+. Select '1st April 2010' using the calendar lookup in the 'From Date' field
+. Select '1st April 2011' using the calendar lookup in the 'Thru Date' field +
+ (NOTE: Even though we want our financial year to end on 31st March 2011 the test used is based on less than not an equal to)
+. Leave the 'Is Closed' field at its default of 'No'
+. Press the 'Create' button
+. The new time period will now be displayed in the list of open time periods.
+
+== How do I add a new GST/ VAT time period?
+. Using the area at the bottom of the screen labelled 'New'
+. Select the previously created financial year 'FY 2010-2011' in the Parent Period Id field
+. Select 'Fiscal Month' from the 'Period Type Id' drop down box
+. Enter '1' in the Period Num field +
+ (NOTE: This is the first of 12 periods that we want to define.)
+. Enter 'FM April 2010' in the Period Name field +
+ (NOTE: You can use any name you want but make sure it makes sense. This example is an abbreviation for Fiscal Month April 2010)
+. Select '1st April 2010' using the calendar lookup in the 'From Date' field
+. Select '1st May 2010' using the calendar lookup in the 'Thru Date' field +
+ (NOTE: Even though we want our fiscal month to end on 30th April 2010 the test is used is based on less than not an equal to)
+. Leave the Is Closed field at its default of 'No'
+. Press the 'Create' button
+. The new time period will now be displayed in the list of open time periods.
+
+== How do I update a time period?
+NOTE: Time periods cannot be updated via the current time periods screen.
+ If you need to amend time period details then it can be done via Entity Data Maintenance in the Webtools menu.
+
+== How do I close a time period?
+. To close a time period select the 'Close' button next to the time period.
+. The time period will be removed from the current open time periods area and re-displayed in
+ the closed time periods section of the screen.
+
+Closing a time period is a trigger for an automatic accounting transaction as follows:
+
+* Transaction Type: Period Closing
+* DR ?????? (based on the GL account type mapping for Profit Loss)
+* CR 336000 Retained Earnings (based on GL account type mapping for Retained Earnings)
+
+IMPORTANT: Both sides of this accounting transaction uses the same GL account type default mapping. +
+ The account mapping for 'Profit Loss' is not setup as part of the demo data so this transaction will not automatically
+ post to the general ledger but will instead be put in the ERROR_JOURNAL as an unposted transaction. +
+ The transaction value is zero for both sides of journal...Even if it does have a value do we want to move it from
+ P&L to Equity during the financial year? Normally this is done once at the end of the financial year.
diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc
new file mode 100644
index 0000000..b62786d
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc
@@ -0,0 +1,61 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+= Organization GL Settings.
+
+== Help for setting by domain
+
+=== Help for Available Internal Organizations
+The default screen shows a list of Party Groups that have the role of 'Internal Organization' associated with them.
+
+If you have installed the demo data then the default company 'Company' as well as departments / business units and
+ regional subsidiaries will be displayed.
+
+For each 'Internal Organization' there is the ability to set the currency, fiscal periods and invoice prefixes.
+
+include::HELP_PartyAcctgPreference.adoc[leveloffset=+2]
+
+include::HELP_ListGlAccountOrganization.adoc[leveloffset=+2]
+
+include::HELP_SetupGlJournals.adoc[leveloffset=+2]
+
+include::HELP_GlAccountTypeDefaults.adoc[leveloffset=+2]
+
+include::HELP_EditProductGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_EditProductCategoryGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_EditFinAccountTypeGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_GlAccountSalInvoice.adoc[leveloffset=+2]
+
+include::HELP_GlAccountPurInvoice.adoc[leveloffset=+2]
+
+include::HELP_GlAccountTypePaymentType.adoc[leveloffset=+2]
+
+include::HELP_GlAccountNrPaymentMethod.adoc[leveloffset=+2]
+
+include::HELP_EditVarianceReasonGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_EditCreditCardTypeGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_EditOrganizationTaxAuthorityGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_EditPartyGlAccount.adoc[leveloffset=+2]
+
+include::HELP_TimePeriods.adoc[leveloffset=+2]
diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc
index 4988111..593648f 100644
--- a/applications/accounting/src/docs/asciidoc/accounting.adoc
+++ b/applications/accounting/src/docs/asciidoc/accounting.adoc
@@ -43,3 +43,5 @@ include::_include/acc-financial-accounts.adoc[leveloffset=+1]
include::_include/acc-tax-authorities.adoc[leveloffset=+1]
include::_include/acc-global-settings.adoc[leveloffset=+1]
+
+include::_include/acc-organization-gl-settings.adoc[leveloffset=+1]