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:56 UTC
[ofbiz-framework] 05/12: Documented: Payments Docbook files
migration to asciidoc format (OFBIZ-10294)
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 508c5aaf9204b2643b78b2510c21e245b1a4668d
Author: holivier <ho...@apache.org>
AuthorDate: Wed Feb 12 16:18:45 2020 +0100
Documented: Payments Docbook files migration to asciidoc format
(OFBIZ-10294)
All the help files associated to it are called via include in the main
document
---
...LP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml | 49 ------------
.../HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml | 77 -------------------
.../data/helpdata/HELP_ACCOUNTING_editPayment.xml | 45 -----------
.../HELP_ACCOUNTING_editPaymentApplications.xml | 87 ---------------------
.../data/helpdata/HELP_ACCOUNTING_findPayments.xml | 73 ------------------
.../data/helpdata/HELP_ACCOUNTING_newPayment.xml | 89 ----------------------
.../helpdata/HELP_ACCOUNTING_paymentOverview.xml | 48 ------------
.../data/helpdata/HELP_ACCOUNTING_payments.xml | 30 --------
.../HELP_FindPurchaseInvoicesByDueDate.adoc | 39 ++++++++++
.../_include/HELP_FindSalesInvoicesByDueDate.adoc | 59 ++++++++++++++
.../docs/asciidoc/_include/HELP_editPayment.adoc | 34 +++++++++
.../_include/HELP_editPaymentApplications.adoc | 67 ++++++++++++++++
.../docs/asciidoc/_include/HELP_findPayments.adoc | 49 ++++++++++++
.../docs/asciidoc/_include/HELP_newPayment.adoc | 70 +++++++++++++++++
.../asciidoc/_include/HELP_paymentOverview.adoc | 37 +++++++++
.../acc-payments.adoc} | 27 ++++---
.../accounting/src/docs/asciidoc/accounting.adoc | 2 +
17 files changed, 372 insertions(+), 510 deletions(-)
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml
deleted file mode 100644
index e895ead..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.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 Find Purchase Invoices By Due Date help screen.
- </title>
- <para>This screen allows the user to search for and locate Purchase
- Invoices based on their due date. The 'Due Date' can be defined as the
- last possible date that payments can be received for the invoice
- without triggering any late payment penalties. The 'Invoice Date' can
- be defined as the date that the invoice was created and this is
- normally based on when products were received or services were
- provided.</para>
- <para>NOTE TO CHECK: See if the same bug that exists with Sales
- Invoices is here too.</para>
- <para>A Purchase Invoice may be due to be paid immediately or you may
- be given a 'grace period' after which the invoice is due.</para>
- <section>
- <title>How do I find Purchase Invoices by Due Date?</title>
- <orderedlist>
- <listitem><para>Press the 'Find Purchase Invoices by Due Date' button</para></listitem>
- <listitem><para>The Find Purchase Invoices by Due Date screen is displayed
- </para></listitem>
- <listitem><para>Enter the 'Organization Party Id' (eg. Normally this will be
- Company)</para></listitem>
- <listitem><para>Enter the 'Party Id' that the Purchase Invoice (eg. Normally
- this will be the Supplier Party Id)</para></listitem>
- <listitem><para>Enter a number in the 'Days Offset' field that represents the
- number of in which the invoice will become due (eg If an invoice is
- due to be paid in 5 days then enter 5 or greater)</para></listitem>
- <listitem><para>Press the 'Select' button</para></listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml
deleted file mode 100644
index 0521b69..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml
+++ /dev/null
@@ -1,77 +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 Sales Invoices By Due Date help screen.
- </title>
- <para>This screen allows the user to search for and locate Sales
- Invoices based on their due date. The 'Due Date' can be defined as the
- last possible date that payments can be received for the invoice
- without triggering late payment penalties. The 'Invoice Date' can be
- defined as the date that the invoice was created and this is normally
- based on when products were shipped or services were provided.</para>
-
- <para>NOTE TO CHECK: There appears to be a minor bug here as if the
- Invoice 'Due Date' is different to the Invoice Date (eg. Invoice
- Creation Date) then the Invoice Date is used as the Due Date in this
- screen which I dont think is correct......</para>
-
- <para>A Sales Invoice may be due to be paid immediately or as in some
- cases the customer is given a 'grace period' after which the invoice
- is generated and becomes due. Examples of this include only generating
- a customer invoice after a certain amount of time after the dispatch
- of their order. (NOTE: There are several ways this can be achieved in
- OFBiz including the use of agreements and billing accounts).
- </para>
- <para>This screen can be used to locate Sales Invoices as follows:
- </para><itemizedlist>
- <listitem><para>That will become due within a fixed timeframe (eg the next 5
- days)</para></listitem>
- <listitem><para>That may already be overdue</para></listitem>
- <listitem><para>That have been automatically generated by the system (eg as a
- result of Agreements based on payment in 30 days etc....TO CHECK)
- </para></listitem>
- </itemizedlist>
- <para>NOTE: See details from Jacopo below regarding future work
- regarding Find Sales Invoice by Due Date and Find Purchase Invoice by
- Due Date functionality:</para>
-
- <para>* The two links are used to search invoices' due dates for
- payments - there are plans to add links to quickly create payments for
- them etc. So they are somewhat in the middle between an invoice thing
- and a payment thing. By the way, for now I will close this issue
- because
- the best spot to place them is in the AR and AP applications,
- but there
- is still a lot of work to do to make them usable. </para>
- <section>
- <title>How do I find a Sales Invoice by Due Date?</title>
- <orderedlist>
- <listitem><para>Press the 'Find Sales Invoices by Due Date' button</para></listitem>
- <listitem><para>The Find Sales Invoices by Due Date screen is displayed</para></listitem>
- <listitem><para>Enter the 'Organization Party Id' (eg. Normally this will be
- Company)</para></listitem>
- <listitem><para>Enter the 'Party Id' that the Sales Invoice (eg. Normally this
- will be the Customer Party Id)</para></listitem>
- <listitem><para>Enter a number in the 'Days Offset' field that represents the
- number of in which the invoice will become due (eg If an invoice is
- due to be paid in 5 days then enter 5 or greater)</para></listitem>
- <listitem><para>Press the 'Select' button</para></listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml
deleted file mode 100644
index 78e617c..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Payment Header help screen.</title>
- <para>The Header screen displays the header details for the payment
- transaction and allows all fields to be updated if required. </para>
-
- <para>The following options are currently available from this screen:
- </para><itemizedlist>
- <listitem><para>Create New (Create a new payment)</para></listitem>
- <listitem><para>Status to 'Received' (Change the status of the current payment
- to 'Received. NOTE: This will create the relevant accounting
- transactions and post them to the general ledger)</para></listitem>
- <listitem><para>Status to 'Cancelled' (Change the status of the current payment
- to 'Cancelled')</para></listitem>
- <listitem><para>Status to 'Confirmed' (Change the status of the current invoice
- to 'Confirmed'. NOTE: This status option will not appear until the
- status has been changed to 'Received')</para></listitem>
- </itemizedlist>
- <section>
- <title>How do I update the header details for a Payment?</title>
- <orderedlist>
- <listitem><para>Select the 'Header' sub menu and the header details of the
- payment will be displayed</para></listitem>
- <listitem><para>Update the fields required</para></listitem>
- <listitem><para>Press the 'Update' button</para></listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml
deleted file mode 100644
index f7e701b..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.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 Payment Applications help screen.</title>
- <para>The Payments Applications sub menu is where payments that have
- been made (or received) can be linked or allocated to an invoice,
- another payment, a billing account or a tax authority.</para>
- <para>NOTE: General Ledger accounting transactions are generated during
- the payment application process but unless your GL is setup with
- Unapplied Cash and Applied Cash accounts - I'm not sure that there will
- be any true accounting impact. In the Sales Order process the
- accounting transaction generated the following GL Accounting
- transaction is generated for 'Payment Applied'</para>
- <para>The following options are currently available from this screen:
- </para><itemizedlist>
- <listitem><para>Create New (Create a new payment)</para></listitem>
- <listitem><para>Status to 'Received' (Change the status of the current payment
- to 'Received. NOTE: This will create the relevant accounting
- transactions and post them to the general ledger)</para></listitem>
- <listitem><para>Status to 'Cancelled' (Change the status of the current payment
- to 'Cancelled')</para></listitem>
- <listitem><para>Status to 'Confirmed' (Change the status of the current
- invoice to 'Confirmed'. NOTE: This status option will not appear until
- the status has been changed to 'Received')
- </para></listitem>
- </itemizedlist>
- <section>
- <title>How do I apply a payment to an invoice?</title>
- <orderedlist>
- <listitem><para>Select the 'Applications' sub menu for the payment</para></listitem>
- <listitem><para>A list of invoices will be displayed in the 'Possible Invoices
- to Apply' box (NOTE: If no open invoices exist for the party that is
- sending the payment then this may not list any invoices)</para></listitem>
- <listitem><para>Press the 'Apply' button next to the invoice (or invoices) that
- this payment is for</para></listitem>
- </orderedlist>
- <para>NOTE: Although it can be overriden the 'Amount to Apply' field
- will default to the lesser of the invoice total or the payment
- amount. This can be shown by examples as follows:</para>
- <para>* If a payment of $150 is received but the invoice total is $120
- then the 'Amount to Apply' will default to $120</para>
- <para>* If a payment of $150 is received but the invoice total is $170
- then the 'Amount to Apply' will default to $150
- </para>
- </section>
- <section>
- <title>How do I apply a payment to an invoice, tax authority, billing
- account or another payment?</title>
- <orderedlist>
- <listitem><para>Select the 'Applications' sub menu for the payment</para></listitem>
- <listitem><para>Using the 'Apply this payment to' box at the bottom of the
- screen</para></listitem>
- <listitem><para>Enter or use the lookup to enter the 'Invoice Id' to apply the
- payment to (NOTE: This can be used if the invoice is to another party
- eg ordered by a subsidiary but paid for by another company of the
- same group)</para></listitem>
- <listitem><para>Enter or use the lookup to enter the 'To Payment Id' to apply
- the payment to if required (NOTE TO CHECK: How does this work....?)
- </para></listitem>
- <listitem><para>Enter or use the lookup to enter the 'Billing Account Id' to
- apply the payment to if required</para></listitem>
- <listitem><para>Enter or use the drop down box to select the 'Tax Auth Geo Id'
- to apply the payment to if required (NOTE TO CHECK: This is a country
- so need to test how this actually works......)</para></listitem>
- <listitem><para>Enter an amount in the 'Amount to Apply' (NOTE: This must be
- less than or equal to the payment amount)</para></listitem>
- <listitem><para>Press the 'Apply' button
- </para></listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml
deleted file mode 100644
index aea05b4..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml
+++ /dev/null
@@ -1,73 +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 Payments help screen.</title>
- <para>The default screen is 'Find Payment' which allows the user to
- search for and view the details related to a payment transaction.
- Specific search criteria can be entered as a filter to locate the
- payment quickly. </para>
- <para>
- Payments can be incoming or outgoing and the demo data contains a
- list of payment type descriptions that describe the reason for the
- payment in more detail (eg Customer Deposit, Tax Payment, Commission
- Payment etc).
- </para>
- <para>This screen is used to locate existing payments that have been
- created
- automatically by the system or manually by the user. There are
- links
- from this page that can be used to do the following: </para>
- <itemizedlist>
- <listitem><para>Create a new incoming or outgoing payment
- </para></listitem>
- <listitem><para>Find Sales Invoices by due date
- </para></listitem>
- <listitem><para>Find Purchase Invoices by due date </para></listitem>
- </itemizedlist>
- <section>
- <title>How do I view all payments?</title>
- <orderedlist>
- <listitem><para>Press the 'Search' button to view all payments</para></listitem>
- </orderedlist>
- </section>
- <section>
- <title>How do I locate an existing payment?</title>
- <orderedlist>
- <listitem><para>Enter the 'Payment ID' if known</para></listitem>
- <listitem><para>Enter a word from the payments 'Comment'field if known</para></listitem>
- <listitem><para>Enter the 'Payment Type Id' if known</para></listitem>
- <listitem><para>Enter the 'From Party Id' if known (NOTE: In most cases for an
- incoming payment this will be the customer party id)</para></listitem>
- <listitem><para>Enter the payment amount in the 'Amount' field if known</para></listitem>
- <listitem><para>Enter some details from the payment reference number in the
- 'Reference No' field if known
- </para></listitem>
- <listitem><para>Enter the status of the payment in the 'Status Id' field if
- known</para></listitem>
- <listitem><para>Enter the 'To Party Id' if known (NOTE: In most cases for an
- incoming payment this will the the customer party id. For outgoing
- payments this will be the supplier id, or customer id for a refund)
- </para></listitem>
- <listitem><para>Press the 'Search' button to view all payments</para></listitem>
- <listitem><para>All payments that meet the search criteria will be displayed.
- </para></listitem>
- </orderedlist>
- </section>
-
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml
deleted file mode 100644
index 57c1a1e..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml
+++ /dev/null
@@ -1,89 +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 New Payment help screen.</title>
- <para>This screen is used to create a new payment. Payments can be
- incoming (eg from a customer) or outgoing (eg to a supplier). Payment
- types are used to describe what the payments are used for in the
- system.</para>
- <para>Examples of incoming payment types are as follows:</para>
- <itemizedlist>
- <listitem><para>Customer Deposit</para></listitem>
- <listitem><para>Customer Payment</para></listitem>
- <listitem><para>Interest In</para></listitem>
- </itemizedlist>
- <para>Examples of outgoing payment types are as follows:</para>
- <itemizedlist>
- <listitem><para>Commission Payment</para></listitem>
- <listitem><para>Pay Check</para></listitem>
- <listitem><para>Income Tax Payment</para></listitem>
- <listitem><para>Vendor Payment</para></listitem>
- </itemizedlist>
- <section>
- <title>How do I create a new incoming payment?</title>
- <orderedlist>
- <listitem><para>Press the 'Create New Payment' button</para></listitem>
- <listitem><para>The New Incoming Payment / New Outgoing Payment screen is
- displayed</para></listitem>
- <listitem><para>Leave 'Organization Party Id' with its default of 'Company'
- </para></listitem>
- <listitem><para>
- Select the 'Payment Type Id' from the drop down box (NOTE: This
- is currently limited to the following: Customer Deposit, Customer
- Payment, Interest In and Gift Certificate Deposit)
- </para></listitem>
- <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem>
- <listitem><para>Enter or use the lookup to find the 'From Party Id'</para></listitem>
- <listitem><para>Select the 'Payment Method Type' from the drop down box (eg how
- the payment was paid - cash, cheque, money order etc)</para></listitem>
- <listitem><para>Leave the 'Currency' field with its default of 'USD' (NOTE: This
- default comes from Company)</para></listitem>
- <listitem><para>Press the 'Create' button</para></listitem>
- <listitem><para>The payment header is created and the default header
- screen will be displayed subsection content</para></listitem>
- </orderedlist>
- <para>NOTE: Need to understand what happens if customer pays in a
- currency that is not the company default.... if the exchange rate is
- specified then I think it should convert the currency to the default
- currency for accounting purposes.... need to investigate and test.
- </para>
- </section>
- <section>
- <title>How do I create a new outgoing payment?</title>
- <orderedlist>
- <listitem><para>Press the 'Create New Payment' button</para></listitem>
- <listitem><para>The New Incoming Payment / New Outgoing Payment screen is
- displayed</para></listitem>
- <listitem><para>Leave 'Organization Party Id' with its default of 'Company'
- </para></listitem>
- <listitem><para>Select the 'Payment Type Id' from the drop down box (NOTE: This
- is currently limited to 11 entries including Commission Payment,
- Customer Refund, Vendor Payment, Income Tax Payment)</para></listitem>
- <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem>
- <listitem><para>Enter or use the lookup to find the 'To Party Id'</para></listitem>
- <listitem><para>Select the 'Payment Method Type' from the drop down box (eg how
- the payment is to be paid - cash, cheque, money order etc)</para></listitem>
- <listitem><para>Leave the 'Currency' field with its default of 'USD' (NOTE: This
- default comes from Company)</para></listitem>
- <listitem><para>Press the 'Create' button</para></listitem>
- <listitem><para>The payment header is created and the default header screen will
- be displayed subsection content</para></listitem>
- </orderedlist>
- </section>
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml
deleted file mode 100644
index c4960ac..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.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 Payment Overview help screen.</title>
- <para>The Payments Overview screen displays the summary details of the
- payment. On one side it shows information related to the payment
- transaction header (eg Payment Type, Status, Amount, Effective Date
- etc) and the other it shows if the payment has been applied (or
- matched) to an invoice or billing account etc.</para>
- <para>The following options are currently available from this screen:
- </para>
- <itemizedlist>
- <listitem><para>Create New (Create a new payment)</para></listitem>
- <listitem><para>Status to 'Received' (Change the status of the current payment
- to 'Received. NOTE: This will create the relevant accounting
- transactions and post them to the general ledger)</para></listitem>
- <listitem><para>Status to 'Cancelled' (Change the status of the current payment
- to 'Cancelled')</para></listitem>
- <listitem><para>Status to 'Confirmed' (Change the status of the current invoice
- to 'Confirmed'. NOTE: This status option will not appear until the
- status has been changed to 'Received')</para></listitem>
- </itemizedlist>
-
- <para>NOTE: The general ledger transactions generated as a result of
- the payment are based on the GL Account Type defaults for Company as
- follows:</para>
- <itemizedlist>
- <listitem><para>Debit Entry (GL Account Type defaults)</para></listitem>
- <listitem><para>Credit Entry (Payment Method Id / GL Account Id)</para></listitem>
- </itemizedlist>
-
-</section>
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
deleted file mode 100644
index 8cb64b4..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
+++ /dev/null
@@ -1,30 +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>Payments.</title>
- <para>Payments are transactions that received by or generated by a business. They can be incoming or outgoing. Incoming payments are normally from customers and outgoing ones to suppliers. </para>
- <xi:include href="HELP_ACCOUNTING_findPayments.xml" />
- <xi:include href="HELP_ACCOUNTING_newPayment.xml" />
- <xi:include href="HELP_ACCOUNTING_paymentOverview.xml" />
- <xi:include href="HELP_ACCOUNTING_editPaymentApplications.xml" />
- <xi:include href="HELP_ACCOUNTING_editPayment.xml" />
- <xi:include href="HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml" />
- <xi:include href="HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml" />
-
-</section>
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.adoc
new file mode 100644
index 0000000..b416a95
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.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 Purchase Invoices By Due Date
+This screen allows the user to search for and locate Purchase Invoices based on their due date.
+
+The 'Due Date' can be defined as the last possible date that payments can be received for the invoice without triggering any
+late payment penalties.
+
+The 'Invoice Date' can be defined as the date that the invoice was created and this is normally based on when products were
+received or services were provided.
+
+NOTE: TO CHECK: See if the same bug that exists with Sales Invoices is here too.
+
+A Purchase Invoice may be due to be paid immediately or you may be given a 'grace period' after which the invoice is due.
+
+== How do I find Purchase Invoices by Due Date?
+. Press the 'Find Purchase Invoices by Due Date' button
+. The Find Purchase Invoices by Due Date screen is displayed
+. Enter the 'Organization Party Id' (eg. Normally this will be Company)
+. Enter the 'Party Id' that the Purchase Invoice (eg. Normally this will be the Supplier Party Id)
+. Enter a number in the 'Days Offset' field that represents the number of in which the invoice will become due +
+ (eg If an invoice is due to be paid in 5 days then enter 5 or greater)
+. Press the 'Select' button
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc
new file mode 100644
index 0000000..13bfff2
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc
@@ -0,0 +1,59 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+= Help for Find Sales Invoices By Due Date
+This screen allows the user to search for and locate Sales Invoices based on their due date.
+
+The 'Due Date' can be defined as the last possible date that payments can be received for the invoice without triggering
+late payment penalties.
+
+The 'Invoice Date' can be defined as the date that the invoice was created and this is normally based on when products
+were shipped or services were provided.
+
+NOTE: TO CHECK: There appears to be a minor bug here as if the Invoice 'Due Date' is different to the Invoice Date (eg.
+ Invoice Creation Date) then the Invoice Date is used as the Due Date in this screen which I dont think is correct......
+
+A Sales Invoice may be due to be paid immediately or as in some cases the customer is given a 'grace period' after which
+the invoice is generated and becomes due.
+
+Examples of this include only generating a customer invoice after a certain amount of time after the dispatch of their order. +
+(NOTE: There are several ways this can be achieved in OFBiz including the use of agreements and billing accounts).
+
+This screen can be used to locate Sales Invoices as follows:
+
+* That will become due within a fixed timeframe (eg the next 5 days)
+* That may already be overdue
+* That have been automatically generated by the system +
+ (eg as a result of Agreements based on payment in 30 days etc....TO CHECK)
+
+NOTE: TO CHECK See details from Jacopo below regarding future work regarding Find Sales Invoice by Due Date and
+ Find Purchase Invoice by Due Date functionality: +
+ - The two links are used to search invoices' due dates for payments - there are plans to add links to quickly
+ create payments for them etc. +
+ - So they are somewhat in the middle between an invoice thing and a payment thing. +
+ - By the way, for now I will close this issue because the best spot to place them is in the AR and AP applications,
+ but there is still a lot of work to do to make them usable.
+
+== How do I find a Sales Invoice by Due Date?
+. Press the 'Find Sales Invoices by Due Date' button
+. The Find Sales Invoices by Due Date screen is displayed
+. Enter the 'Organization Party Id' (eg. Normally this will be Company)
+. Enter the 'Party Id' that the Sales Invoice (eg. Normally this will be the Customer Party Id)
+. Enter a number in the 'Days Offset' field that represents the number of in which the invoice will become due +
+ (eg If an invoice is due to be paid in 5 days then enter 5 or greater)
+. Press the 'Select' button
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc
new file mode 100644
index 0000000..4cf19a6
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc
@@ -0,0 +1,34 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+= Help for Payment Header
+The Header screen displays the header details for the payment transaction and allows all fields to be updated if required.
+
+The following options are currently available from this screen:
+
+* Create New (Create a new payment)
+* Status to 'Received' (Change the status of the current payment to 'Received. +
+ NOTE: This will create the relevant accounting transactions and post them to the general ledger)
+* Status to 'Cancelled' (Change the status of the current payment to 'Cancelled')
+* Status to 'Confirmed' (Change the status of the current invoice to 'Confirmed'. +
+ NOTE: This status option will not appear until the status has been changed to 'Received')
+
+== How do I update the header details for a Payment?
+. Select the 'Header' sub menu and the header details of the payment will be displayed
+. Update the fields required
+. Press the 'Update' button
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc
new file mode 100644
index 0000000..83dc5ba
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc
@@ -0,0 +1,67 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+= Help for Payment Applications
+The Payments Applications sub menu is where payments that have been made (or received) can be linked or allocated to an invoice,
+another payment, a billing account or a tax authority.
+
+NOTE: General Ledger accounting transactions are generated during the payment application process but unless your GL is setup
+ with Unapplied Cash and Applied Cash accounts +
+ TO CHECK I'm not sure that there will be any true accounting impact.
+
+In the Sales Order process the accounting transaction generated the following GL Accounting transaction is generated for
+'Payment Applied'
+
+The following options are currently available from this screen:
+
+* Create New (Create a new payment)
+* Status to 'Received' (Change the status of the current payment to 'Received. +
+ NOTE: This will create the relevant accounting transactions and post them to the general ledger)
+* Status to 'Cancelled' (Change the status of the current payment to 'Cancelled')
+* Status to 'Confirmed' (Change the status of the current invoice to 'Confirmed'. +
+ NOTE: This status option will not appear until the status has been changed to 'Received')
+
+
+== How do I apply a payment to an invoice?
+. Select the 'Applications' sub menu for the payment
+. A list of invoices will be displayed in the 'Possible Invoices to Apply' box +
+ (NOTE: If no open invoices exist for the party that is sending the payment then this may not list any invoices)
+. Press the 'Apply' button next to the invoice (or invoices) that this payment is for
+
+NOTE: Although it can be overriden the 'Amount to Apply' field will default to the lesser of the invoice total or
+ the payment amount.
+
+This can be shown by examples as follows:
+
+* If a payment of $150 is received but the invoice total is $120 then the 'Amount to Apply' will default to $120
+* If a payment of $150 is received but the invoice total is $170 then the 'Amount to Apply' will default to $150
+
+== How do I apply a payment to an invoice, tax authority, billingaccount or another payment?
+. Select the 'Applications' sub menu for the payment
+. Using the 'Apply this payment to' box at the bottom of the screen
+. Enter or use the lookup to enter the 'Invoice Id' to apply the payment to +
+ (NOTE: This can be used if the invoice is to another party eg ordered by a subsidiary but paid for by another company of
+ the same group)
+. Enter or use the lookup to enter the 'To Payment Id' to apply the payment to if required +
+ (NOTE TO CHECK: How does this work....?)
+. Enter or use the lookup to enter the 'Billing Account Id' to apply the payment to if required
+. Enter or use the drop down box to select the 'Tax Auth Geo Id' to apply the payment to if required +
+ (NOTE TO CHECK: This is a country so need to test how this actually works......)
+. Enter an amount in the 'Amount to Apply' +
+ (NOTE: This must be less than or equal to the payment amount)
+. Press the 'Apply' button
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.adoc
new file mode 100644
index 0000000..b098288
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.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 Find Payments
+The default screen is 'Find Payment' which allows the user to search for and view the details related to a payment transaction.
+Specific search criteria can be entered as a filter to locate the payment quickly.
+
+Payments can be incoming or outgoing and the demo data contains a list of payment type descriptions that describe the reason
+for the payment in more detail (eg Customer Deposit, Tax Payment, Commission Payment etc).
+
+This screen is used to locate existing payments that have been created automatically by the system or manually by the user.
+There are links from this page that can be used to do the following:
+
+* Create a new incoming or outgoing payment
+* Find Sales Invoices by due date
+* Find Purchase Invoices by due date
+
+== How do I view all payments?
+. Press the 'Search' button to view all payments
+
+
+== How do I locate an existing payment?
+. Enter the 'Payment ID' if known
+. Enter a word from the payments 'Comment'field if known
+. Enter the 'Payment Type Id' if known
+. Enter the 'From Party Id' if known +
+ (NOTE: In most cases for an incoming payment this will be the customer party id)
+. Enter the payment amount in the 'Amount' field if known
+. Enter some details from the payment reference number in the 'Reference No' field if known
+. Enter the status of the payment in the 'Status Id' field if known
+. Enter the 'To Party Id' if known +
+ (NOTE: In most cases for an incoming payment this will the the customer party id. For outgoing payments this will be the supplier id, or customer id for a refund)
+. Press the 'Search' button to view all payments
+. All payments that meet the search criteria will be displayed.
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc
new file mode 100644
index 0000000..541e9ca
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc
@@ -0,0 +1,70 @@
+////
+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 New Payment
+This screen is used to create a new payment.
+Payments can be incoming (eg from a customer) or outgoing (eg to a supplier).
+Payment types are used to describe what the payments are used for in the system.
+
+Examples of incoming payment types are as follows:
+
+* Customer Deposit
+* Customer Payment
+* Interest In
+
+Examples of outgoing payment types are as follows:
+
+* Commission Payment
+* Pay Check
+* Income Tax Payment
+* Vendor Payment
+
+
+== How do I create a new incoming payment?
+. Press the 'Create New Payment' button
+. The New Incoming Payment / New Outgoing Payment screen is displayed
+. Leave 'Organization Party Id' with its default of 'Company'
+. Select the 'Payment Type Id' from the drop down box +
+ (NOTE: This is currently limited to the following: Customer Deposit, Customer Payment, Interest In and Gift Certificate Deposit)
+. Enter the payment amount in the 'Amount' field
+. Enter or use the lookup to find the 'From Party Id'
+. Select the 'Payment Method Type' from the drop down box (eg how the payment was paid - cash, cheque, money order etc)
+. Leave the 'Currency' field with its default of 'USD' +
+ (NOTE: This default comes from Company)
+. Press the 'Create' button
+. The payment header is created and the default header screen will be displayed subsection content
+
+NOTE: TO CHECK Need to understand what happens if customer pays in a currency that is not the company default.... +
+ if the exchange rate is specified then I think it should convert the currency to the default currency for accounting purposes.... +
+ need to investigate and test.
+
+== How do I create a new outgoing payment?
+. Press the 'Create New Payment' button
+. The New Incoming Payment / New Outgoing Payment screen is displayed
+. Leave 'Organization Party Id' with its default of 'Company'
+. Select the 'Payment Type Id' from the drop down box +
+ (NOTE: This is currently limited to 11 entries including Commission Payment, Customer Refund, Vendor Payment, Income Tax Payment)
+. Enter the payment amount in the 'Amount' field
+. Enter or use the lookup to find the 'To Party Id'
+. Select the 'Payment Method Type' from the drop down box +
+ (eg how the payment is to be paid - cash, cheque, money order etc)
+. Leave the 'Currency' field with its default of 'USD' +
+ (NOTE: This default comes from Company)
+. Press the 'Create' button
+. The payment header is created and the default header screen will be displayed subsection content
diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.adoc
new file mode 100644
index 0000000..8a2e072
--- /dev/null
+++ b/applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.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 Payment Overview
+The Payments Overview screen displays the summary details of the payment.
+
+On one side it shows information related to the payment transaction header (eg Payment Type, Status, Amount, Effective Date etc)
+and the other it shows if the payment has been applied (or matched) to an invoice or billing account etc.
+
+The following options are currently available from this screen:
+
+* Create New (Create a new payment)
+* Status to 'Received' (Change the status of the current payment to 'Received. +
+ NOTE: This will create the relevant accounting transactions and post them to the general ledger)
+* Status to 'Cancelled' (Change the status of the current payment to 'Cancelled')
+* Status to 'Confirmed' (Change the status of the current invoice to 'Confirmed'. +
+ NOTE: This status option will not appear until the status has been changed to 'Received')
+
+NOTE: The general ledger transactions generated as a result of the payment are based on the GL Account Type defaults for Company
+ as follows: +
+ 1) Debit Entry (GL Account Type defaults) +
+ 2) Credit Entry (Payment Method Id / GL Account Id)
diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-payments.adoc
similarity index 50%
copy from applications/accounting/src/docs/asciidoc/accounting.adoc
copy to applications/accounting/src/docs/asciidoc/_include/acc-payments.adoc
index 71b493b..d610575 100644
--- a/applications/accounting/src/docs/asciidoc/accounting.adoc
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-payments.adoc
@@ -16,22 +16,25 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
////
-= Accounting
+= Payments.
-The OFBiz accounting system is a core application component and has most of the
-modern features you would expect in a general purpose double-entry accounting
-system. However, OFBiz goes beyond that by and seamlessly integrates with other
-OFBiz applications such as Inventory, Purchasing and Manufacturing to give your
-business a complete ERP solution. This makes the system as a whole robust and
-integrated to provide more value than a plain accounting system.
+Payments are transactions that received by or generated by a business.
+They can be incoming or outgoing.
-include::_include/acc-intro.adoc[leveloffset=+1]
+Incoming payments are normally from customers and outgoing ones to suppliers.
-include::_include/acc-invoices.adoc[leveloffset=+1]
+== Payments management in User Interface
+include::HELP_findPayments.adoc[leveloffset=+2]
-include::_include/acc-agreements.adoc[leveloffset=+1]
+include::HELP_newPayment.adoc[leveloffset=+2]
-include::_include/acc-financial-accounts.adoc[leveloffset=+1]
+include::HELP_paymentOverview.adoc[leveloffset=+2]
-include::_include/acc-global-settings.adoc[leveloffset=+1]
+include::HELP_editPaymentApplications.adoc[leveloffset=+2]
+
+include::HELP_editPayment.adoc[leveloffset=+2]
+
+include::HELP_FindSalesInvoicesByDueDate.adoc[leveloffset=+2]
+
+include::HELP_FindPurchaseInvoicesByDueDate.adoc[leveloffset=+2]
diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc
index 71b493b..433df93 100644
--- a/applications/accounting/src/docs/asciidoc/accounting.adoc
+++ b/applications/accounting/src/docs/asciidoc/accounting.adoc
@@ -30,6 +30,8 @@ include::_include/acc-intro.adoc[leveloffset=+1]
include::_include/acc-invoices.adoc[leveloffset=+1]
+include::_include/acc-payments.adoc[leveloffset=+1]
+
include::_include/acc-agreements.adoc[leveloffset=+1]
include::_include/acc-financial-accounts.adoc[leveloffset=+1]