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:52 UTC

[ofbiz-framework] 01/12: Documented: Agreement Help Docbook file migration to asciidoc format (OFBIZ-10290)

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 a40a23583b2f835e4b9947f6670fc71813f4bd0c
Author: holivier <ol...@developpement.o-toit.com>
AuthorDate: Wed Jan 29 19:16:07 2020 +0100

    Documented: Agreement Help Docbook file migration to asciidoc format
    (OFBIZ-10290)
    
    All the new files are now included in the Agreement documentation
    presentation, at the end in a sub-chapter Agreement management in User
    Interface.
---
 .../helpdata/HELP_ACCOUNTING_EditAgreement.xml     |  49 ----------
 .../HELP_ACCOUNTING_EditAgreementContents.xml      |  42 --------
 ..._ACCOUNTING_EditAgreementGeographicalApplic.xml |  23 -----
 .../helpdata/HELP_ACCOUNTING_EditAgreementItem.xml |  50 ----------
 .../HELP_ACCOUNTING_EditAgreementItemParty.xml     |  26 -----
 .../HELP_ACCOUNTING_EditAgreementItemProduct.xml   |  22 -----
 ...ACCOUNTING_EditAgreementItemSupplierProduct.xml |  22 -----
 .../HELP_ACCOUNTING_EditAgreementItemTerm.xml      |  22 -----
 .../HELP_ACCOUNTING_EditAgreementRoles.xml         |  41 --------
 .../HELP_ACCOUNTING_EditAgreementTerms.xml         | 106 ---------------------
 ...P_ACCOUNTING_EditAgreementWorkEffortApplics.xml |  41 --------
 .../helpdata/HELP_ACCOUNTING_FindAgreement.xml     |  48 ----------
 ..._ACCOUNTING_ListAgreementGeographicalApplic.xml |  37 -------
 .../HELP_ACCOUNTING_ListAgreementItemParties.xml   |  37 -------
 .../HELP_ACCOUNTING_ListAgreementItemProducts.xml  |  47 ---------
 ...CCOUNTING_ListAgreementItemSupplierProducts.xml |  53 -----------
 .../HELP_ACCOUNTING_ListAgreementItemTerms.xml     |  46 ---------
 .../HELP_ACCOUNTING_ListAgreementItems.xml         |  22 -----
 .../HELP_ACCOUNTING_ListAgreementPromoAppls.xml    |  49 ----------
 .../data/helpdata/HELP_ACCOUNTING_agreements.xml   |  48 ----------
 .../docs/asciidoc/_include/HELP_EditAgreement.adoc |  43 +++++++++
 .../_include/HELP_EditAgreementContents.adoc       |  36 +++++++
 .../asciidoc/_include/HELP_EditAgreementItem.adoc  |  43 +++++++++
 .../asciidoc/_include/HELP_EditAgreementRoles.adoc |  35 +++++++
 .../asciidoc/_include/HELP_EditAgreementTerms.adoc |  62 ++++++++++++
 .../HELP_EditAgreementWorkEffortApplics.adoc       |  35 +++++++
 .../docs/asciidoc/_include/HELP_FindAgreement.adoc |  39 ++++++++
 .../HELP_ListAgreementGeographicalApplic.adoc      |  35 +++++++
 .../_include/HELP_ListAgreementItemParties.adoc    |  31 ++++++
 .../_include/HELP_ListAgreementItemProducts.adoc   |  41 ++++++++
 .../HELP_ListAgreementItemSupplierProducts.adoc    |  52 ++++++++++
 .../_include/HELP_ListAgreementItemTerms.adoc      |  37 +++++++
 .../_include/HELP_ListAgreementPromoAppls.adoc     |  42 ++++++++
 .../src/docs/asciidoc/_include/acc-agreements.adoc |  42 ++++++++
 34 files changed, 573 insertions(+), 831 deletions(-)

diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml
deleted file mode 100644
index 48cde42..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml
+++ /dev/null
@@ -1,49 +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 Agreement help screen</title>
-     <para>The 'Agreement' sub menu is used to enter the basic details required for setting up a new
-        agreement or editing an existing one.</para>
-    <para>It can be used to create or update the following details for an Agreement:</para>
-   <itemizedlist>
-   <listitem><para>The parties the agreement is between and their roles</para></listitem>
-   <listitem><para>The agreement type (eg Sales, Purchase, Commission, Employment etc)</para></listitem>
-   <listitem><para>Specific products </para></listitem>
-   <listitem><para>Start and End Date</para></listitem>
-   <listitem><para>Description</para></listitem>
-   </itemizedlist>
-  <section>
-    <title>How do I edit an agreement?</title>
-    <orderedlist>
-    <listitem><para>Find the agreement that needs to be amended</para></listitem>
-    <listitem><para>Click on Agreement Id</para></listitem>
-    <listitem><para>The 'Edit Agreement' screen will be displayed</para></listitem>
-    <listitem><para>Amend the details required and press the 'Submit' button (NOTE: Additional agreement details can be updated via the other tabs eg Agreement Terms, Agreement Roles, Agreement Items and Agreement Work Effort Appls)</para></listitem>
-    </orderedlist>
-   </section>
-   <section>
-   <title>How do I copy an existing agreement?</title>
-   <orderedlist>
-   <listitem><para>Find the agreement that needs to be copied</para></listitem>
-   <listitem><para>Click on the Agreement Id</para></listitem>
-   <listitem><para>The 'Edit Agreement' screen will be displayed</para></listitem>
-   <listitem><para>At the bottom of the screen press the 'Copy' in the 'Copy Agreement' window (NOTE: The default tick boxes will copy the agreement terms, products and party. If not required then click on the boxes to stop them being copied)</para></listitem>
-   </orderedlist>
-   </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml
deleted file mode 100644
index 9bc0dc6..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml
+++ /dev/null
@@ -1,42 +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 Agreement Content help screen</title>
-     <para>This screen use for uploading any contents that concern the agreement. The screen consists of :</para>
-    <itemizedlist>
-        <listitem><para>- Add Agreement Content</para></listitem>
-        <listitem><para>- Agreement Content List</para></listitem>
-    </itemizedlist>
-    <section>
-        <title>Add Agreement Content</title>
-        <para>
-            To upload the content. The content can be classified by choosing the Content Type Id and Mime Type Id.
-        </para>
-    </section>
-    <section>
-        <title>Agreement Content List</title>
-        <para>
-            To Show the list of contents. There are 2 buttons in each content:
-            <orderedlist>
-                <listitem><para>Download : To download the uploaded content</para></listitem>
-                <listitem><para>Delete : To delete the uploaded content</para></listitem>
-            </orderedlist>
-        </para>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml
deleted file mode 100644
index 644a1a2..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml
+++ /dev/null
@@ -1,23 +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 Agreement Geo help screen</title>
-    <para>This screen is used to create a geographical location for an agreement item.</para>
-    <para>NOTE: A new entry can be created or removed but not updated.</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml
deleted file mode 100644
index ac01729..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml
+++ /dev/null
@@ -1,50 +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 Agreement Item help screen</title>
-    <para>This screen allows specific items to be added to agreement. Currently these are limited to the following:</para>
-    <itemizedlist>
-    <listitem><para>Pricing</para></listitem>
-    <listitem><para>Commission Rate</para></listitem>
-    <listitem><para>Sub-Agreement</para></listitem>
-    <listitem><para>Exhibit</para></listitem>
-    <listitem><para>Section</para></listitem>
-    </itemizedlist>
-    <section>
-    <title>How do I create an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Create Agreement Item' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Item' screen is displayed</para></listitem>
-    <listitem><para>Select the 'Agreement Item Type Id' from the drop down box</para></listitem>
-    <listitem><para>Use the drop down box to select the 'Currency' for the Agreement Item</para></listitem>
-    <listitem><para>Enter any 'Agreement Text' if required</para></listitem>
-    <listitem><para>Enter path for 'Agreement Image' if required</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    <listitem><para>A new sub menu will be displayed containing 'Promotions','Terms','Products','Party' and 'Geo' for additional details that can be setup for the agreement item</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I edit an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Select the agreement item to be updated by clicking on the Agreement Item Id</para></listitem>
-    <listitem><para>The 'Edit Agreement Item' screen is displayed</para></listitem>
-    <listitem><para>Update the fields required (NOTE: Additional details can be updated by selecting the Promotions, Terms, Product, Party or Geo sub menus)</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml
deleted file mode 100644
index 9766a35..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml
+++ /dev/null
@@ -1,26 +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 Agreement Item Party help screen</title>
-    <para>This screen is used to add or update a party linked to an agreement item. This could be useful for storing specific contact names associated with an agreement item.</para>
-    <section>
-    <title>How do I update a party for an agreement item?</title>
-    <para>Parties for an agreement item cannot be updated. They can only be added or removed.</para>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml
deleted file mode 100644
index 1c1acbc..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml
+++ /dev/null
@@ -1,22 +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 Agreement Item Product help screen</title>
-    <para>This screen is used to create or update a product entry for an agreement item.</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml
deleted file mode 100644
index c3ca22c..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml
+++ /dev/null
@@ -1,22 +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 Agreement Item Supplier Product help screen</title>
-    <para>This screen is used to create or update a product entry for a supplier agreement item. Any updates made in this screen can also be viewed in Catalog Manager for the product under the product 'Suppliers' and 'Agreements' tabs.</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml
deleted file mode 100644
index f9094e8..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml
+++ /dev/null
@@ -1,22 +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 Agreement Item Term help screen</title>
-    <para>This screen is used to create or update the terms for an agreement item.</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml
deleted file mode 100644
index c6318b5..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml
+++ /dev/null
@@ -1,41 +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 Agreements Roles help screen</title>
-    <para>This screen is used to assign a party roles for an agreement.</para>
-    <section>
-    <title>How do I add a party role to an agreement?</title>
-    <orderedlist>
-    <listitem><para>Use the lookup to select the 'Party Id'</para></listitem>
-    <listitem><para>Use the drop down box to select the 'Party Role Id'</para></listitem>
-    <listitem><para>Press the 'Add' button (NOTE: If the party does not have this role associated with them then an error will be displayed)</para></listitem>
-    <listitem><para>The new entry will be displayed in the lower part of the screen</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I update a party role for an agreement?</title>
-    <para>Party roles can only be added and deleted. They cannot be updated.</para>
-    </section>
-    <section>
-    <title>How do I delete a party role from an agreement?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Remove' button for the entry that needs to be deleted.</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml
deleted file mode 100644
index ca5075d..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.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 Edit Agreement Terms help screen</title>
- <para>Agreement Terms are the rules that make up the agreement.
-  Agreements may have a one or more terms.</para>
- <para>Examples of agreement terms from a sales and purchase viewpoint
-  include the following:</para>
- <itemizedlist>
-  <listitem>
-   <para>Payment due within a certain timeframe (eg 30 days)</para>
-  </listitem>
-  <listitem>
-   <para>Discounts for early payment</para>
-  </listitem>
-  <listitem>
-   <para>Specifying Late fee penalties</para>
-  </listitem>
-  <listitem>
-   <para>Purchasing agreements</para>
-  </listitem>
-  <listitem>
-   <para>Specifying commission rates</para>
-  </listitem>
-  <listitem>
-   <para>Exclusive Relationship</para>
-  </listitem>
- </itemizedlist>
- <para>NOTE: Agreements can also be specified for Employment, Legal, Non
-  Compete etc.</para>
- <para>Agreement terms are configured by linking them to the Invoice
-  Item Type.</para>
- <para>IMPORTANT NOTE: The drop down box for 'Invoice Item Type'
-  contains what appears to be duplicates for items such as 'Invoice
-  Fee', 'Invoice Discount', 'Invoice Finished Good Item' etc. These are
-  NOT duplicates one of these entries refers to the Sales Invoice and
-  the other refers to the Purchase Invoice. As the descriptions are
-  exactly the same it is impossible to know which refers to which so
-  needs to be done using trial and error!</para>
- <section>
-  <title>How do I add a payment term for 30 days?</title>
-  <orderedlist>
-   <listitem>
-    <para>Select 'Payment Net Days' from the 'Term Type Id' drop down
-     box</para>
-   </listitem>
-   <listitem>
-    <para>Enter '30' in the 'Term Days' field</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Submit' button</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I add a discount term of 2% if paid within 10 days?
-  </title>
-  <orderedlist>
-   <listitem>
-    <para>Select 'Payment Discounted if paid with Specified Days' from
-     the 'Term Type Id' drop down box</para>
-   </listitem>
-   <listitem>
-    <para>Enter '2' in the 'Term Value' field</para>
-   </listitem>
-   <listitem>
-    <para>Enter '10' in the 'Term Days' field</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Submit' button</para>
-   </listitem>
-  </orderedlist>
- </section>
- <section>
-  <title>How do I specify pricing in a specific currency only for this
-   customer or supplier?</title>
-  <para>This is done using the 'Agreement Items' sub menu</para>
- </section>
- <section>
-  <title>How do I delete a payment term?</title>
-  <orderedlist>
-   <listitem>
-    <para>Locate the payment term required</para>
-   </listitem>
-   <listitem>
-    <para>Press the 'Remove'on the entry that needs to be removed</para>
-   </listitem>
-  </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml
deleted file mode 100644
index 988b37a..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml
+++ /dev/null
@@ -1,41 +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 Agreement Work Effort Applications help screen</title>
-    <para>This screen is used to link a work effort to the whole agreement or an individual agreement item.</para>
-    <section>
-    <title>How do I add a work effort to an agreement?</title>
-    <orderedlist>
-    <listitem><para>Use the drop down box to select the 'Agreement Item Seq Id'</para></listitem>
-    <listitem><para>Use the lookup to select the 'Workeffort Id'</para></listitem>
-    <listitem><para>Press the 'Add' button</para></listitem>
-    <listitem><para>The new entry is displayed in the lower part of the screen</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I update a work effort for an agreement?</title>
-    <para>Work efforts can only be added or deleted. They cannot be updated</para>
-    </section>
-    <section>
-    <title>How do I delete a work effort from an agreement?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Delete' button for the entry that needs to be deleted</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml
deleted file mode 100644
index 1ed8deb..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml
+++ /dev/null
@@ -1,48 +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 Agreements help screen</title>
-    <para> The default screen is for the Agreements tab is 'Find Agreements'. It is used to locate existing agreements that have been created. The user has the option to</para>
-    <itemizedlist><listitem><para>use the 'Find' button to locate an existing agreement or </para></listitem>
-    <listitem><para>create a new one by clicking on the 'Create Agreement' button.</para></listitem>
-    </itemizedlist>
-    <section>
-    <title>How do I locate an existing agreement?</title>
-    <orderedlist>
-    <listitem><para>Enter search option details if known</para></listitem>
-    <listitem><para>Press the 'Find' button</para></listitem>
-    <listitem><para>A list of existing agreements will be displayed</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I create a new agreement?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Create Agreement' button</para></listitem>
-    <listitem><para>The 'Edit Agreement' screen is displayed</para></listitem>
-    <listitem><para>Enter the details required and press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I cancel an agreement?</title>
-    <orderedlist>
-    <listitem><para>Locate the agreement required</para></listitem>
-    <listitem><para>Press the 'Cancel' button on the agreement entry that needs to be cancelled</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml
deleted file mode 100644
index 55c63fb..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml
+++ /dev/null
@@ -1,37 +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 Agreement Geo help screen</title>
-    <para>This screen is used to display a list of the geographical locations that are valid for the agreement item.</para>
-    <section>
-    <title>How do I create a new geographical location for an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'New' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Geographical Application' screen is displayed</para></listitem>
-    <listitem><para>Use the drop down box to select the 'Geo Id'</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I delete a geographical location for an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Delete' button for the entry that needs to be deleted</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml
deleted file mode 100644
index 1f0e867..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml
+++ /dev/null
@@ -1,37 +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 Agreement Items Parties help screen</title>
-    <para>This screen is used to display any parties that have been linked to this agreement item.</para>
-    <section>
-    <title>How do I create a party for an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'New' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Item Party' screen is displayed</para></listitem>
-    <listitem><para>Manually enter or use the lookup to select the 'Party Id'</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I remove a party for an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Delete' button for the entry that needs to be deleted.</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml
deleted file mode 100644
index 231a4fe..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml
+++ /dev/null
@@ -1,47 +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 Agreement Item Products help screen</title>
-    <para>This screen is used to link a specific product or products to an agreement. This can be useful for restricting a discount or product pricing to a particular product (or range of products) for a specific customer.</para>
-    <section>
-    <title>How do I add a product to an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'New Product' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem>
-    <listitem><para>Manually enter or use the lookup to select the 'Product Id'</para></listitem>
-    <listitem><para>Enter the 'Price' to be associated to the product for this agreement item</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I update a product linked to an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Select the product required by clicking on the 'Product Id'</para></listitem>
-    <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem>
-    <listitem><para>Update the 'Price' for the product (NOTE: Only product price is available for update)</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I delete a product from an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Remove' button on the entry that needs to be deleted</para></listitem>
-    </orderedlist>
-    </section>
- </section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml
deleted file mode 100644
index f874400..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml
+++ /dev/null
@@ -1,53 +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 Agreement Item Supplier Products help screen</title>
-    <para>This screen is used to link a specific product (or range of products) to an agreement. This can be useful for restricting a discount or product pricing to a product (or range of products) for a particular supplier.</para>
-    <para>NOTE: Products created here will be linked to the product and can be view using Catalog Manager. Entries can be viewed under the Product 'Suppliers' and 'Agreements' tabs.</para>
-    <section>
-     <title>How do I add a product to an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'New Product' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem>
-    <listitem><para>Manually enter or use the lookup to select the 'Product Id'</para></listitem>
-    <listitem><para>Enter the 'Available From Date'</para></listitem>
-    <listitem><para>Leave the 'Thru Date' blank</para></listitem>
-    <listitem><para>Using the drop down box select the 'Supplier Order Pref Id'</para></listitem>
-    <listitem><para>Enter the 'Last Price'</para></listitem>
-    <listitem><para>Enter 'Supplier Product Id'</para></listitem>
-    <listitem><para>Enter any other details as required or leave blank</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I update a product linked to an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Select the product required by clicking on the 'Product Id'</para></listitem>
-    <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem>
-    <listitem><para>Update the details as required</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I delete a product from an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Remove' button on the entry that needs to be deleted</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml
deleted file mode 100644
index c8032a6..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml
+++ /dev/null
@@ -1,46 +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 Agreements Item Terms help screen</title>
-    <para>This screen is used to enter or maintain terms that are specific to an agreement item. The terms available are the same as those found under the 'Agreement Terms' tab and any related terms will be displayed both here and under the 'Agreement Items' tab .</para>
-    <section>
-    <title>How do I create a term for an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Create Term' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Item Term' screen is displayed</para></listitem>
-    <listitem><para>Enter the term details required</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-   </section>
-   <section>
-   <title>How do I update a term for an agreement item?</title>
-   <orderedlist>
-   <listitem><para>Select the term for the agreement item by clicking on the term id</para></listitem>
-   <listitem><para>The 'Edit Agreement Item Term' screen is displayed</para></listitem>
-   <listitem><para>Update the details required</para></listitem>
-   <listitem><para>Press the 'Submit' button</para></listitem>
-   </orderedlist>
-   </section>
-   <section>
-   <title>How do I delete a term for an agreement item?</title>
-   <orderedlist>
-   <listitem><para>Press the 'Remove' button on the term entry that needs to be deleted.</para></listitem>
-   </orderedlist>
-   </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml
deleted file mode 100644
index 359c295..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml
+++ /dev/null
@@ -1,22 +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 Agreement Items help screen</title>
-    <para>This screen is used to display a list of items that have been created for an agreement.</para>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml
deleted file mode 100644
index 251e7da..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml
+++ /dev/null
@@ -1,49 +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 Agreements Item Promotions help screen</title>
-    <para>This screen is used to enter or maintain any promotions that are associated with the Agreement Item. This can be useful if you want to limit where a particular promotion is applied. Promotions are setup in Catalog Manager and can be selected here.</para>
-    <section>
-    <title>How do I add a promotion to an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Add New Promotion' button</para></listitem>
-    <listitem><para>The 'Edit Agreement Promo Applications' screen is displayed</para></listitem>
-    <listitem><para>Select the 'Product Promo Id' from the drop down box</para></listitem>
-    <listitem><para>Enter the 'From Date'</para></listitem>
-    <listitem><para>Enter the 'Thru Date' if required (NOTE:This can be left blank)</para></listitem>
-    <listitem><para>Enter the 'Sequence Num' if required</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I edit an existing promotion for an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Select the agreement item promotion by clicking on on the promotion id</para></listitem>
-    <listitem><para>The 'Edit Agreement Promo Applications' screen is displayed</para></listitem>
-    <listitem><para>Update the details required</para></listitem>
-    <listitem><para>Press the 'Submit' button</para></listitem>
-    </orderedlist>
-    </section>
-    <section>
-    <title>How do I delete a promotion from an agreement item?</title>
-    <orderedlist>
-    <listitem><para>Press the 'Remove' button on the entry that needs to be deleted.</para></listitem>
-    </orderedlist>
-    </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml
deleted file mode 100644
index 896318b..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml
+++ /dev/null
@@ -1,48 +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>Agreements.</title>
-    <para>An agreement is a way of recording a business arrangements or contract that your business makes with other companies or individuals. Common examples include Payment Terms (where you allow a customer up to 30 days to pay you) or Prompt Payment Discounts (where you offer a reduction on the amount owing if your customer pays you before a certain date)</para>
-    <para>It can be used for the following:</para>
-    <itemizedlist>
-    <listitem><para>Defining Payment Terms for Customers or Suppliers</para></listitem>
-    <listitem><para>Defining Sales Commissions</para></listitem>
-    <listitem><para>Setting up Prompt Payment Discounts</para></listitem>
-    <listitem><para>Setting up Price Lists (NOTE TO DO: Need to investigate how this logic overlaps with PRICE RULES in Catalog Manager)</para></listitem>
-   <listitem><para>Defining Late Fee Penalties</para></listitem>
-   <listitem><para>Defining preferred freight carriers or specific codes to be used</para></listitem>
-    </itemizedlist>
-    <xi:include href="HELP_ACCOUNTING_FindAgreement.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreement.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementTerms.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementItem.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListAgreementPromoAppls.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListAgreementItemTerms.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementItemTerm.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListAgreementItemProducts.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementItemProduct.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListAgreementItemParties.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementItemParty.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditAgreementRoles.xml"/>
-</section>
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc
new file mode 100644
index 0000000..5188d9b
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc
@@ -0,0 +1,43 @@
+////
+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 Agreement
+The 'Agreement' sub menu is used to enter the basic details required for setting up a new agreement or editing an existing one.
+
+It can be used to create or update the following details for an Agreement:
+
+* The parties the agreement is between and their roles
+* The agreement type (eg Sales, Purchase, Commission, Employment etc)
+* Specific products
+* Start and End Date
+* Description
+
+
+== How do I edit an agreement?
+. Find the agreement that needs to be amended
+. Click on Agreement Id
+. The 'Edit Agreement' screen will be displayed
+. Amend the details required and press the 'Submit' button (NOTE: Additional agreement details can be updated via the other tabs eg Agreement Terms, Agreement Roles, Agreement Items and Agreement Work Effort Appls)
+
+
+== How do I copy an existing agreement?
+. Find the agreement that needs to be copied
+. Click on the Agreement Id <<true_a_id_howdo_a_how_do_i_edit_an_agreement, How do it?>>
+. The 'Edit Agreement' screen will be displayed
+. At the bottom of the screen press the 'Copy' in the 'Copy Agreement' window (NOTE: The default tick boxes will copy the agreement terms, products and party. If not required then click on the boxes to stop them being copied)
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc
new file mode 100644
index 0000000..3fe9b4d
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc
@@ -0,0 +1,36 @@
+////
+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 Agreement Content
+This screen use for uploading any contents that concern the agreement.
+The screen consists of :
+
+* Add Agreement Content
+* Agreement Content List
+
+== Add Agreement Content
+To upload the content.
+The content can be classified by choosing the Content Type Id and Mime Type Id.
+
+== Agreement Content List
+To Show the list of contents.
+There are 2 buttons in each content:
+
+. Download : To download the uploaded content
+. Delete : To delete the uploaded content
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc
new file mode 100644
index 0000000..893a463
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc
@@ -0,0 +1,43 @@
+////
+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 Agreement Item
+This screen allows specific items to be added to agreement.
+Currently these are limited to the following:
+
+* Pricing
+* Commission Rate
+* Sub-Agreement
+* Exhibit
+* Section
+
+== How do I create an agreement item?
+. Press the 'Create Agreement Item' button
+. The 'Edit Agreement Item' screen is displayed
+. Select the 'Agreement Item Type Id' from the drop down box
+. Use the drop down box to select the 'Currency' for the Agreement Item
+. Enter any 'Agreement Text' if required
+. Enter path for 'Agreement Image' if required
+. Press the 'Submit' button
+. A new sub menu will be displayed containing 'Promotions','Terms','Products','Party' and 'Geo' for additional details that can be setup for the agreement item
+
+== How do I edit an agreement item?
+. Select the agreement item to be updated by clicking on the Agreement Item Id
+. The 'Edit Agreement Item' screen is displayed <<true_a_id_howdo_a_how_do_i_edit_an_agreement, How do it?>>
+. Update the fields required (NOTE: Additional details can be updated by selecting the Promotions, Terms, Product, Party or Geo sub menus)
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc
new file mode 100644
index 0000000..30c7eea
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc
@@ -0,0 +1,35 @@
+////
+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 Agreements Roles
+This screen is used to assign a party roles for an agreement.
+
+== How do I add a party role to an agreement?
+. Use the lookup to select the 'Party Id'
+. Use the drop down box to select the 'Party Role Id'
+. Press the 'Add' button (NOTE: If the party does not have this role associated with them then an error will be displayed)
+. The new entry will be displayed in the lower part of the screen
+
+
+== How do I update a party role for an agreement?
+Party roles can only be added and deleted.
+They cannot be updated.
+
+== How do I delete a party role from an agreement?
+. Press the 'Remove' button for the entry that needs to be deleted.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.adoc
new file mode 100644
index 0000000..2e7a746
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.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 Edit Agreement Terms
+Agreement Terms are the rules that make up the agreement.
+Agreements may have a one or more terms.
+
+Examples of agreement terms from a sales and purchase viewpoint include the following:
+
+* Payment due within a certain timeframe (eg 30 days)
+* Discounts for early payment
+* Specifying Late fee penalties
+* Purchasing agreements
+* Specifying commission rates
+* Exclusive Relationship
+
+NOTE: Agreements can also be specified for Employment, Legal, Non Compete etc.
+
+Agreement terms are configured by linking them to the Invoice Item Type.
+
+IMPORTANT: The drop down box for 'Invoice Item Type' contains what appears to be duplicates for items such as
+           'Invoice Fee', 'Invoice Discount', 'Invoice Finished Good Item' etc. +
+           These are NOT duplicates +
+           - one of these entries refers to the Sales Invoice +
+           - and the other refers to the Purchase Invoice. +
+           As the descriptions are exactly the same it is impossible to know which refers to which
+           so needs to be done using trial and error!
+
+== How do I add a payment term for 30 days?
+. Select 'Payment Net Days' from the 'Term Type Id' drop down box
+. Enter '30' in the 'Term Days' field
+. Press the 'Submit' button
+
+
+== How do I add a discount term of 2% if paid within 10 days?
+. Select 'Payment Discounted if paid with Specified Days' from the 'Term Type Id' drop down box
+. Enter '2' in the 'Term Value' field
+. Enter '10' in the 'Term Days' field
+. Press the 'Submit' button
+
+
+== How do I specify pricing in a specific currency only for thiscustomer or supplier?
+This is done using the 'Agreement Items' sub menu
+
+== How do I delete a payment term?
+. Locate the payment term required
+. Press the 'Remove'on the entry that needs to be removed
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc
new file mode 100644
index 0000000..1817b9d
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc
@@ -0,0 +1,35 @@
+////
+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 Agreement Work Effort Applications
+This screen is used to link a work effort to the whole agreement or an individual agreement item.
+
+== How do I add a work effort to an agreement?
+. Use the drop down box to select the 'Agreement Item Seq Id'
+. Use the lookup to select the 'Workeffort Id'
+. Press the 'Add' button
+. The new entry is displayed in the lower part of the screen
+
+
+== How do I update a work effort for an agreement?
+Work efforts can only be added or deleted.
+They cannot be updated
+
+== How do I delete a work effort from an agreement?
+. Press the 'Delete' button for the entry that needs to be deleted
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc
new file mode 100644
index 0000000..c4edac1
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc
@@ -0,0 +1,39 @@
+////
+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 Agreements
+The default screen is for the Agreements tab is 'Find Agreements'. It is used to locate existing agreements that have been created.
+The user has the option to
+
+* use the 'Find' button to locate an existing agreement or
+* create a new one by clicking on the 'Create Agreement' button.
+
+== How do I locate an existing agreement?
+. Enter search option details if known
+. Press the 'Find' button <<PARTY,party>>
+. A list of existing agreements will be displayed
+
+== How do I create a new agreement?
+. Press the 'Create Agreement' button
+. The 'Edit Agreement' screen is displayed
+. Enter the details required and press the 'Submit' button
+
+== How do I cancel an agreement?
+. Locate the agreement required
+. Press the 'Cancel' button on the agreement entry that needs to be cancelled
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementGeographicalApplic.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementGeographicalApplic.adoc
new file mode 100644
index 0000000..095b937
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementGeographicalApplic.adoc
@@ -0,0 +1,35 @@
+////
+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 Agreement Geo
+This screen is used to display a list of the geographical locations that are valid for the agreement item.
+
+== How do I create a new geographical location for an agreement item?
+. Press the 'New' button
+. The 'Edit Agreement Geographical Application' screen is displayed
+. Use the drop down box to select the 'Geo Id'
+. Press the 'Submit' button
+
+== How do I delete a geographical location for an agreement item?
+. Press the 'Delete' button for the entry that needs to be deleted
+
+== Help Edit Agreement Geo
+This screen is used to create a geographical location for an agreement item.
+
+NOTE: A new entry can be created or removed but not updated.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemParties.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemParties.adoc
new file mode 100644
index 0000000..ceac114
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemParties.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.
+////
+
+= The for Agreement Items Parties help screen
+This screen is used to display any parties that have been linked to this agreement item.
+
+== How do I create a party for an agreement item?
+. Press the 'New' button
+. The 'Edit Agreement Item Party' screen is displayed
+. Manually enter or use the lookup to select the 'Party Id'
+. Press the 'Submit' button
+
+
+== How do I remove a party for an agreement item?
+. Press the 'Delete' button for the entry that needs to be deleted.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc
new file mode 100644
index 0000000..e808400
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc
@@ -0,0 +1,41 @@
+////
+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 Agreement Item Products
+This screen is used to link a specific product or products to an agreement.
+This can be useful for restricting a discount or product pricing to a particular product (or range of products) for a specific customer.
+
+== How do I add a product to an agreement item?
+. Press the 'New Product' button
+. The 'Edit Agreement Item Product' screen is displayed
+. Manually enter or use the lookup to select the 'Product Id'
+. Enter the 'Price' to be associated to the product for this agreement item
+. Press the 'Submit' button
+
+== How do I update a product linked to an agreement item?
+. Select the product required by clicking on the 'Product Id'
+. The 'Edit Agreement Item Product' screen is displayed
+. Update the 'Price' for the product (NOTE: Only product price is available for update)
+. Press the 'Submit' button
+
+== How do I delete a product from an agreement item?
+. Press the 'Remove' button on the entry that needs to be deleted
+
+== Help Edit Agreement Item Product
+This screen is used to create or update a product entry for an agreement item.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc
new file mode 100644
index 0000000..60860e4
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc
@@ -0,0 +1,52 @@
+////
+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 Agreement Item Supplier Products
+This screen is used to link a specific product (or range of products) to an agreement.
+This can be useful for restricting a discount or product pricing to a product (or range of products) for a particular supplier.
+
+NOTE: Products created here will be linked to the product and can be view using Catalog Manager.
+Entries can be viewed under the Product 'Suppliers' and 'Agreements' tabs.
+
+== How do I add a product to an agreement item?
+. Press the 'New Product' button
+. The 'Edit Agreement Item Product' screen is displayed
+. Manually enter or use the lookup to select the 'Product Id'
+. Enter the 'Available From Date'
+. Leave the 'Thru Date' blank
+. Using the drop down box select the 'Supplier Order Pref Id'
+. Enter the 'Last Price'
+. Enter 'Supplier Product Id'
+. Enter any other details as required or leave blank
+. Press the 'Submit' button
+
+
+== How do I update a product linked to an agreement item?
+. Select the product required by clicking on the 'Product Id'
+. The 'Edit Agreement Item Product' screen is displayed
+. Update the details as required
+. Press the 'Submit' button
+
+
+== How do I delete a product from an agreement item?
+. Press the 'Remove' button on the entry that needs to be deleted
+
+== Help Edit Agreement Item Supplier Product
+This screen is used to create or update a product entry for a supplier agreement item.
+Any updates made in this screen can also be viewed in Catalog Manager for the product under the product 'Suppliers' and 'Agreements' tabs.
\ No newline at end of file
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc
new file mode 100644
index 0000000..d074859
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc
@@ -0,0 +1,37 @@
+////
+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 Agreements Item Terms
+This screen is used to enter or maintain terms that are specific to an agreement item.
+The terms available are the same as those found under the 'Agreement Terms' tab and any related terms will be displayed both here and under the 'Agreement Items' tab .
+
+== How do I create a term for an agreement item?
+. Press the 'Create Term' button
+. The 'Edit Agreement Item Term' screen is displayed
+. Enter the term details required
+. Press the 'Submit' button
+
+== How do I update a term for an agreement item?
+. Select the term for the agreement item by clicking on the term id
+. The 'Edit Agreement Item Term' screen is displayed
+. Update the details required
+. Press the 'Submit' button
+
+== How do I delete a term for an agreement item?
+. Press the 'Remove' button on the term entry that needs to be deleted.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.adoc
new file mode 100644
index 0000000..057a3f4
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.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 Agreements Item Promotions
+This screen is used to enter or maintain any promotions that are associated with the Agreement Item.
+This can be useful if you want to limit where a particular promotion is applied.
+Promotions are setup in Catalog Manager and can be selected here.
+
+== How do I add a promotion to an agreement item?
+. Press the 'Add New Promotion' button
+. The 'Edit Agreement Promo Applications' screen is displayed
+. Select the 'Product Promo Id' from the drop down box
+. Enter the 'From Date'
+. Enter the 'Thru Date' if required (NOTE:This can be left blank)
+. Enter the 'Sequence Num' if required
+. Press the 'Submit' button
+
+== How do I edit an existing promotion for an agreement item?
+. Select the agreement item promotion by clicking on on the promotion id
+. The 'Edit Agreement Promo Applications' screen is displayed
+. Update the details required
+. Press the 'Submit' button
+
+
+== How do I delete a promotion from an agreement item?
+. Press the 'Remove' button on the entry that needs to be deleted.
diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc
index ea30e47..4fe9d7e 100644
--- a/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc
@@ -67,3 +67,45 @@ payments into one large payment that is paid monthly.
 
 If you have installed OFBiz with the demo data then there are already two example
 Commission Agreements created for you.
