You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/09/22 09:39:54 UTC

svn commit: r817524 - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/documents/ applications/commonext/data/ applications/commonext/documents/ applications/content/ applications/content/dat...

Author: hansbak
Date: Tue Sep 22 07:39:53 2009
New Revision: 817524

URL: http://svn.apache.org/viewvc?rev=817524&view=rev
Log:
added another level in the accounting help data, added info and reorganized a bit, also fixed the problem with the selenium info which did not load

Added:
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml   (with props)
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml   (with props)
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml   (with props)
    ofbiz/trunk/applications/content/data/SeleniumHelpData.xml   (with props)
Removed:
    ofbiz/trunk/framework/testtools/documents/SeleniumHelpData.xml
Modified:
    ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml
    ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml
    ofbiz/trunk/applications/accounting/documents/Accounting.xml
    ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml
    ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml
    ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
    ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
    ofbiz/trunk/applications/content/data/ContentHelpData.xml
    ofbiz/trunk/applications/content/data/PartyHelpData.xml
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/framework/testtools/ofbiz-component.xml

Modified: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml Tue Sep 22 07:39:53 2009
@@ -27,112 +27,127 @@
 
     <DataResource dataResourceId="ACCOUNTING_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Main Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_main" contentTypeId="DOCUMENT" contentName="Accounting Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <Content contentId="ACCOUNTING_main" contentTypeId="DOCUMENT" contentName="Accounting Main." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
     <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_main"/>
+    <!-- invoices -->
+    <DataResource dataResourceId="ACCOUNTING_invoices" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_invoices" contentTypeId="DOCUMENT" contentName="Invoices." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoices" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoices" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoices"/>
 
-<DataResource dataResourceId="ACCOUNTING_findInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_findInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Invoices Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_findInvoi" contentTypeId="DOCUMENT" contentName="Accounting Find Invoices Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_findInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_findInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findInvoices"/>
+    <Content contentId="ACCOUNTING_findInvoi" contentTypeId="DOCUMENT" contentName="Find Invoices." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_findInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_findInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findInvoices"/>
 
-<DataResource dataResourceId="ACCOUNTING_invoiceOv" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_invoiceOv" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Overview Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_invoiceOv" contentTypeId="DOCUMENT" contentName="Accounting Invoice Overview Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceOv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoiceOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceOverview"/>
+    <Content contentId="ACCOUNTING_invoiceOv" contentTypeId="DOCUMENT" contentName="Invoice Overview." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceOv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_invoiceOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceOverview"/>
 
-<DataResource dataResourceId="ACCOUNTING_editInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_editInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_editInvoi" contentTypeId="DOCUMENT" contentName="Accounting Edit Invoice Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoice"/>
+    <Content contentId="ACCOUNTING_editInvoi" contentTypeId="DOCUMENT" contentName="Edit Invoice." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_editInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoice"/>
 
-<DataResource dataResourceId="ACCOUNTING_editInvAp" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_editInvAp" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Invoice Applications Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_editInvAp" contentTypeId="DOCUMENT" contentName="Accounting Edit Invoice Applications Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvAp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editInvAp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoiceApplications"/>
+    <Content contentId="ACCOUNTING_editInvAp" contentTypeId="DOCUMENT" contentName="Edit Invoice Applications." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvAp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_editInvAp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoiceApplications"/>
 
-<DataResource dataResourceId="ACCOUNTING_editInvTE" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_editInvTE" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Invoice Time Entries Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_editInvTE" contentTypeId="DOCUMENT" contentName="Accounting Edit Invoice Time Entries Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvTE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editInvTE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoiceTimeEntries"/>
+    <Content contentId="ACCOUNTING_editInvTE" contentTypeId="DOCUMENT" contentName="Edit Invoice Time Entries." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editInvTE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_editInvTE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editInvoiceTimeEntries"/>
 
-<DataResource dataResourceId="ACCOUNTING_listInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_listInvoi" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Invoices Items Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_listInvoi" contentTypeId="DOCUMENT" contentName="Accounting List Invoices Items Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_listInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_listInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_listInvoiceItems"/>
+    <Content contentId="ACCOUNTING_listInvoi" contentTypeId="DOCUMENT" contentName="List Invoices Items." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_listInvoi" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_listInvoi" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_listInvoiceItems"/>
 
