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 7e3268e849b48fe7de559ad98d769d4f2eb6a043
Author: holivier <holiv...@apache.org>
AuthorDate: Thu Feb 13 18:01:17 2020 +0100
Documented: Add help for main accounting screen at the end of intro
(OFBIZ-10289)
---
.../data/helpdata/HELP_ACCOUNTING_main.xml | 31 ----------------------
.../src/docs/asciidoc/_include/acc-intro.adoc | 23 ++++++++++------
2 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml
b/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml
deleted file mode 100644
index ad83ee7..0000000
--- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink";
- xmlns:xi="http://www.w3.org/2001/XInclude";
- xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook";>
- <title>The Accounting Main screen.</title>
- <para>
- This is the default tab for the Accounting Manager application. The
screen currently shows links that will display more detailed screens
- related to Agreements, Billing Accounts, Invoices and Payments.
- </para>
-</section>
-
diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc
b/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc
index 0d93c60..95f9816 100644
--- a/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc
@@ -19,23 +19,23 @@ under the License.
= About Accounting
The Accounting system is organised according to generally accepted principles
-such as double-entry accounting, a General Ledger with hierarchical accounts,
+such as double-entry accounting, a General Ledger with hierarchical accounts,
journals and posting of transactions and corresponding entries.
-The structure is primary based on the OMG GL standard and the work that was
done
+The structure is primary based on the OMG GL standard and the work that was
done
on an AR/AP extension of the OMG GL standard. This correlates well with other
standards such as ebXML and OAGIS.
The Accounting entities are structured such that accounts for multiple
-organisations can be managed. The multiple organisations could be multiple
+organisations can be managed. The multiple organisations could be multiple
companies, or departments or other organisations within a company. Each
organisation can have various GL Accounts associated with it so that it can
operate with its own subset of the Master Chart of Accounts.
Each organisation can also have its own set of Journals for flexibility, even
-though the use of Journals should be as minimal as possible in favour of
allowing
-the system to automatically create and post transactions based on business
events
-triggered by standard procedures and documents such as purchase and sales
orders,
+though the use of Journals should be as minimal as possible in favour of
allowing
+the system to automatically create and post transactions based on business
events
+triggered by standard procedures and documents such as purchase and sales
orders,
invoices, inventory transfers, payments, receipts, and so on.
== Accounting Features
@@ -43,10 +43,17 @@ invoices, inventory transfers, payments, receipts, and so
on.
* General Ledger
* Accounts Receivable
* Accounts Payable
- * Agreements
+ * Agreements
* Multi-currency Support
* Billing Accounts
* Fixed Asset Accounting
-OFBiz accounting can be configured to handle multiple organisations including
+OFBiz accounting can be configured to handle multiple organisations including
an unlimited number of companies, subsidiaries and departments.
+
+=== Help for Accounting Main screen
+This is the default tab for the Accounting Manager application.
+The screen currently shows links that will display more detailed screens
+related to Agreements, Billing Accounts, Invoices and Payments.
+
+With accounting application mmenu, it's possible to have a lot of more details
