[ofbiz-framework] branch trunk updated: Documented: migrated Wiki Glossary to glossary asciidoc files (OFBIZ-12060)

[holivier]

This is an automated email from the ASF dual-hosted git repository.

holivier pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new c2c1eae  Documented: migrated Wiki Glossary to glossary asciidoc files (OFBIZ-12060)
c2c1eae is described below

commit c2c1eae612932fe54f9dbc3040c108f21e920c41
Author: holivier <[hidden email]>
AuthorDate: Tue Nov 17 18:13:07 2020 +0100

    Documented: migrated Wiki Glossary to glossary asciidoc files (OFBIZ-12060)
   
    - Accounting Glossary,
      - declare it as glossary
      - re-order existing items
      - add a comment at beginning about importance of order items
      - correction for some ID: change space to _
      - add some items coming from wiki glossary
    - Facility
      - add glossary directly in facility.adoc
    - Human Resource Glossary
      - re-order existing items
      - add a comment at beginning about importance of order items
      - move some items to Party Glossary or global Glossary
    - HR appendix: add link to wiki OFBiz related book for Data Model Reference Book
    - Add Party Glossary and included it in party.adoc
      - add some items coming from wiki glossary and HR glossary
    - General Glossary
      - add a comment at beginning about importance of order items
      - add some items coming from wiki glossary and HR glossary
---
 .../src/docs/asciidoc/_include/acc-glossary.adoc   | 241 +++++++++++++++------
 .../src/docs/asciidoc/_include/hr-appendix.adoc    |   4 +-
 .../src/docs/asciidoc/_include/hr-glossary.adoc    |  80 +++----
 .../humanres/src/docs/asciidoc/humanres.adoc       |   4 +-
 .../src/docs/asciidoc/_include/party-glossary.adoc |  51 +++++
 applications/party/src/docs/asciidoc/party.adoc    |   4 +-
 .../product/src/docs/asciidoc/facility.adoc        |  12 +
 docs/asciidoc/_include/ofbiz-glossary.adoc         |  61 +++++-
 8 files changed, 332 insertions(+), 125 deletions(-)

diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc
index 9c9f68e..538f63e 100644
--- a/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc
+++ b/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc
@@ -16,101 +16,144 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 ////
+[glossary]
 = Accounting Glossary
 