-<DataResource dataResourceId="ACCOUNTING_sendPerEm" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_sendPerEm" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Send Per Email Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_sendPerEm" contentTypeId="DOCUMENT" contentName="Accounting Invoice Send Per Email Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_sendPerEm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_sendPerEm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_sendPerEmail"/>
+    <Content contentId="ACCOUNTING_sendPerEm" contentTypeId="DOCUMENT" contentName="Invoice Send Per Email." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_sendPerEm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_sendPerEm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_sendPerEmail"/>
 
-<DataResource dataResourceId="ACCOUNTING_newInvoic" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_newInvoic" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting New Invoice Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_newInvoic" contentTypeId="DOCUMENT" contentName="Accounting New Invoice Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_newInvoic" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_newInvoic" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_newInvoice"/>
+    <Content contentId="ACCOUNTING_newInvoic" contentTypeId="DOCUMENT" contentName="New Invoice." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_newInvoic" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_newInvoic" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_newInvoice"/>
 
-<DataResource dataResourceId="ACCOUNTING_invoiceRo" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_invoiceRo" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Invoice Roles Help" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="ACCOUNTING_invoiceRo" contentTypeId="DOCUMENT" contentName="Accounting Invoice Roles Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_invoiceRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceRoles"/>
+    <Content contentId="ACCOUNTING_invoiceRo" contentTypeId="DOCUMENT" contentName="Invoice Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_invoiceRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_invoices" contentIdTo="ACCOUNTING_invoiceRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_invoiceRoles"/>
+    <!-- payments -->
+    <DataResource dataResourceId="ACCOUNTING_payments" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Payment Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_payments" contentTypeId="DOCUMENT" contentName="Payments." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_payments" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_payments" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_payments"/>
 
-<DataResource dataResourceId="ACCOUNTING_newPaymen" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_newPaymen" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting New Payment Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_newPaymen" contentTypeId="DOCUMENT" contentName="Accounting New Payment Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_newPaymen" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_newPaymen" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_newPayment"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_newPaymen" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_newPayment"/>
 
-<DataResource dataResourceId="ACCOUNTING_findPayme" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_findPayme" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Payments Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_findPayme" contentTypeId="DOCUMENT" contentName="Accounting Find Payments Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_findPayme" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_findPayme" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findPayments"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_findPayme" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_findPayments"/>
 
-<DataResource dataResourceId="ACCOUNTING_paymentOv" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_paymentOv" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Payment Overview Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_paymentOv" contentTypeId="DOCUMENT" contentName="Accounting Payment Overview Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_paymentOv" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_paymentOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_paymentOverview"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_paymentOv" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_paymentOverview"/>
 
-<DataResource dataResourceId="ACCOUNTING_editPayAp" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_editPayAp" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Payment Applications Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_editPayAp" contentTypeId="DOCUMENT" contentName="Accounting Payment Applications Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editPayAp" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editPayAp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editPaymentApplications"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_editPayAp" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editPaymentApplications"/>
 
-<DataResource dataResourceId="ACCOUNTING_editPayme" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_editPayme" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Payment Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_editPayme" contentTypeId="DOCUMENT" contentName="Accounting Edit Payment Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_editPayme" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_editPayme" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editPayment"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_editPayme" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_editPayment"/>
 
-<DataResource dataResourceId="ACCOUNTING_FindSInDD" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_FindSInDD" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Sales Invoices By Due New Payment Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_FindSInDD" contentTypeId="DOCUMENT" contentName="Accounting Find Sales Invoices By Due Date Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindSInDD" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_FindSInDD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindSalesInvoicesByDueDate"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_FindSInDD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindSalesInvoicesByDueDate"/>
 
-<DataResource dataResourceId="ACCOUNTING_FindPInDD" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_FindPInDD" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Purchase Invoices By Due New Payment Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_FindPInDD" contentTypeId="DOCUMENT" contentName="Accounting Find Purchase Invoices By Due Date Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindPInDD" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_FindPInDD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindPurchaseInvoicesByDueDate"/>
+    <ContentAssoc contentId="ACCOUNTING_payments" contentIdTo="ACCOUNTING_FindPInDD" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindPurchaseInvoicesByDueDate"/>
+    <!-- payment gateway -->
+    <DataResource dataResourceId="ACCOUNTING_paygatew" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_paygatew.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Payment Gateway" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_paygatew" contentTypeId="DOCUMENT" contentName="Payment Gateway." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_paygatew" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_paygatew" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_paygatew"/>
 