+
+== Agreement management in User Interface
+include::HELP_FindAgreement.adoc[leveloffset=+2]
+
+include::HELP_EditAgreement.adoc[leveloffset=+2]
+
+=== Help Agreement Items List
+This screen is used to display a list of items that have been created for an agreement.
+
+include::HELP_EditAgreementItem.adoc[leveloffset=+2]
+
+include::HELP_ListAgreementItemParties.adoc[leveloffset=+2]
+
+=== Help Edit Agreement Item Party
+This screen is used to add or update a party linked to an agreement item.
+This could be useful for storing specific contact names associated with an agreement item.
+
+==== How do I update a party for an agreement item?
+Parties for an agreement item cannot be updated.
+They can only be added or removed.
+
+include::HELP_ListAgreementItemTerms.adoc[leveloffset=+2]
+
+=== Help Edit Agreement Item Term
+This screen is used to create or update the terms for an agreement item. +
+For more information about Agreement Term look at <<_help_edit_agreement_terms>>
+
+include::HELP_ListAgreementItemProducts.adoc[leveloffset=+2]
+
+include::HELP_ListAgreementItemSupplierProducts.adoc[leveloffset=+2]
+
+include::HELP_ListAgreementGeographicalApplic.adoc[leveloffset=+2]
+
+include::HELP_ListAgreementPromoAppls.adoc[leveloffset=+2]
+
+include::HELP_EditAgreementRoles.adoc[leveloffset=+2]
+
+include::HELP_EditAgreementTerms.adoc[leveloffset=+2]
+
+include::HELP_EditAgreementWorkEffortApplics.adoc[leveloffset=+2]
+
+include::HELP_EditAgreementContents.adoc[leveloffset=+2]