-[#ANNUAL_REVENUE]
-Annual Revenue::
-Annual revenue is the amount of revenue for a group that is reported in the Party
-Group Information screenlet of the groups profile (visit Party Profile screen).
+[comment]
+It's important to sort glossary entries in alphabetic order to avoid duplication or search failing.
 
-[#ACCOUNTS PAYABLE]
+[#ACCOUNTS_PAYABLE]
 Accounts Payable::
-The debts owed by a business, usually in relation to goods or services, inventory, or supplies.
+These are the debts that your business owes to suppliers, usually in relation to goods or services, inventory, or supplies.
 It is also called 'A/P' for short or 'Creditors'.
 
-[#ACCOUNT PAYABLE INVOICE]
+[#ACCOUNT_PAYABLE_INVOICE]
 Accounts Payable Invoice::
 AP invoice is a document raised by the customer and sent to the company with the details of the items sent, qty sent, price and other details.
 The company will enter this invoice details in the Payable module and then pay the customer according to the credit terms.
 This invoice may come along with the consignment or may be sent to the company separately.
 
-[#ACCOUNTS RECEIVABLE]
+[#ACCOUNTS_RECEIVABLE]
 Accounts Receivable::
-The money owed to a business by its customers for products and services delivered to a customer.
+These are the outstanding debts that your customers owe to your business,
+for products and services delivered.
 It is also called 'A/R' for short or Debtors.
 
-[#ACCOUNT RECEIVABLE INVOICE]
+
+[#ACCOUNT_RECEIVABLE_INVOICE]
 Accounts Receivable Invoice::
 AR Invoice is a document raised by the company and sent to the customer with the details of items sold, qty sold, price, tax and other details.
 Based on this invoice, the customer will send the payment in case of credit sales.
 
-[#ACCOUNT TYPE]
+[#ACCOUNT_TYPE]
 Account Type::
 A key that specifies the accounting area to which an account belongs.
 The account type is required in addition to the account number to identify an account, because the same account number can be used for each account type.
 
+[#ACCRUAL_BASED_ACCOUNTING]
+Accrual Based Accounting:: This is a method where you record the income when the sale occurs and not necessarily
+when you receive the payment. Also you record an expense when you receive goods or services, even though you may
+not pay for them until later.
+
 [#ACQUISITION]
 Acquisition::
 The process of identifying the requirement for a certain good or material item, ordering it, and paying for it.
 
-[ACCURAL BASED ACCOUNTING]
+[#ACCURAL_BASED_ACCOUNTING]
 Accrual Based Accounting::
 This is a method where you record the income when the sale occurs and not necessarily when you receive the payment.
 Also you record an expense when you receive goods or services, even though you may not pay for them until later.
 
-[#BALANCE SHEET]
+[#ANNUAL_REVENUE]
+Annual Revenue::
+Annual revenue is the amount of revenue for a group that is reported in the Party
+Group Information screenlet of the groups profile (visit Party Profile screen).
+
+[#ASSET]
+Assets:: These are all of the non-inventory "things" that the enterprise owns. +
+These are items of value owned by the business. +
+There are different types of assets (fixed, current, intangible) In accounting assets are shown as balance sheet accounts.
+
+[NOTE]
+Examples: Furniture, computer or manufacturing equipment, vehicles, bank accounts, investments and goodwill.
+
+[#ASSET_MAINTENANCE]
+Asset Maintenance:: Any expense incurred during the process of maintaining an asset. +
+There is a application in OFBiz plugin to <<_asset_maintenance_plugin,manage maintenance process of assets>>
+
+[NOTE]
+Example: Real Estate assessor fees, stock broker fees, vehicle maintenance costs
+
+[#BALANCE_SHEET]
 Balance Sheet::
-This is like a financial snapshot of your business at a certain point in time.
-It lists your assets, liabilities and the difference between the two which is the net worth (or equity) of the business.
+This is like a financial snapshot of your business at a certain point in time. +
+It lists your assets, liabilities and the difference between the two which is the net worth (or equity) of the business. +
 The balance sheet is also called the 'Statement of Financial Position'
 
-[#CASH BASED ACCOUNTING]
+[#BUDGET]
+Budget::
+A budget is used to track spending in the company for a future period of time.
+The company may have one or more budgets depending on the requirements (i.e. Operating
+Budget, Capital Budget). +
+A budget has a status, type and is composed of budget line items.
+
+[#BUDGET_ID]
+Budget Id:: The unique identifier for a budget.
+
+[#BUDGET_ITEM]
+Budget Item:: Describes an item in a budget. It may have a type, amount and purpose.
+
+[#CAPITAL]
+Capital:: This is money invested in the business by the owners. It is also called equity.
+
+[#CASH_BASED_ACCOUNTING]
 Cash Based Accounting::
 This method is when you record income only when you receive the cash from your customers.
 You also only record an expense when you actually pay your suppliers
 
-[#CHART OF ACCOUNTS]
+[#CHART_OF_ACCOUNTS]
 Chart of Account::
 This is a list or hierarchy of account descriptions that you use to keep the accounting records for your business
 
-[#CLOSING BALANCE]
+[#CLOSING_BALANCE]
 Closing balance::
 At the end of a financial period, the balance on all entries posted to an account.
 
-[#CREDIT ACCOUNT]
-Credit account::
-An account that allows buyers to obtain goods or services without paying for them until a later date.
-
-[#CREDITOR]
-Creditor::
-This is a company or an individual that you owe money to.
+[#COST_OF_GOODS_SOLD]
+Cost of Goods Sold::
+This is the amount it costs you to provide your product or services sold to your customers.
+It is often called and abbreviated to 'COGS'
 
 [#CREDITS]
 Credits::
 One component of every accounting transaction (journal entry) is a credit.
 Credits increase liabilities and equity but decrease assets
 
-[#COST OF GOODS SOLD]
-Cost of Goods Sold::
-This is the amount it costs you to provide your product or services sold to your customers.
-It is often called and abbreviated to 'COGS'
+[#CREDIT_ACCOUNT]
+Credit account::
+An account that allows buyers to obtain goods or services without paying for them until a later date.
 
-[#CREDIT AMOUNT]
+[#CREDIT_AMOUNT]
 Credit amount::
 An amount of money in someone's favor.
 
-[#DOUBLE ENTRY ACCOUNTING]
-Double Entry Accounting::
-In this method every transaction has two entries: a debit and a credit (also called a journal entry).
-Debits must always equal credits. Most if not all accounting software use double entry accounting.
+[#CREDITOR]
+Creditor::
+This is a company or an individual that you owe money to.
 
-[#DEPRECIATION]
-Depreciation::
-This is a write-off of a portion of the cost of fixed assets, such as vehicles and equipment.
-It is usually done annually but can be done more frequently.
-Depreciation is also listed as part of the expenses on the 'Profit & Loss' or 'Income Statement'
+[#CURRENT_ASSETS]
+Current Assets:: Normally these are things that the business owns that are in the form of cash or
+will generally be converted to cash or used up within a year.
+
+[NOTE]
+Examples: Accounts Receivable (because people owe you money that you expect will pay you);
+Inventory and money in your company bank account.
+
+[#CURRENT_LIABILITIES]
+Current Liabilities:: Normally these are debts that the business owes that are generally payable within a year,
+(i.e. Accounts Payable; Taxes and Payroll)
 
-[DEBITS]
+[#DEBITS]
 Debits::
 One component of every accounting transaction (journal entry) is a debit.
 Debits increase assets but decrease liabilities and equity.
@@ -119,75 +162,141 @@ Debits increase assets but decrease liabilities and equity.
 Debtor::
 This is a company or an individual that owes you money.
 
-[#GENERAL LEDGER]
+[#DEPRECIATION]
+Depreciation:: This is a write-off of a portion of the cost of fixed assets, such as vehicles and equipment.
+It is usually done annually but can be done more frequently.
+Depreciation is also listed as part of the expenses on the 'Profit & Loss' or 'Income Statement'.
+
+[#DOUBLE_ENTRY_ACCOUNTING]
+Double Entry Accounting::
+In this method every transaction has two entries: a debit and a credit (also called a journal entry).
+Debits must always equal credits. Most if not all accounting software use double entry accounting.
+
+[#EQUITY]
+Equity:: This is the net worth of your business. It is also called 'Capital' or 'Owner's Equity.
+Equity is made up of investment in the business by the owners plus any profits that the business has made
+that has'nt been taken out.
+
+[#END_OF_YEAR_ROLLOVER]
+End of Year Rollover:: At the end of the financial year the Profit & Loss accounts totals are reset to zero and
+the balance sheet accounts totals are carried forward into the next financial year.
+
+[#FIXED_ASSETS]
+Fixed Assets:: These are assets that are generally not going to be converted to cash within a year.
+(i.e. Manufacturing equipment; vehicles, building, ...)
+
+[#GENERAL_LEDGER]
 General Ledger::
-This is a collection of different types of accounts (balance sheet, income, expense) that are used to keep the accounting records of a business.
+This is a collection of different types of accounts (balance sheet, income, expense) that are used to keep
+the accounting records of a business.
 A general ledger works with double entry accounting and journal entries for each transaction.
 
-[#GROSS PRICE]
+[#GROSS_PRICE]
 Gross price::
 The price of one unit of an item, or a service, including tax.
 
-[#GROSS PROFIT]
+[#GROSS_PROFIT]
 Gross Profit::
 The positive difference between sales revenues and the costs of goods sold.
 
-[#INCOME ACCOUNTS]
+[#INCOME_ACCOUNTS]
 Income Accounts::
 These are the accounts that are used to keep track of your sources of income.
-Examaple: Sales, Consulting Income or Interest.
+(i.e. Sales, Consulting Income or Interest).
 
-[#INCOME STATEMENT]
+[#INCOME_STATEMENT]
 Income Statement::
-This is also called a Profit and Loss Statement' or a 'P&L'.
+This is also called a Profit and Loss Statement' or a 'P&L'. +
 It lists the income, expenses, and net profit (or loss) for the business.
 The net profit (or loss) is equal to the total income minus the total expenses.
 
-[#INTANGIBLE ASSET]
+[#INTANGIBLE_ASSET]
 Intangible Asset::
 This is something of value that is owned by the business that cannot be touched physically.
+(i.e. a trademark; patent or goodwill)
 
-[#INVENTORY AUDIT REPORT]
+[#INVENTORY_AUDIT_REPORT]
 Inventory Audit Report::
-An audit trail for the posted inventory transactions in the Chart of Accounts. This report compares the accounting view (inventory balance accounts) and the logistics view (inventory value displayed by the audit report).
+An audit trail for the posted inventory transactions in the Chart of Accounts.
+This report compares the accounting view (inventory balance accounts) and the logistics view
+(inventory value displayed by the audit report).
+
+[#INVOICE_DATE]
+Invoice Date:: This is the date that the invoice was created. +
+Normally this will be based on when products were shipped or services were provided
 
-[#OUTSTANDING AMOUNT]
+[#INVOICE_DUE_DATE]
+Invoice Due Date:: This is the last possible date that payments can be made or received for an invoice without triggering
+any late payment penalties
+
+[#JOURNAL]
+Journal:: This is a detailed accounting transaction that is recorded (or posted) in the general ledger.
+It can also be referred to as a Journal Entry. It is made up of a debit and a credit component.
+
+[#JOURNAL_ENTRY]
+Journal Entry:: This is a detailed accounting transaction that is recorded (or posted) in the general ledger.
+It can also be referred to as a Journal. It is made up of a debit and a credit component.
+
+[#LIABILITIES]
+Liabilities:: These are the debts that your business owes to its suppliers, banks or the government.
+(i.e. taxes or loans)
+
+[#LONG_TERM_LIABILITIES]
+Long Term Liabilities:: These are debts that a business owes to its suppliers that are not generally due
+to be paid off within a year (An example would be a mortgage payment).
+
+[#OUTSTANDING_AMOUNT]
 Outstanding Amount::
 The amount of money that is owed by a debtor and has not yet been paid.
 
-[#OUTSTANDING PAYMENT]
+[#OUTSTANDING_PAYMENT]
 Outstanding Payment::
 The remaining amount of money that is due for goods or services.
 
-[#PASSIVE ACCOUNT]
+[#NET_INCOME]
+Net Income:: This is also called 'Profit' or 'Net Profit'. It is the total income minus the total expenses.
+
+[#PASSIVE_ACCOUNT]
 Passive Account::
-A bank account in which no transactions have taken place, neither deposits nor withdrawals, for a specified period of time (normally six months).
+A bank account in which no transactions have taken place, neither deposits nor withdrawals,
+ for a specified period of time (normally six months).
 
 [#PAYABLES]
 Payables::
-The total amount due to creditors. This information includes the type, the amount, and the due date of the debts. Payables may include amounts payable to banks and suppliers, as well as customer down payments.
+The total amount due to creditors. This information includes the type, the amount, and the due date of the debts.
+Payables may include amounts payable to banks and suppliers, as well as customer down payments.
 
-[#PAYMENT METHOD]
+[#PAYMENT_METHOD]
 Payment Method::
-A set of parameters and other details that determine how invoices are cleared when the Payment Wizard is used. It is possible to create as many payment methods as required. In addition, you can link specific payment methods to relevant business partners.
+A set of parameters and other details that determine how invoices are cleared when the Payment Wizard is used.
+It is possible to create as many payment methods as required. In addition, you can link specific payment methods
+to relevant business partners.
 
-[#PAYMENT PERIOD]
+[#PAYMENT_PERIOD]
 Payment Period::
 The period of time in which an outstanding debt has to be paid, for example a range of days or a certain month.
 
-[#PAYMENT RUN]
+[#PAYMENT_RUN]
 Payment Run::
-A process that clears A/R and A/P invoices, by generating the payments, posting the transactions and updating the system (by creating the bank transfer files).
+A process that clears A/R and A/P invoices, by generating the payments, posting the transactions and updating
+the system (by creating the bank transfer files).
 
-[#PAYMENT TERMS]
+[#PAYMENT_TERMS]
 Payment Terms::
 The conditions of payment agreed to between business partners with respect to goods supplied or services provided.
 
-[#PROFIT AND LOSS STATEMENT]
+[#PROFIT_AND_LOSS_STATEMENT]
 Profit and Loss Statement::
-A comparison of revenue and expense within a certain period. The purpose of the profit and loss statement is the establishing of profit made by an organization and the sources thereof. It is a compulsory part of year-end closing.
+A comparison of revenue and expense within a certain period. The purpose of the profit and loss statement is
+the establishing of profit made by an organization and the sources thereof. It is a compulsory part of year-end closing.
+
+[#RETAINED_EARNING]
+Retained Earning:: These are profits from the business that have been kept or 'retained' in the business and
+not paid out to the owners.
 
-[#TRIAL BALANCE]
+[#TRIAL_BALANCE]
 Trial Balance::
-This is a list of the general ledger accounts showing the debits in one column and the credits in another. The main objective of a trial balance is to ensure that the total credits and total debits balance (eg. total debits = total credits).
+This is a list of the general ledger accounts showing the debits in one column and the credits in another. +
+The main objective of a trial balance is to ensure that the total credits and total debits balance
+(eg. total debits = total credits). +
 It also validates that the double entry accounting is working correctly.
\ No newline at end of file
diff --git a/applications/humanres/src/docs/asciidoc/_include/hr-appendix.adoc b/applications/humanres/src/docs/asciidoc/_include/hr-appendix.adoc
index 90c5b6c..0d74261 100644
--- a/applications/humanres/src/docs/asciidoc/_include/hr-appendix.adoc
+++ b/applications/humanres/src/docs/asciidoc/_include/hr-appendix.adoc
@@ -26,7 +26,7 @@ PayHistory is a detail of Employment entity (Composition in UML language) and Em
 emplFromDate (coming from Employment) and one classical fromDate to be able to have multiple PayHistory for one Employment.
 
 PartyBenefit:: It's exactly the same problem or case than PayHistory, currently in Apache OFBiz entity is exactly the same
-as in Data Model Resource Book Difference (only one fromDate field), so it's not possible to have a correct User Interface
+as in https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Related+Books#OFBizRelatedBooks-DataModel[Data Model Resource Book] Difference (only one fromDate field), so it's not possible to have a correct User Interface
 as an Employment subOption. +
 So correct solution should be to have one more field: emplFromDate (coming from Employment).
 
@@ -61,7 +61,7 @@ but there is no menu to use them !
 JIRA OFBIZ-11045 is for that.
 
 ==== Business Rule
-It's suggest in «the Data Model Resource Book» to have a check before adding some responsibilities to a job Position
+It's suggest in «the https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Related+Books#OFBizRelatedBooks-DataModel[Data Model Resource Book]» to have a check before adding some responsibilities to a job Position
 if Position Type has it (in ValidResposibility) with valid date.
 
 === Position Type Rate amount-and-grade
diff --git a/applications/humanres/src/docs/asciidoc/_include/hr-glossary.adoc b/applications/humanres/src/docs/asciidoc/_include/hr-glossary.adoc
index a9d0d0b..b55136f 100644
--- a/applications/humanres/src/docs/asciidoc/_include/hr-glossary.adoc
+++ b/applications/humanres/src/docs/asciidoc/_include/hr-glossary.adoc
@@ -19,37 +19,36 @@ under the License.
 [glossary]
 = HR Glossary
 
-[#BUDGET]
-Budget::
-A budget is used to track spending in the company for a future period of time.
-The company may have one or more budgets depending on the requirements i.e. Operating
-Budget, Capital Budget. A budget has a status, type and is composed of budget line
-items.
+[comment]
+It's important to sort glossary entries in alphabetic order to avoid duplication or search failing.
+
+[#BENEFITS]
+Employment Benefits::
+Employment imply salary but not only, most of time, there are some benefit packages associated. Examples are
+vacation,health or life insurance, sick leave or retirement plan. Cost of these package may be partly or completely
+paid by the entreprise. Example can be see in <<_step_4_employee_associated_benefits>> in <<_tutorial_employment_and_salary>>.
+
+[#EMPLOYMENT]
+Employment::
+Employment defines the relationship between your Company and a person who is an
+ employee. The employment relationship tracks employee benefits  preferences, pay
+history, and unemployment claims and agreements. +
+For more detail see <<_employments>> chapter.
 
 [#EMPLOYEE]
 Employee::
-An employee is a person who has an employment relationship with your Company. +
+An employee is a person (and so a party) who has an employment relationship with your Company. +
 For more detail see <<_employees>> chapter.
 
 [#EMPLOYEE_POSITION_TYPE]
 Employee Position Type::
 Employee Position Type is a name that describes a position (<<_employee_positions, Employee Positions>>).
-Business Analyst, Programmer and System Administrator are examples of position types in the OFBiz
-demo data. You can define your own position types in Global HR Settings > Position
+You can define your own position types in Global HR Settings > Position
 Types.
 
-[#EMPLOYMENT]
-Employment::
-Employment defines the relationship between your Company and a person who is an
- employee. The employment relationship tracks employee benefits  preferences, pay
-history, and unemployment claims and agreements. +
-For more detail see <<_employments>> chapter.
-
-[#BENEFITS]
-Employment Benefits::
-Employment imply salary but not only, most of time, there are some benefit packages associated. Examples are
-vacation,health or life insurance, sick leave or retirement plan. Cost of these package may be partly or completely
-paid by the entreprise. Example can be see in <<_step_4_employee_associated_benefits>> in <<_tutorial_employment_and_salary>>.
+[NOTE]
+Business Analyst, Programmer and System Administrator are examples of position types in the OFBiz
+demo data.
 
 [#EXEMPT_FLAG]
 Exempt Flag::
@@ -71,36 +70,12 @@ HR App Menu::
 The main menu that opens the high level features of the HR App i.e. Employees,
 Employments, Employee Position etc.
 
-[#INTERNAL_ORGANIZATION]
-Internal Organization::
-Internal organization is the name of a relationship between a party group and your
-company. This relationship is used to filter party groups as being part of your
-company to distinguish them from other groups which are external. For example your
-marketing department is an internal organization while a suppliers sales department
-is not.
-
 [#NUMBER_OF_EMPLOYEES]
 Number of Employees::
 Number of employees that are reported in the Party Group Information screenlet of
 the groups profile (Visit Party Profile screen).
 
-[#PARTY]
-Party::
-Party is a term used to simplify collecting information that used in a common manner
-by different people and things. The most common party types are people and groups.
-Both people and groups have contact information. A party is identified by a unique
-Party Id. Using this Id OFBiz can collect and find contact (and other information
-and processes) for both people and groups in the same way. This is why you will
-often see Party Id as a field in a form or a filter as you work in OFBiz.
-
-[#PARTY_ID]
-Party Id::
-The unique identifier for a party. The Id is text so in some cases you will see
-an Id, created by a user, that carries some meaning i.e. Party Id DemoEmployee.
-In other cases the Id is created by OFBiz and is will be simply a number from a
-sequence. In either case the Id is unique.
-
-[#Qualifications]
+[#QUALIFICATIONS]
 Qualifications::
 Qualifications for an individual person or organization are in the Employees Qualifications
 menu item. To find and update the qualifications of people and organizations visit
@@ -112,12 +87,11 @@ Party qualifications define a person or organizations accomplishments that indic
 their suitability to perform a job. Qualifications are organized into qualification
 groups for the purpose of managing and reporting.
 
-[#PERSON]
-Person::
-Person is a human being as distinguished from a party group which is an organization.
-Human beings and organizations have different attributes i.e. People have first and
-last names while groups have group names. Both person and party group are types
- of parties and share information and processes common to parties.
+[#POSITION]
+Position:: A Employee Position is a job that can be filled by more then one person over time or at the same time.
+Positions are defined by a type of work. For example there may be 20 positions in an organization for a secretary.
+Each position is related to a department in the organization. +
+For more details have a look at <<_employee_positions>> in HR core object chapter.
 
 [#RATING]
 Rating::
@@ -161,5 +135,5 @@ type e.g. Type: resigned for reason: found new job.
 
 [#TERMINATION_TYPE]
 Termination Type::
-The termination type is a name for the kind of termination e.g. Resigned, fired,
+The termination type is a name for the kind of termination e.i. Resigned, fired,
  retired, layoff.
diff --git a/applications/humanres/src/docs/asciidoc/humanres.adoc b/applications/humanres/src/docs/asciidoc/humanres.adoc
index bbb0217..561b6f7 100644
--- a/applications/humanres/src/docs/asciidoc/humanres.adoc
+++ b/applications/humanres/src/docs/asciidoc/humanres.adoc
@@ -25,8 +25,8 @@ It is well integrated with other components especially
  Accounting to manage Payroll and any specific  employee agreements.
 
 The HR Application data design, like most of the OFBiz back office administration applications, was inspired by
-the data models in The Data Model Resource Books by Len Silverston
-footnote:ref:[silverston-data-model, http://silverston.wiley.com/index.html[Silverston Data Model Resource Companion Site]].
+the data models in The https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Related+Books#OFBizRelatedBooks-DataModel[Data Model Resource Books]
+by Len Silverston footnote:[silverston-data-model, http://silverston.wiley.com/index.html[Silverston Data Model Resource Companion Site]].
 The sections below introduces some of the concepts in HR App that were derived from the models.
 
 In OFBiz <<PARTY, Party>> is one of the core object, a party is a person (employee, end customer, sub-contractor, contact, ...)
diff --git a/applications/party/src/docs/asciidoc/_include/party-glossary.adoc b/applications/party/src/docs/asciidoc/_include/party-glossary.adoc
new file mode 100644
index 0000000..60491dc
--- /dev/null
+++ b/applications/party/src/docs/asciidoc/_include/party-glossary.adoc
@@ -0,0 +1,51 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+////
+[glossary]
+= Party Glossary
+
+[#AGREEMENT]
+Agreement:: An agreement is a way of recording a business arrangement or contract that your business makes with
+other companies or individuals. For more details have a look to <<_agreements>> management in accounting component.
+
+[NOTE]
+Examples: Customer or Supplier payment terms (eg.30 days to pay);  Discounts (e.g products or volume);
+Commissions; Customer Contracts (agreement to sell x number of widgets for y price, or sell at y price for a certain time frame)
+
+[#PERSON]
+Person::
+Person is a human being as distinguished from a party group which is an organization.
+Human beings and organizations have different attributes i.e. People have first and
+last names while groups have group names. Both person and party group are types
+ of parties and share information and processes common to <<PARTY,parties>>.
+
+[#SECURITY_GROUP]
+Security Group:: A  security group is a collection (or a set) of application privileges that can be assigned to a user login id.
+A user can be assigned to multiple security groups
+
+[NOTE]
+Example: FULLADMIN; BIZADMIN; ECOMMERCE_CUSTOMER.
+
+[#SUPPLIER]
+Supplier:: Role of a party that something if purchased from
+
+[#VENDOR]
+Vendor::
+Role of a party that sells something with the system
+
+
diff --git a/applications/party/src/docs/asciidoc/party.adoc b/applications/party/src/docs/asciidoc/party.adoc
index a406115..cf38612 100644
--- a/applications/party/src/docs/asciidoc/party.adoc
+++ b/applications/party/src/docs/asciidoc/party.adoc
@@ -65,4 +65,6 @@ See the <<_marketing,marketing application>> for more information
 
 == Security
 
-== Miscellaneous
\ No newline at end of file
+== Miscellaneous
+
+include::_include/party-glossary.adoc[leveloffset=+1]
diff --git a/applications/product/src/docs/asciidoc/facility.adoc b/applications/product/src/docs/asciidoc/facility.adoc
index 01d5e65..58147fa 100644
--- a/applications/product/src/docs/asciidoc/facility.adoc
+++ b/applications/product/src/docs/asciidoc/facility.adoc
@@ -30,3 +30,15 @@ All operations relating to stock:
 * return
 * physical inventory
 * ...
+
+[glossary]
+== Facility Glossary
+
+[#INVENTORY]
+Inventory:: These are goods are held for sale to customers. Inventory is also referred to a Stock. Inventory can be items
+that are bought for resale or it can be products that are manufactured and sold to the customer.
+
+[#STOCK]
+Stock:: These are goods are held for sale to customers. Stock is also referred to as Inventory.
+Stock can be items that are bought for resale or it can be products that are manufactured and sold to the customer.
+
diff --git a/docs/asciidoc/_include/ofbiz-glossary.adoc b/docs/asciidoc/_include/ofbiz-glossary.adoc
index 0eeaa54..9216a02 100644
--- a/docs/asciidoc/_include/ofbiz-glossary.adoc
+++ b/docs/asciidoc/_include/ofbiz-glossary.adoc
@@ -19,7 +19,12 @@ under the License.
 [glossary]
 = General Glossary
 
-[glossary]
+[comment]
+It's important to sort glossary entries in alphabetic order to avoid duplication or search failing.
+
+This glossary is intended to help beginners with OFBiz terms and concepts. +
+Some of them come from the https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Related+Books#OFBizRelatedBooks-DataModel[Data Model Resource Book] some are OFBiz specific.
+
 [#APPLICATION]
 Application::
 . **for end users** , an application is a top level menu entry, it's for managing a business object:
@@ -83,12 +88,17 @@ Workers assignment, Job Shop
 
 With these core applications multiple others can be build. In ofbiz-plugin you can find some.
 
+[#CRM]
+CRM:: **C**ustomer **R**elationship **M**anagement
+
 [#DEMO_DATA]
 Demo Data:: Demo data are loaded with the command `gradlew loadAll` or `gradlew "ofbiz --load-data readers=dDemo"` +
  +
 Demo data are present to help understanding ofbiz application process, most of the time it's only the minimum of data,
 For a correct understanding, it's necessary to create more data to have a full functionnal OFBiz.
 
+[#E_COMMERCE]
+E-Commerce:: The buying and selling of goods or services over electronic systems.
 
 [#ENTITY]
 Entity:: An entity represents an important business concept that is stored as a record in the database.
@@ -113,3 +123,52 @@ For creation, as Primary keys must be entered manually apply the ID general advi
 In ID only standard characters and without space are authorized. ID length must be less than 20 characters. +
 Generally manual primary keys are all upper case with underscores between words and are a meaningful mnemonic i.e.
 A_PRIMARY_KEY.
+
+[#ERP]
+ERP:: An acronym for **E**nterprise **R**esource **P**lanning, an ERP is basically a category of software used for
+managing a business. It is often a package containing several individual, but integrated, applications.
+Some of those applications might be Accounts Receivable, Accounts Payable, General Ledger, or Point of Sale.
+
+[NOTE]
+Example of ERP: Apache OFBiz, OpenBravo, Odoo
+
+[#INTERNAL_ORGANIZATION]
+Internal Organization::
+An Internal organization is a special term in OFBiz that allows you to flag the main accounting company that is being setup. +
+It can also be used to highlight relationship between a party group (any of your departments, business units or subsidiaries.)
+and your company. +
+This relationship is used to filter party groups as being part of your
+company to distinguish them from other groups which are external. For example your
+marketing department is an internal organization while a suppliers sales department
+is not.
+
+[#MRP]
+MRP:: **M**aterial **R**equirements **P**lanning
+
+[#PARTY]
+Party:: User, person, organization or other entity (where entity is not an OFBiz "Entity" but rather entity in the legal sense)
+implied in at least one process modeled and implemented by OFBiz. +
+Party is a term used to simplify collecting information that used in a common manner
+by different people and things. +
+The most common party types are people and groups. +
+Both people and groups have contact information. +
+A party is identified by a unique Party Id.
+Using this Id OFBiz can collect and find contact (and other information
+and processes) for both people and groups in the same way. This is why you will
+often see Party Id as a field in a form or a filter as you work in OFBiz.
+
+[NOTE]
+Example of party: a administrator of the website; a company dealing goods and/or services via the website;
+ an OFBiz customer assigned a unique party identifier, etc.
+
+[#PARTY_ID]
+Party Id::
+The unique identifier for a party. +
+The id is stored as text so in some cases you will see an id that helps you identify the party it is linked to
+(e.g. Party Id DemoEmployee, or DemoSupplier). +
+In other cases the Id is created by OFBiz and is will be simply a number from a
+sequence(by default it starts from the sequence 10000). +
+In either case the Id is unique.
+
+[#SCM]
+SCM:: **S**upply **C**hain **M**anagement