-<DataResource dataResourceId="ACCOUNTING_FindGWRes" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_FindGWRes" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Gateway Responses Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_FindGWRes" contentTypeId="DOCUMENT" contentName="Accounting Find Gateway Responses Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindGWRes" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_FindGWRes" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindGatewayResponses"/>
+    <ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_FindGWRes" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindGatewayResponses"/>
 
-<DataResource dataResourceId="ACCOUNTING_AuthTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_AuthTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Authorize Transaction Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_AuthTrans" contentTypeId="DOCUMENT" contentName="Accounting Authorize Transactions Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_AuthTrans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_AuthTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_AuthorizeTransaction"/>
+    <ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_AuthTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_AuthorizeTransaction"/>
 
-<DataResource dataResourceId="ACCOUNTING_CaptTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_CaptTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Capture Transaction Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_CaptTrans" contentTypeId="DOCUMENT" contentName="Accounting Capture Transaction Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_CaptTrans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_CaptTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_CaptureTransaction"/>
+    <ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_CaptTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_CaptureTransaction"/>
 
-<DataResource dataResourceId="ACCOUNTING_ViewGWRes" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_ViewGWRes" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting View Gateway Response Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_ViewGWRes" contentTypeId="DOCUMENT" contentName="Accounting View Gateway Response Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ViewGWRes" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_ViewGWRes" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewGatewayResponse"/>
+    <ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_ViewGWRes" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewGatewayResponse"/>
 
-<DataResource dataResourceId="ACCOUNTING_ManTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+    <DataResource dataResourceId="ACCOUNTING_ManTrans" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Manual Transaction Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="ACCOUNTING_ManTrans" contentTypeId="DOCUMENT" contentName="Accounting Manual Transaction Help" templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ManTrans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_ManTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ManualTransaction"/>
+    <ContentAssoc contentId="ACCOUNTING_paygatew" contentIdTo="ACCOUNTING_ManTrans" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ManualTransaction"/>
 
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml Tue Sep 22 07:39:53 2009
@@ -22,19 +22,24 @@
 	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 Introduction</title>
-    <para>The Accounting Manager application is used to manage the accounting function for a business. It gives access to various sub tabs
-	related to OFBiz accounting configuration and setup.</para>
-    <section>
-        <title>Subsection heading</title>
-        <para>Subsection content</para>
-    </section>
-	<section>
-        <title>Subsection 2 title</title>
+        <title>Accounting Introduction</title>
         <para>
-		The Main accounting Introduction screen. For more information please 
-		see the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> for more info.
+        The Accounting system is organized according to age old and generally accepted principles such as double-entry accounting, a General Ledger with hierarchical accounts, 
+        journals and posting of transactions and corresponding entries. 
+        </para>
+        <para>
+        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.
+        </para>
+        <para>
+        The Accounting entities are structured such that accounts for multiple organizations can be managed. The multiple organizations could be multiple companies, 
+        or departments or other organizations within a company. Each Organization can have various GL Accounts associated with it so that it can operate 
+        with its own subset of the Master Chart of Accounts. 
+        </para>
+        <para>
+        Each Organization can also have its own set of Journals for flexibility, even though the 
+        use of Journals should be as minimal as possible in favor 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 forth. 
         </para>
-    </section>
 </section>
 

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml Tue Sep 22 07:39:53 2009
@@ -17,7 +17,7 @@
 	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 Edit Invoice Header help screen.</title>
+	<title>The Accounting Edit Invoice Header screen.</title>
 	<para>The Invoice Header screen is used to view or update details from
 		the invoice header. Examples of the type of information that can be
 		changed are I Due Date, Description, Currency.</para>

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml Tue Sep 22 07:39:53 2009
@@ -17,7 +17,7 @@
 	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 Edit Invoice Applications help screen.</title>
+	<title>The Accounting Edit Invoice Applications screen.</title>
 	<para>The Invoice Applications sub menu is where payments that have
 		been made (or received) can be linked or allocated to an invoice. The
 		phrase 'applying' an amount to an invoice is often used to describe

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml Tue Sep 22 07:39:53 2009
@@ -17,7 +17,7 @@
 	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 Edit Invoice Time Entries help screen.</title>
+	<title>The Accounting Edit Invoice Time Entries screen.</title>
 	<para>he Time Entries screen displays any time logged against the
 		invoice. For example these time entries can be from employee or
 		external supplier timesheets that are tracked within OFBiz. is used to

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml Tue Sep 22 07:39:53 2009
@@ -17,45 +17,12 @@
 	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 Find Invoices help screen.</title>
