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:09:59 UTC

[ofbiz-framework] 08/12: Documented: Tax-AUthorities Docbook files migration to asciidoc format (OFBIZ-10291)

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 fad7ad0272690940695ee1f2ac00fee4d8ab7c54
Author: holivier <ho...@apache.org>
AuthorDate: Thu Feb 13 13:55:09 2020 +0100

    Documented: Tax-AUthorities Docbook files migration to asciidoc format
    (OFBIZ-10291)
    
    All the help files associated to it are called via include in the main
    document
---
 .../helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml  |  35 -------
 .../HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml     |  81 ---------------
 .../HELP_ACCOUNTING_EditTaxAuthorityCategories.xml |  62 ------------
 .../HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml |  92 -----------------
 .../HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml  |  32 ------
 ...ELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml | 109 ---------------------
 .../helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml  | 106 --------------------
 .../HELP_ACCOUNTING_ListTaxAuthorityParties.xml    |  87 ----------------
 .../helpdata/HELP_ACCOUNTING_tax_authorities.xml   |  56 -----------
 .../asciidoc/_include/HELP_EditTaxAuthority.adoc   |  31 ++++++
 .../_include/HELP_EditTaxAuthorityAssocs.adoc      |  42 ++++++++
 .../_include/HELP_EditTaxAuthorityCategories.adoc  |  40 ++++++++
 .../_include/HELP_EditTaxAuthorityGlAccounts.adoc  |  51 ++++++++++
 .../_include/HELP_EditTaxAuthorityPartyInfo.adoc   |  27 +++++
 .../HELP_EditTaxAuthorityRateProducts.adoc         |  57 +++++++++++
 .../asciidoc/_include/HELP_FindTaxAuthority.adoc   |  62 ++++++++++++
 .../_include/HELP_ListTaxAuthorityParties.adoc     |  49 +++++++++
 .../asciidoc/_include/acc-tax-authorities.adoc     |  55 +++++++++++
 .../accounting/src/docs/asciidoc/accounting.adoc   |   2 +
 19 files changed, 416 insertions(+), 660 deletions(-)

diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml
deleted file mode 100644
index 558b67a..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml
+++ /dev/null
@@ -1,35 +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 Edit Tax Authority screen.</title>
-        <para>The 'Edit Tax Authority' sub menu is the first of six sub menus used in the creation or update of a Tax Authority. On the creation or update of a Tax Authority it is the default screen that is displayed.</para>
-        <para>It can be used for updating the basic details of a Tax Authority such as:</para>
-        <orderedlist>
-        <listitem><para>Changing whether a tax id or code is required for an exemption</para></listitem> 
-        <listitem><para>Modifying the tax id or code format</para></listitem>
-        <listitem><para>Updating where or not to include the tax calculation as part of the product price</para></listitem>
-        </orderedlist>
-        <para>NOTE: An example of the Tax Id is as follows:</para>
-        <para>\d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4} which translates to 99-9999999 or 999-99-9999</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml
deleted file mode 100644
index 0eea0ff..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml
+++ /dev/null
@@ -1,81 +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 Edit Tax Authority Associations screen.</title>
- <para>An association is a way of specifying how tax authorities can be
-  linked to each other.</para>
- <para>It can be used in the situation where the tax structure is
-  hierarchical (eg city tax, plus county tax plus state tax).</para>
- <para>Using associations allows tax rates from multiple authorities to
-  be applied to a particular order at once.</para>
- <section>
-  <title>How do I add a new association for a Tax Authority?</title>
-  <orderedlist>
-   <listitem>
-    <para>Enter or use the lookup to find the 'To Tax Auth Geo Id'
-    </para>
-   </listitem>
-   <listitem>
-    <para>Enter of use the lookup to find the 'To Tax Auth Party Id'
-    </para>
-   </listitem>
-   <listitem>
-    <para>Leave the 'From Date' blank (NOTE: It will default to the
-     current date and time</para>
-   </listitem>
-   <listitem>
-    <para>Leave the 'Thru Date' blank</para>
-   </listitem>
-   <listitem>
-    <para>Select the 'Type' from the dropdown or leave blank</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Add' button</para>
-   </listitem>
-   <listitem>
-    <para>The new tax authority association is displayed at the bottom
-     of the screen.</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I update an association for a Tax Authority?</title>
-  <orderedlist>
-   <listitem>
-    <para>Only two fields are available for update, these are the 'Thru
-     Date' and 'Type'</para>
-   </listitem>
-   <listitem>
-    <para>Enter the changes required</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Update' button next to the entry updated</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I remove an association for a Tax Authority?</title>
-  <orderedlist>
-   <listitem>
-    <para>Press the 'Delete' button next to the entry that needs to be
-     deleted</para>
-   </listitem>
-  </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml
deleted file mode 100644
index 8df8b02..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml
+++ /dev/null
@@ -1,62 +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 Edit Tax Authority Categories screen.</title>
- <para>The Tax Authority Categories sub menu screen allows you link a
-  tax authority to a specific catalog or product category.</para>
- <para>It can be used to add product categories to a tax authority. This
-  means that all products in this category will be taxed at the rate
-  specified for the tax authority.</para>
- <para>An example of this could be separating products into categories
-  for export to different countries. A separate tax authority will be
-  associated with each category so that the specific tax rate for each
-  of them will be applied.</para>
- <section>
-  <title>How do I add a new Tax Authority / Category mapping?</title>
-  <orderedlist>
-   <listitem>
-    <para>Enter or Lookup the 'Category Id' to be mapped</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Add' button</para>
-   </listitem>
-   <listitem>
-    <para>The new mapping will be displayed at the bottom of the screen
-    </para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I update a Tax Authority / Category mapping?</title>
-  <para>A Tax Authority / Category mapping cannot be updated. If it
-   needs to be changed then the entry must be deleted and then
-   re-entered.</para>
- </section>
- <section>
-  <title>How do I remove a Tax Authority / Category mapping?</title>
-  <orderedlist>
-   <listitem>
-    <para>Locate the 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_EditTaxAuthorityGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml
deleted file mode 100644
index 5a6c8e3..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml
+++ /dev/null
@@ -1,92 +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 Edit Tax Authority GL Accounts screen.</title>
- <para>The GL Accounts sub menu screen allows you specify which general
-  ledger account any tax calculated for this tax authority will be
-  posted. This is done at at organisation level so the minimum
-  requirement is that 'Company' is setup.</para>
- <para>It is used to consolidate taxes for a specific tax authority into
-  one general ledger account. It can be very useful if you need to track
-  taxes for several tax authorities (eg different states or countries).
- </para>
- <section>
-  <title>How do I add a new general ledger account for a Tax Authority?
-  </title>
-  <orderedlist>
-   <listitem>
-    <para>Enter or use the lookup to select the 'Organisation Party Id'
-     (NOTE: Normally this would be 'Company')</para>
-   </listitem>
-   <listitem>
-    <para>Enter or use the lookup to select the 'GL Account'</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Add' button</para>
-   </listitem>
-  </orderedlist>
-  <para>NOTE: The GL account used must have already been created in the
-   Global GL Settings and linked to the chart of accounts for 'Company'
-  </para>
- </section>
- <section>
-  <title>How do I update a general ledger account for a Tax Authority?
-  </title>
-  <orderedlist>
-   <listitem>
-    <para>The general ledger account can be updated by simply adding a
-     new account to replace the existing entry.</para>
-   </listitem>
-   <listitem>
-    <para>Enter or use the lookup to select the 'Organisation Party Id'
-     (NOTE: Normally this would be 'Company')</para>
-   </listitem>
-   <listitem>
-    <para>Enter or use the lookup to select the updated 'GL Account'
-    </para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Add' button</para>
-   </listitem>
-   <listitem>
-    <para>The existing entry will be replaced by the updated GL Account
-    </para>
-   </listitem>
-  </orderedlist>
-  <para>NOTE: Be careful when updating a general ledger account because
-   some transactions may have already been posted to the existing
-   account.</para>
- </section>
- <section>
-  <title>How do I delete a general ledger account for a Tax Authority?
-  </title>
-  <orderedlist>
-   <listitem>
-    <para>Locate the entry required</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Delete' button next to the entry that needs to be
-     deleted</para>
-   </listitem>
-   <listitem>
-    <para>The entry is removed </para>
-   </listitem>
-  </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml
deleted file mode 100644
index 9932a94..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml
+++ /dev/null
@@ -1,32 +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 Edit Tax Authority Party Info screen.</title>
-        <para>This screen is used to create or update details for a Tax Authority Party entry.</para>
-        <para>If a new entry is being created all fields are available to be entered. If an existing entry is being updated only limited fields are available to be amended.</para>
-        <section>
-        <title></title>
-        <para></para>
-        </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml
deleted file mode 100644
index 73261ed..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.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 Edit Tax Authority Product Rates screen.</title>
- <para>This screen allows the setup of tax rates and types. The rates or
-  type can be assigned globally to a store (ie tax will be applied to
-  all products at the same rate) or category (ie limited to products in
-  a specific category).</para>
- <para>Other parameters are available to allow the user to limit whether
-  the tax is to be applied to all purchases / sales or only those which
-  are above a certain threshold. </para>
- <para>Tax associated with shipping charges or promotions can also be
-  configured here.</para>
- <section>
-  <title>How do I add a new product tax rate?</title>
-  <orderedlist>
-   <listitem>
-    <para>Use the drop down box to select the tax 'Type' (eg Sales Tax)
-    </para>
-   </listitem>
-   <listitem>
-    <para>Use the lookup to select a 'Store Id' (or leave blank for all
-     Stores)</para>
-   </listitem>
-   <listitem>
-    <para>If a category has been setup it will be available for
-     selection in 'Category' field otherwise leave this blank</para>
-   </listitem>
-   <listitem>
-    <para>Leave 'Title Transfer' blank</para>
-   </listitem>
-   <listitem>
-    <para>Enter a value for the 'Minimum Price' for a product where the
-     tax is to be applied (NOTE: The Demo Data sets this as zero)</para>
-   </listitem>
-   <listitem>
-    <para>Enter a value for the 'Minimun Purchase' where the tax is to
-     be applied (NOTE: The Demo Data sets this as zero)</para>
-   </listitem>
-   <listitem>
-    <para>Use the drop down box to select whether 'Shipping Charges'
-     will be taxable</para>
-   </listitem>
-   <listitem>
-    <para>Enter the tax rate in the 'Tax Percentage' field (eg 12.5)
-    </para>
-   </listitem>
-   <listitem>
-    <para>Use the drop down box to select whether products on
-     'Promotion' will be taxable</para>
-   </listitem>
-   <listitem>
-    <para>Leave the 'From Date' and 'Thru Date' blank</para>
-   </listitem>
-   <listitem>
-    <para>Enter the name of the tax in the 'Description' field (eg VAT)
-     as this will be displayed and printed on documents when the tax is
-     applied</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Add' button</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I update an existing product tax rate</title>
-  <orderedlist>
-   <listitem>
-    <para>Select the entry that needs to be updated</para>
-   </listitem>
-   <listitem>
-    <para>Make the changes required</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Update' button next to the entry that needs to be
-     updated</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I delete a product tax rate?</title>
-  <orderedlist>
-   <listitem>
-    <para>Press the 'Delete' button next to the entry that needs to be
-     removed</para>
-   </listitem>
-  </orderedlist>
-  <para>NOTE: The deletion of tax rates may cause audit problems
-   particularly if the rate has already been used as part of a
-   transaction. In this case it would be better to expire the old rate
-   using the 'Thru Date' field and then enter the new rate.</para>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml
deleted file mode 100644
index 14084f3..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml
+++ /dev/null
@@ -1,106 +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 Find Tax Authorities screen.</title>
-    <para>The default screen displays a list of Tax Authorities that have been setup.</para>
-    <para>IMPORTANT: You will need to create a party in Party Manager for the tax authority before
-        you can add a new tax authority in the accounting / tax authorities screen.</para>
-    <para>Steps to create the party to be used for the tax authority are as follows:</para>
-    <para>
-        <orderedlist>
-            <listitem>
-                <para>Create New Party Group</para>
-            </listitem>
-            <listitem>
-                <para>Fill in basic details (eg name, address etc)</para>
-            </listitem>
-            <listitem>
-                <para>Once the party record is created then add the role of 'Tax Authority' to the
-                    party</para>
-            </listitem>
-        </orderedlist>
-    </para>
-    <para>Only when the tax authority party record is created can you continue.</para>
-    <section>
-        <title>How do I create a new tax authority?</title>
-        <para>Press the 'New Tax Authority' button</para>
-        <para>
-            <orderedlist>
-                <listitem>
-                    <para>Select or enter the code for the country, state or region that is
-                        applicable for the 'Geo' field</para>
-                </listitem>
-                <listitem>
-                    <para>Select or enter the party id of the Tax Authority party that has been
-                        created in Party Manager</para>
-                </listitem>
-                <listitem>
-                    <para>Leave the 'Require Tax Id for Exemption' field at its default of 'Y'(NOTE:
-                        This triggers tax not to be charged if a valid Tax Id is found!)</para>
-                </listitem>
-                <listitem>
-                    <para>Leave 'Tax Id Format Pattern' blank (NOTE: This specifies the format of
-                        the Tax Id so that it can be validated)</para>
-                </listitem>
-                <listitem>
-                    <para>Fill in the 'Include Tax in the price' - the default is 'N'. (NOTE: If
-                        prices need to include tax such as GST or VAT in the price then change this
-                        to 'Y')</para>
-                </listitem>
-                <listitem>
-                    <para>Press the 'Update' button</para>
-                </listitem>
-            </orderedlist>
-        </para>
-        <para>NOTE: The above process creates the basic tax authority detail but there are further
-            details that can be added via the other tax authority sub menus</para>
-    </section>
-    <section>
-        <title>How do I update a tax authority?</title>
-        <para>
-            <orderedlist>
-                <listitem>
-                    <para>Select the 'Edit' button next to the tax authority that you wish to
-                        update</para>
-                </listitem>
-                <listitem>
-                    <para>The 'Edit Tax Authority' screen is displayed</para>
-                </listitem>
-                <listitem>
-                    <para>Update the details of the tax authority as required including any
-                        submenus</para>
-                </listitem>
-                <listitem>
-                    <para>Press the 'Update' button</para>
-                </listitem>
-            </orderedlist>
-        </para>
-    </section>
-    <section>
-        <title>How do I delete / remove a tax authority?</title>
-        <para>Tax authorities cannot be deleted via the Tax Authority screens. If they need to be
-            removed then it can be done via the Webtools and Entity Data maintenance.</para>
-        <para>NOTE: Be very careful removing tax authorities records unless you are completely
-            certain that they have not been already used for transaction calculations. </para>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml
deleted file mode 100644
index 9ad43f7..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml
+++ /dev/null
@@ -1,87 +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 List Tax Authority Parties screen.</title>
- <para>This screen list any parties that have been associated with a tax
-  authority and tax rate. To have any tax calculated for Sales Orders or
-  Purchase Orders then an entry must exist for 'Company'.</para>
- <para>Entries can also be created, updated or deleted.</para>
- <section>
-  <title>How do I add a new Tax Authority Party Info?</title>
-  <orderedlist>
-   <listitem>
-    <para>Press the 'New Tax Authority Party Info' button</para>
-   </listitem>
-   <listitem>
-    <para>Enter or use the lookup to select the 'Party Id'</para>
-   </listitem>
-   <listitem>
-    <para>Leave the 'From Date' blank (NOTE: Default will be current
-     date and time)</para>
-   </listitem>
-   <listitem>
-    <para>Leave the 'Thru Date' blank</para>
-   </listitem>
-   <listitem>
-    <para>Enter the 'Party Tax Id' if required (NOTE: This can be VAT or
-     GST number)</para>
-   </listitem>
-   <listitem>
-    <para>Use the drop down box to select whether the party select is
-     'Tax Exempt'</para>
-   </listitem>
-   <listitem>
-    <para>Use the drop down box to select whether the party selected is
-     'Nexus' (See note below)</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Create' button</para>
-   </listitem>
-  </orderedlist>
-  <para>NOTE: 'Nexus' is a term that refers to an agreement for between
-   the tax authority and potential tax payer that the tax authority can
-   impose the tax. This is usually for Sales Tax. If you have a Sales
-   Tax that is uniformly applied to a product or range of products then
-   the 'Nexus' field can be set to 'Y'</para>
- </section>
- <section>
-  <title>How do I update a Tax Authority Party Info?</title>
-  <orderedlist>
-   <listitem>
-    <para>Press the 'Edit' button next to the entry that needs to be
-     amended</para>
-   </listitem>
-   <listitem>
-    <para>Update the fields as required</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Update' button</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I delete a Tax Authority Party Info?</title>
-  <orderedlist>
-   <listitem>
-    <para>Press the 'Delete' button next to the entry that needs to be
-     deleted</para>
-   </listitem>
-  </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml
deleted file mode 100644
index 020b61c..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml
+++ /dev/null
@@ -1,56 +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>Tax Authorities.</title>
-    <para>A tax authority is legal body usually the state (country) that imposes a financial levy on
-        business transactions.</para>
-    <para>In OFBiz tax authorities are used to calculate where business or related taxes are
-        due.</para>
-    <para>Tax setup is very important as it links into the calculated price that you can charge your
-        customers and also flows through into any related legal documents that are generated (eg
-        Sales Order, Sales Invoice, Purchase Order etc).</para>
-    <para>Each country or region will have specific rules regarding what should or should not be
-        taxed. There will also be very strict regulations on how taxable transactions should be
-        recorded and tracked in the general ledger or chart of accounts.</para>
-    <para>Tax authority setup allows configuration of the following :</para>
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para>Income tax</para>
-            </listitem>
-            <listitem>
-                <para>Value Added Tax (VAT) / Goods and Services Tax (GST)</para>
-            </listitem>
-            <listitem>
-                <para>Import / Export tax /Custom and Excise Duty</para>
-            </listitem>
-            <listitem>
-                <para>State, City or County taxes </para>
-            </listitem>
-        </itemizedlist>
-    </para>
-    <xi:include href="HELP_ACCOUNTING_FindTaxAuthority.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditTaxAuthority.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityCategories.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListTaxAuthorityParties.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml"/>
-</section>
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc
new file mode 100644
index 0000000..3266e51
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc
@@ -0,0 +1,31 @@
+////
+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 Edit Tax Authority
+The 'Edit Tax Authority' sub menu is the first of six sub menus used in the creation or update of a Tax Authority.
+On the creation or update of a Tax Authority it is the default screen that is displayed.
+
+It can be used for updating the basic details of a Tax Authority such as:
+
+. Changing whether a tax id or code is required for an exemption
+. Modifying the tax id or code format
+. Updating where or not to include the tax calculation as part of the product price
+
+NOTE: An example of the Tax Id is as follows: +
+      \d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4} which translates to 99-9999999 or 999-99-9999
\ No newline at end of file
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc
new file mode 100644
index 0000000..a416f82
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc
@@ -0,0 +1,42 @@
+////
+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 Edit Tax Authority Associations
+An association is a way of specifying how tax authorities can be linked to each other.
+
+It can be used in the situation where the tax structure is hierarchical (eg city tax, plus county tax plus state tax).
+
+Using associations allows tax rates from multiple authorities to be applied to a particular order at once.
+
+== How do I add a new association for a Tax Authority?
+. Enter or use the lookup to find the 'To Tax Auth Geo Id'
+. Enter of use the lookup to find the 'To Tax Auth Party Id'
+. Leave the 'From Date' blank (NOTE: It will default to the current date and time)
+. Leave the 'Thru Date' blank
+. Select the 'Type' from the dropdown or leave blank
+. Press the 'Add' button
+. The new tax authority association is displayed at the bottom of the screen.
+
+== How do I update an association for a Tax Authority?
+. Only two fields are available for update, these are the 'Thru Date' and 'Type'
+. Enter the changes required
+. Press the 'Update' button next to the entry updated
+
+== How do I remove an association for a Tax Authority?
+. Press the 'Delete' button next to the entry that needs to be deleted
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc
new file mode 100644
index 0000000..137728c
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc
@@ -0,0 +1,40 @@
+////
+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 Edit Tax Authority Categories
+The Tax Authority Categories sub menu screen allows you link a tax authority to a specific catalog or product category.
+
+It can be used to add product categories to a tax authority.
+This means that all products in this category will be taxed at the rate specified for the tax authority.
+
+An example of this could be separating products into categories for export to different countries.
+A separate tax authority will be associated with each category so that the specific tax rate for each of them will be applied.
+
+== How do I add a new Tax Authority / Category mapping?
+. Enter or Lookup the 'Category Id' to be mapped
+. Press the 'Add' button
+. The new mapping will be displayed at the bottom of the screen
+
+== How do I update a Tax Authority / Category mapping?
+A Tax Authority / Category mapping cannot be updated.
+If it needs to be changed then the entry must be deleted and then re-entered.
+
+== How do I remove a Tax Authority / Category mapping?
+. Locate the entry that needs to be removed
+. Press the 'Delete' button next to the entry
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc
new file mode 100644
index 0000000..9f509f4
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc
@@ -0,0 +1,51 @@
+////
+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 Edit Tax Authority GL Accounts
+The GL Accounts sub menu screen allows you specify which general ledger account any tax calculated for this tax authority
+ will be posted.
+This is done at at organisation level so the minimum requirement is that 'Company' is setup.
+
+It is used to consolidate taxes for a specific tax authority into one general ledger account.
+It can be very useful if you need to track taxes for several tax authorities (eg different states or countries).
+
+== How do I add a new general ledger account for a Tax Authority?
+. Enter or use the lookup to select the 'Organisation Party Id' +
+  (NOTE: Normally this would be 'Company')
+. Enter or use the lookup to select the 'GL Account'
+. Press the 'Add' button
+
+NOTE: The GL account used must have already been created in the Global GL Settings and linked to the chart of accounts
+      for 'Company'
+
+== How do I update a general ledger account for a Tax Authority?
+. The general ledger account can be updated by simply adding a new account to replace the existing entry.
+. Enter or use the lookup to select the 'Organisation Party Id' +
+  (NOTE: Normally this would be 'Company')
+. Enter or use the lookup to select the updated 'GL Account'
+. Press the 'Add' button
+. The existing entry will be replaced by the updated GL Account
+
+NOTE: Be careful when updating a general ledger account because some transactions may have already been posted
+     to the existing account.
+
+== How do I delete a general ledger account for a Tax Authority?
+. Locate the entry required
+. Press the 'Delete' button next to the entry that needs to be deleted
+. The entry is removed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc
new file mode 100644
index 0000000..276381f
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc
@@ -0,0 +1,27 @@
+////
+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 Edit Tax Authority Party Info
+This screen is used to create or update details for a Tax Authority Party entry.
+
+If a new entry is being created all fields are available to be entered.
+
+If an existing entry is being updated only limited fields are available to be amended.
+
+
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc
new file mode 100644
index 0000000..4678cb7
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc
@@ -0,0 +1,57 @@
+////
+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 Edit Tax Authority Product Rates
+This screen allows the setup of tax rates and types.
+The rates or type can be assigned globally to a store (ie tax will be applied to all products at the same rate)
+ or category (ie limited to products in a specific category).
+
+Other parameters are available to allow the user to limit whether the tax is to be applied to all purchases / sales or
+ only those which are above a certain threshold.
+
+Tax associated with shipping charges or promotions can also be configured here.
+
+== How do I add a new product tax rate?
+. Use the drop down box to select the tax 'Type' (eg Sales Tax)
+. Use the lookup to select a 'Store Id' (or leave blank for all Stores)
+. If a category has been setup it will be available for selection in 'Category' field otherwise leave this blank
+. Leave 'Title Transfer' blank
+. Enter a value for the 'Minimum Price' for a product where the tax is to be applied +
+  (NOTE: The Demo Data sets this as zero)
+. Enter a value for the 'Minimun Purchase' where the tax is to be applied +
+  (NOTE: The Demo Data sets this as zero)
+. Use the drop down box to select whether 'Shipping Charges' will be taxable
+. Enter the tax rate in the 'Tax Percentage' field (eg 12.5)
+. Use the drop down box to select whether products on 'Promotion' will be taxable
+. Leave the 'From Date' and 'Thru Date' blank
+. Enter the name of the tax in the 'Description' field (eg VAT) as this will be displayed and printed on documents
+   when the tax is applied
+. Press the 'Add' button
+
+== How do I update an existing product tax rate
+. Select the entry that needs to be updated
+. Make the changes required
+. Press the 'Update' button next to the entry that needs to be updated
+
+== How do I delete a product tax rate?
+. Press the 'Delete' button next to the entry that needs to be removed
+
+WARNING: The deletion of tax rates may cause audit problems particularly if the rate has already been used as part of
+      a transaction. +
+      In this case it would be better to expire the old rate using the 'Thru Date' field and then enter the new rate.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc
new file mode 100644
index 0000000..2530695
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc
@@ -0,0 +1,62 @@
+////
+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 Find Tax Authorities
+The default screen displays a list of Tax Authorities that have been setup.
+
+IMPORTANT: You will need to create a party in Party Manager for the tax authority before you can add a new tax authority
+           in the accounting / tax authorities screen.
+
+Steps to create the party to be used for the tax authority are as follows:
+
+. Create New Party Group
+. Fill in basic details (eg name, address etc)
+. Once the party record is created then add the role of 'Tax Authority' to the party
+
+Only when the tax authority party record is created can you continue.
+
+== How do I create a new tax authority?
+Press the 'New Tax Authority' button
+
+. Select or enter the code for the country, state or region that is applicable for the 'Geo' field
+. Select or enter the party id of the Tax Authority party that has been created in Party Manager
+. Leave the 'Require Tax Id for Exemption' field at its default of 'Y' +
+  (NOTE: This triggers tax not to be charged if a valid Tax Id is found!)
+. Leave 'Tax Id Format Pattern' blank +
+  (NOTE: This specifies the format of the Tax Id so that it can be validated)
+. Fill in the 'Include Tax in the price' - the default is 'N'. +
+  (NOTE: If prices need to include tax such as GST or VAT in the price then change this to 'Y')
+. Press the 'Update' button
+
+NOTE: The above process creates the basic tax authority detail but there are further details that can be added via the other
+      tax authority sub menus
+
+== How do I update a tax authority?
+. Select the 'Edit' button next to the tax authority that you wish to update
+. The 'Edit Tax Authority' screen is displayed
+. Update the details of the tax authority as required including any submenus
+. Press the 'Update' button
+
+== How do I delete / remove a tax authority?
+Tax authorities cannot be deleted via the Tax Authority screens.
+If they need to be removed then it can be done via the Webtools and Entity Data maintenance.
+
+WARNING: Be very careful removing tax authorities records unless you are completely certain that they have not been already used
+     for transaction calculations.
+ 
\ No newline at end of file
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.adoc
new file mode 100644
index 0000000..1ec30e2
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.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 List Tax Authority Parties
+This screen list any parties that have been associated with a tax authority and tax rate.
+To have any tax calculated for Sales Orders or Purchase Orders then an entry must exist for 'Company'.
+
+Entries can also be created, updated or deleted.
+
+== How do I add a new Tax Authority Party Info?
+. Press the 'New Tax Authority Party Info' button
+. Enter or use the lookup to select the 'Party Id'
+. Leave the 'From Date' blank +
+  (NOTE: Default will be current date and time)
+. Leave the 'Thru Date' blank
+. Enter the 'Party Tax Id' if required +
+  (NOTE: This can be VAT or GST number)
+. Use the drop down box to select whether the party select is 'Tax Exempt'
+. Use the drop down box to select whether the party selected is 'Nexus' (See note below)
+. Press the 'Create' button
+
+NOTE: 'Nexus' is a term that refers to an agreement for between the tax authority and potential tax payer that
+      the tax authority can impose the tax. This is usually for Sales Tax. +
+      If you have a Sales Tax that is uniformly applied to a product or range of products then
+      the 'Nexus' field can be set to 'Y'
+
+== How do I update a Tax Authority Party Info?
+. Press the 'Edit' button next to the entry that needs to be amended
+. Update the fields as required
+. Press the 'Update' button
+
+== How do I delete a Tax Authority Party Info?
+. Press the 'Delete' button next to the entry that needs to be deleted
diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc
new file mode 100644
index 0000000..dac59a7
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc
@@ -0,0 +1,55 @@
+////
+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.
+////
+
+= Tax Authorities.
+
+A tax authority is legal body usually the state (country) that imposes a financial levy on business transactions.
+
+In OFBiz tax authorities are used to calculate where business or related taxes are due.
+
+Tax setup is very important as it links into the calculated price that you can charge your customers and also flows
+ through into any related legal documents that are generated (eg Sales Order, Sales Invoice, Purchase Order etc).
+
+Each country or region will have specific rules regarding what should or should not be taxed.
+There will also be very strict regulations on how taxable transactions should be recorded and tracked in the general ledger
+ or chart of accounts.
+
+Tax authority setup allows configuration of the following :
+
+* Income tax
+* Value Added Tax (VAT) / Goods and Services Tax (GST)
+* Import / Export tax /Custom and Excise Duty
+* State, City or County taxes
+
+== Tax Authorities management in User Interface
+include::HELP_FindTaxAuthority.adoc[leveloffset=+2]
+
+include::HELP_EditTaxAuthority.adoc[leveloffset=+2]
+
+include::HELP_EditTaxAuthorityCategories.adoc[leveloffset=+2]
+
+include::HELP_EditTaxAuthorityAssocs.adoc[leveloffset=+2]
+
+include::HELP_EditTaxAuthorityGlAccounts.adoc[leveloffset=+2]
+
+include::HELP_EditTaxAuthorityRateProducts.adoc[leveloffset=+2]
+
+include::HELP_ListTaxAuthorityParties.adoc[leveloffset=+2]
+
+include::HELP_EditTaxAuthorityPartyInfo.adoc[leveloffset=+2]
diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc
index f3d3d35..4988111 100644
--- a/applications/accounting/src/docs/asciidoc/accounting.adoc
+++ b/applications/accounting/src/docs/asciidoc/accounting.adoc
@@ -40,4 +40,6 @@ include::_include/acc-agreements.adoc[leveloffset=+1]
 
 include::_include/acc-financial-accounts.adoc[leveloffset=+1]
 
+include::_include/acc-tax-authorities.adoc[leveloffset=+1]
+
 include::_include/acc-global-settings.adoc[leveloffset=+1]