-	<para>The default screen is for the Invoices tab is 'Find Invoices'. It
-		is used to locate existing invoices that have been created
-		automatically by the system or manually by the user. It can also be
-		used to create a new Sales or Purchase Invoice. </para>
-	<para>
-		Sales invoices are generated when customers buy something from your
-		business.
-		You will need to provide a detailed list of the items bought and relevant
-		taxes paid. They are often referred to a 'tax invoices' as they
-		contain
-		information relating to the amount of sales tax (eg VAT / GST)
-		charged on the product or service.
-		</para>
-	<para> Purchase invoices are generated by your suppliers when you
-		order something from them. You may send them an order in the form of
-		a Purchase Order. They will then send you the products and an invoice
-		for payment. This invoice is the Purchase Invoice and it will contain
-		details of the items bought plus any taxes.</para>
-	<para> Both of these documents are used as proof to various tax
-		authorities (eg Inland Revenue, Customs etc) that the required tax
-		has been charged or collected.</para>
-	<para>
-		GENERAL NOTE: The following is an extract from Ian McNulty's
-		documentation work on accounting:</para>
-	<para>Invoices are created automatically by the system when
-		certain criteria are met for each item on an order. The criteria
-		will vary depending on the type of product associated with the
-		order item, and the type of order (ie purchase/sales).</para>
-	<para>For Sales Orders that include digital goods, an invoice
-		will be created when the order is placed, and that invoice will be
-		for all digital goods in the order. If there are non-digital or
-		physical goods they will go in a separate invoice.</para>
-	<para>For Sales Orders that need physical fulfillment, an
-		invoice will be created for all items in a shipment when the
-		shipment goes into the 'Packed' status.</para>
-	<para>For Purchase Orders an invoice will be created from a
-		shipment when the shipment goes into the Received status.</para>
-	<section>
+	<title>The Accounting Find Invoices screen.</title>
+    <para>The default screen is for the Invoices tab is 'Find Invoices'. It
+        is used to locate existing invoices that have been created
+        automatically by the system or manually by the user. It can also be
+        used to create a new Sales or Purchase Invoice. </para>
+    <section>
 		<title>How do I view all invoices?</title>
 		<para>Press the 'Search' button to view all invoices</para>
 	</section>

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml Tue Sep 22 07:39:53 2009
@@ -22,7 +22,7 @@
 	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 Invoice Overview help screen.</title>
+	<title>The Accounting Invoice Overview screen.</title>
     <para>The Invoice Overview screen is used to display the summary of an invoice in a single view. The screen is divided into sections that show various information related to the invoice (eg Roles, Status, Terms, Items, Payments Applied, etc).</para>
    <para>The following options are currently available from this screen:</para>
    <para>

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml Tue Sep 22 07:39:53 2009
@@ -21,7 +21,7 @@
 	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 Invoice Roles help screen.</title>
+	<title>The Accounting Invoice Roles screen.</title>
 	<para>The Invoice Roles screen allows parties with specific roles to be associated with and invoice. If the e-commerce or Sales Order entry route has already been used then the invoice generated will already contain the relevant roles from the various parties.</para>
 	<para>For a Sales Order examples of roles will include Bill From Customer, Bill To Customer, End User Customer,Ship To Customer etc.</para>
 	<section>

Added: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml?rev=817524&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml (added)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml Tue Sep 22 07:39:53 2009
@@ -0,0 +1,64 @@
+<?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>Accounting Invoices.</title>
+    <para>
+        Sales invoices are generated when customers buy something from your
+        business.
+        You will need to provide a detailed list of the items bought and relevant
+        taxes paid. They are often referred to a 'tax invoices' as they
+        contain
+        information relating to the amount of sales tax (eg VAT / GST)
+        charged on the product or service.
+        </para>
+    <para> Purchase invoices are generated by your suppliers when you
+        order something from them. You may send them an order in the form of
+        a Purchase Order. They will then send you the products and an invoice
+        for payment. This invoice is the Purchase Invoice and it will contain
+        details of the items bought plus any taxes.</para>
+    <para> Both of these documents are used as proof to various tax
+        authorities (eg Inland Revenue, Customs etc) that the required tax
+        has been charged or collected.</para>
+    <para>
+        GENERAL NOTE: The following is an extract from Ian McNulty's
+        documentation work on accounting:</para>
+    <para>Invoices are created automatically by the system when
+        certain criteria are met for each item on an order. The criteria
+        will vary depending on the type of product associated with the
+        order item, and the type of order (ie purchase/sales).</para>
+    <para>For Sales Orders that include digital goods, an invoice
+        will be created when the order is placed, and that invoice will be
+        for all digital goods in the order. If there are non-digital or
+        physical goods they will go in a separate invoice.</para>
+    <para>For Sales Orders that need physical fulfillment, an
+        invoice will be created for all items in a shipment when the
+        shipment goes into the 'Packed' status.</para>
+    <para>For Purchase Orders an invoice will be created from a
+        shipment when the shipment goes into the Received status.</para>
+    <xi:include href="HELP_ACCOUNTING_findInvoices.xml" />
+    <xi:include href="HELP_ACCOUNTING_invoiceOverview.xml" />
+    <xi:include href="HELP_ACCOUNTING_editInvoice.xml" />
+    <xi:include href="HELP_ACCOUNTING_newInvoice.xml" />
+    <xi:include href="HELP_ACCOUNTING_editInvoiceApplications.xml" />
+    <xi:include href="HELP_ACCOUNTING_listInvoiceItems.xml" />
+    <xi:include href="HELP_ACCOUNTING_editInvoiceTimeEntries.xml" />
+    <xi:include href="HELP_ACCOUNTING_sendPerEmail.xml" />
+    <xi:include href="HELP_ACCOUNTING_invoiceRoles.xml" />
+    <xi:include href="HELP_ACCOUNTING_findPayments.xml" />
+</section>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml Tue Sep 22 07:39:53 2009
@@ -21,7 +21,7 @@
 	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 Edit Invoice Items help screen.</title>
+	<title>The Accounting Edit Invoice Items screen.</title>
 	<para>The Invoice Items screen displays the individual invoice line details and allows the user to update or remove an entry. As each invoice line is created it is allocated a specific sequence (or Item Number) which acts as a unique identifier.</para>
 	<section>
 		<title>How do I create a new invoice line item?</title>

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml Tue Sep 22 07:39:53 2009
@@ -22,11 +22,10 @@
 	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 help 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>
-        <title>subsection heading</title>
-        <para>subsection content</para>
-    </section>
+	   <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>
 

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml Tue Sep 22 07:39:53 2009
@@ -17,7 +17,7 @@
 	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 New Invoice help screen.</title>
+	<title>The Accounting New Invoice screen.</title>
 	<para>This screen allows the user to create a new Sales or Purchase
 		Invoice. Sales Invoices are created when a customer buys something
 		from you. Purchase Invoices are created when you buy something from a

Added: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml?rev=817524&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml (added)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml Tue Sep 22 07:39:53 2009
@@ -0,0 +1,29 @@
+<?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>Accounting Payment Gateway.</title>
+    
+    <xi:include href="HELP_ACCOUNTING_FindGatewayResponses.xml" />
+    <xi:include href="HELP_ACCOUNTING_AuthorizeTransaction.xml" />
+    <xi:include href="HELP_ACCOUNTING_CaptureTransaction.xml" />
+    <xi:include href="HELP_ACCOUNTING_ViewGatewayResponse.xml" />
+    <xi:include href="HELP_ACCOUNTING_ManualTransaction.xml" />
+    
+
+</section>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml?rev=817524&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml (added)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml Tue Sep 22 07:39:53 2009
@@ -0,0 +1,28 @@
+<?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>Accounting Payments.</title>
+    <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>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml Tue Sep 22 07:39:53 2009
@@ -17,7 +17,7 @@
 	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 Send Per Email help screen.</title>
+	<title>The Accounting Send Per Email screen.</title>
 	<para>This is used to send a copy of the invoice details to one or more
 		email addresses. The invoice is included as an attachment and the user
 		can add a simple accompanying email message.</para>

Modified: ofbiz/trunk/applications/accounting/documents/Accounting.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/documents/Accounting.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/documents/Accounting.xml (original)
+++ ofbiz/trunk/applications/accounting/documents/Accounting.xml Tue Sep 22 07:39:53 2009
@@ -22,33 +22,9 @@
 	xsi:schemaLocation="http://docbook.org/ns/docbook ../../content/dtd/docbook.xsd"
 	xmlns="http://docbook.org/ns/docbook">
 	<title>The Accounting Component.</title>
-	<section>
-		<title>Introduction</title>
-		<para>
-			Please find here a general introduction to the accounting component (to be continued)
-        </para>
-	</section>
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_main.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_findInvoices.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_editInvoice.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_newInvoice.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_findPayments.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_newPayment.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_paymentOverview.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_editPayment.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml" />
-	<xi:include href="../data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml" />
-	
+    <xi:include href="../data/helpdata/HELP_ACCOUNTING.xml" />
+    <xi:include href="../data/helpdata/HELP_ACCOUNTING_main.xml" />
+    <xi:include href="../data/helpdata/HELP_ACCOUNTING_invoices.xml" />
+    <xi:include href="../data/helpdata/HELP_ACCOUNTING_payments.xml" />
+    <xi:include href="../data/helpdata/HELP_ACCOUNTING_payment_gateway.xml" />
 </chapter>

Modified: ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml Tue Sep 22 07:39:53 2009
@@ -18,8 +18,6 @@
     under the License.
 -->
 <entity-engine-xml>
-    <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/>
-    <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
 
     <DataResource dataResourceId="APACHE_OFBIZ" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/documents/ApacheOfbiz.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="APACHE_OFBIZ_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The User &amp; Technical Apache OFBiz document in one page HTML" mimeTypeId="text/html"/>

Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml Tue Sep 22 07:39:53 2009
@@ -26,6 +26,35 @@
     <info>
         <title>Apache OFBiz official documentation.</title>
         <copyright><year>2009</year><holder>Apache Foundation.</holder></copyright>
+        <abstract>
+        <para>
+            This Book is currently in an experimental stage. It will be the start of moving the OFBiz documentation from the current 
+            <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> and the old ofbiz website (Entity documents) to the OFBiz content component. 
+            The layout is currently open for discussion by the OFBiz community. 
+        </para>
+        <para>
+            The advantages of using it within OFBiz are:
+            <orderedlist>
+                <listitem><para>No external system required for documentation</para></listitem>
+                <listitem><para>The content of the internal help files can be used within the documentation</para></listitem>
+                <listitem><para>The documentation always has the same version as the system (It is part of it)</para></listitem>
+                <listitem><para>The content is stored in a internationally accepted <link xl:href="http://docbook.org">'DocBook'</link> format</para></listitem>
+                <listitem><para>The content can be easily presented in the selected visual schemas (To be implemented)</para></listitem>
+            </orderedlist>
+        </para>
+        <para>
+            If you want to contribute to this document, you are very welcome.
+            Several possibilities exist:
+            <orderedlist>
+                <listitem><para>Convert existing OFBiz documents on the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site to the <link xl:href="http://docbook.org">docbook</link> format</link></para></listitem>
+                <listitem><para>Write new document chapters for an OFBiz component</para></listitem>
+                <listitem><para>Write new Help screens which can be inserted as sections in the document.</para></listitem>
+            </orderedlist>
+            How to contribute? It depends if you have a local OFBiz system or not. If you have, check the appendix for an explanation how the document text is stored within the OFBiz system.
+            If you do not have a local OFBiz system write your text in an xml editor using the DocBook V5.0 schema's.
+            If you have text to contribute create a Jira issue and upload your text to the issue.           
+        </para>
+        </abstract>
     </info> 
 
     <xi:include href="ApacheOfbizUser.xml"/>

Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml Tue Sep 22 07:39:53 2009
@@ -41,7 +41,14 @@
     <chapter>
         <title>Introduction.</title>
         <para>
-            Welcome to Apache OFBiz the ready to use open source ERP system.
+            Welcome to Apache OFBiz, the ready to use open source ERP system. Let me first say if you downloaded 
+            the system for the first time it will be very overwhelming because the system is pretty big what is actually pretty normal for an ERP system
+            because of its size.
+        </para>
+        <para>
+            This document is describing the technical aspects of the system. How to install it, how to load the data and how to make the system available to the Internet.
+            This is described pretty well in the 'production setup guide' in the next section. If you looking how to setup the system from a user point of view then better
+            have a look at the Apache OFBiz user guide.
         </para>
     
         <section>
@@ -50,6 +57,69 @@
                    An excellent guide to configure the system in a production environment, read the document at the <link xl:href="http://docs.ofbiz.org/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide">OFBiz documentation site</link>
             </para>
         </section>
+        
+        <section>
+            <title>The quick setup of an Ubuntu/Debian Linux Apache OFBiz server</title>
+            <orderedlist>
+            <listitem>
+                <para>Upgrade Linux to Ubuntu/Debian remotely using Grub menu</para>
+                <para>
+                    Although OFBiz will be run on most operating systems a lot of installations are done on either Debian or
+                    Ubuntu which is also based on Debian.
+                </para>
+                <para>
+                    If you have a version if Linux running already on your server which using the GRUB menu, it is possible to upgrade to Debian/Ubuntu
+                    without even touching the server physically. With the method below the debian installer is loaded into a Ram disk from where it can
+                    reformat and repartition the harddisk and install the system.
+                    Practice this first on a local server, because if after the reboot the server is unreachable you have to ask somebody at the datacenter to manually reboot the system.
+                </para>
+                <orderedlist>
+                    <listitem>
+                        <para>Get the OS kernel and the related initrd.gz</para>
+                        <para>
+                            Make sure you server can handle 64bit if you take that version, if not sure take the 32bit version.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Uncompress the initrd.gz</para>
+                    </listitem>
+                    <listitem>
+                        <para>Edit the initrd.gz content</para>
+                    </listitem>
+                    <listitem>
+                        <para>Create the new Archive</para>
+                    </listitem>
+                    <listitem>
+                        <para>Copy the Kernel and the new initrd.gz to the server</para>
+                        <para>
+                            Logon to your server and copy these to files to the /boot/grub directory.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Copy the Kernel and the new initrd.gz to the server</para>
+                    </listitem>
+                    <listitem>
+                        <para>Edit the /boot/grub/menu.lst file</para>
+                    </listitem>
+                    <listitem>
+                        <para>Reboot the server</para>
+                    </listitem>
+                </orderedlist>
+            </listitem>            
+            <listitem>
+                <para>Install Apache</para>
+            </listitem>            
+            <listitem>
+                <para>Install PostGreSQl</para>
+            </listitem>            
+            <listitem>
+                <para>Install Ofbiz</para>
+            </listitem>            
+            <listitem>
+                <para>Install Ubuntu</para>
+            </listitem>
+            </orderedlist>
+        </section>
     
 
         <xi:include href="../../../framework/documents/Framework.xml"/>

Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml Tue Sep 22 07:39:53 2009
@@ -27,36 +27,6 @@
 	    <title>Apache OFBiz User documentation</title>
         <copyright><year>2009</year><holder>Apache Foundation</holder></copyright>
 	</info>	
-
-    <preface>
-        <para>
-            This Book is currently in an experimental stage. It will be the start of moving the OFBiz documentation from the current 
-            <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> and the old ofbiz website (Entity documents) to the OFBiz content component. 
-            The layout is currently open for discussion by the OFBiz community. 
-        </para>
-        <para>
-            The advantages of using it within OFBiz are:
-            <orderedlist>
-                <listitem><para>No external system required for documentation</para></listitem>
-                <listitem><para>The content of the internal help files can be used within the documentation</para></listitem>
-                <listitem><para>The documentation always has the same version as the system (It is part of it)</para></listitem>
-                <listitem><para>The content is stored in a internationally accepted <link xl:href="http://docbook.org">'DocBook'</link> format</para></listitem>
-                <listitem><para>The content can be easily presented in the selected visual schemas (To be implemented)</para></listitem>
-            </orderedlist>
-        </para>
-        <para>
-            If you want to contribute to this document, you are very welcome.
-            Several possibilities exist:
-            <orderedlist>
-                <listitem><para>Convert existing OFBiz documents on the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site to the <link xl:href="http://docbook.org">docbook</link> format</link></para></listitem>
-                <listitem><para>Write new document chapters for an OFBiz component</para></listitem>
-                <listitem><para>Write new Help screens which can be inserted as sections in the document.</para></listitem>
-            </orderedlist>
-            How to contribute? It depends if you have a local OFBiz system or not. If you have, check the appendix for an explanation how the document text is stored within the OFBiz system.
-            If you do not have a local OFBiz system write your text in an xml editor using the DocBook V5.0 schema's.
-            If you have text to contribute create a Jira issue and upload your text to the issue.           
-        </para>
-    </preface>
     
     <chapter>
         <title>Introduction</title>

Modified: ofbiz/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentHelpData.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentHelpData.xml Tue Sep 22 07:39:53 2009
@@ -18,6 +18,15 @@
 under the License.
 -->
 <entity-engine-xml>
+
+    <Content contentId="HELP_MYPORTAL"/><!--  portlets are in most components -->
+    <Content contentId="HELP_ROOT"/><!-- should be in the first component loaded -->
+    <PortletCategory portletCategoryId="REPORT" description="Reports"/>
+    <DataResource dataResourceId="HELP_TEMPL"/><!--  further defined in the content component -->
+
+    <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/>
+    <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+
     <!-- system document root used in content -> navigate -->
     <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/>
     <!-- show help on the system document root -->

Modified: ofbiz/trunk/applications/content/data/PartyHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/PartyHelpData.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/PartyHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/PartyHelpData.xml Tue Sep 22 07:39:53 2009
@@ -18,14 +18,6 @@
 under the License.
 -->
 <entity-engine-xml>
-    <!--  party is first component loaded so need these files -->
-    <Content contentId="HELP_MYPORTAL"/><!--  portlets are in most components -->
-    <Content contentId="HELP_ROOT"/><!-- should be in the first component loaded -->
-    <PortletCategory portletCategoryId="REPORT" description="Reports"/>
-    <DataResource dataResourceId="HELP_TEMPL"/><!--  further defined in the content component -->
-
-
-    <!-- help files -->
     <DataResource dataResourceId="HELP_PARTY" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/party/data/helpdata/HELP_PARTY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
         dataResourceName="Party Overview" mimeTypeId="text/xml" isPublic="Y" />

Added: ofbiz/trunk/applications/content/data/SeleniumHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/SeleniumHelpData.xml?rev=817524&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/data/SeleniumHelpData.xml (added)
+++ ofbiz/trunk/applications/content/data/SeleniumHelpData.xml Tue Sep 22 07:39:53 2009
@@ -0,0 +1,38 @@
+<?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.
+-->
+
+<entity-engine-xml>
+    <!-- example test suite -->
+    <SeleniumTestSuitePath testSuiteId="EXAMPLE_TESTSUITE" testSuiteName="example_testsuite" testSuitePath="framework/testtools/testdef/seleniumxml/example/example_testsuite.xml" description="test suite for example component"/>
+    
+    <!--Selenium Help  Load in contentTypeData.xml file -->
+    <!-- selenium test tool-->   
+    <DataResource dataResourceId="SELENIUM_INTRO" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="framework/testtools/documents/OfbizSeleniumIntro.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ofbiz Selenium Setup" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="SELENIUM_INTRO" contentTypeId="DOCUMENT" contentName="OFBiz Selenium" templateDataResourceId="HELP_TEMPL" dataResourceId="SELENIUM_INTRO" localeString="en" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>    
+    <ContentAssoc contentId="DOCUMENTS"  mapKey="SELENIUM_INTRO" contentIdTo="SELENIUM_INTRO" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    
+    <DataResource dataResourceId="SELENIUM_HTTPS" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="framework/testtools/documents/OfbizSeleniumSetupHTTPS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ofbiz Selenium HTTPS" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="SELENIUM_HTTPS" contentTypeId="DOCUMENT" contentName="OFBiz Selenium with HTTPS" templateDataResourceId="HELP_TEMPL" dataResourceId="SELENIUM_HTTPS" localeString="en" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>    
+    <ContentAssoc contentId="DOCUMENTS" mapKey="SELENIUM_INTRO" contentIdTo="SELENIUM_HTTPS" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    
+    <ContentAssoc contentId="SELENIUM_INTRO" mapKey="SELENIUM_INTRO" contentIdTo="SELENIUM_HTTPS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>    
+    <ContentAssoc contentId="HELP_ROOT" mapKey="SELENIUM_INTRO" contentIdTo="SELENIUM_INTRO" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+     
+ </entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/content/data/SeleniumHelpData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/data/SeleniumHelpData.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/content/data/SeleniumHelpData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Tue Sep 22 07:39:53 2009
@@ -38,8 +38,11 @@
     <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/> <!-- party is loaded first and this file needs contentTypeData -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
+    <!-- these files cannot be loaded in their original component because they are earlier than the content component -->
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/SeleniumHelpData.xml"/>
+
     <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogUsersData.xml"/>

Modified: ofbiz/trunk/framework/testtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/ofbiz-component.xml?rev=817524&r1=817523&r2=817524&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/testtools/ofbiz-component.xml Tue Sep 22 07:39:53 2009
@@ -35,8 +35,6 @@
     <!-- entitydef -->
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     
-    <entity-resource type="data" reader-name="seed" loader="main" location="documents/SeleniumHelpData.xml"/>
-    
     <!-- service resources: model(s), eca(s) and group definitions -->
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>