You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/11/17 08:45:08 UTC
svn commit: r881180 - /ofbiz/trunk/applications/accounting/data/helpdata/
Author: jleroux
Date: Tue Nov 17 07:45:07 2009
New Revision: 881180
URL: http://svn.apache.org/viewvc?rev=881180&view=rev
Log:
A patch from Sharan Foga "Special feature to allow submitting patches for online help update" (https://issues.apache.org/jira/browse/OFBIZ-2219) - OFBIZ-2219
This patch is mainly just some help text reformatting using the itemizedlist and orderedlist docbook commands for the Invoices and Payments submenus them easier to read.
I've also corrected a minor spelling mistake in the billing accounts and noticed that the Find Payments help screen was under Invoices instead of Payments so have moved that to the correct place,
Modified:
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.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_editPayment.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.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_invoices.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml Tue Nov 17 07:45:07 2009
@@ -32,16 +32,18 @@
be given a 'grace period' after which the invoice is due.</para>
<section>
<title>How do I find Purchase Invoices by Due Date?</title>
- <para>Press the 'Find Purchase Invoices by Due Date' button</para>
- <para>The Find Purchase Invoices by Due Date screen is displayed
- </para>
- <para>Enter the 'Organization Party Id' (eg. Normally this will be
- Company)</para>
- <para>Enter the 'Party Id' that the Purchase Invoice (eg. Normally
- this will be the Supplier Party Id)</para>
- <para>Enter a number in the 'Days Offset' field that represents the
+ <orderedlist>
+ <listitem><para>Press the 'Find Purchase Invoices by Due Date' button</para></listitem>
+ <listitem><para>The Find Purchase Invoices by Due Date screen is displayed
+ </para></listitem>
+ <listitem><para>Enter the 'Organization Party Id' (eg. Normally this will be
+ Company)</para></listitem>
+ <listitem><para>Enter the 'Party Id' that the Purchase Invoice (eg. Normally
+ this will be the Supplier Party Id)</para></listitem>
+ <listitem><para>Enter a number in the 'Days Offset' field that represents the
number of in which the invoice will become due (eg If an invoice is
- due to be paid in 5 days then enter 5 or greater)</para>
- <para>Press the 'Select' button</para>
+ due to be paid in 5 days then enter 5 or greater)</para></listitem>
+ <listitem><para>Press the 'Select' button</para></listitem>
+ </orderedlist>
</section>
</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml Tue Nov 17 07:45:07 2009
@@ -25,7 +25,7 @@
without triggering late payment penalties. The 'Invoice Date' can be
defined as the date that the invoice was created and this is normally
based on when products were shipped or services were provided.</para>
-
+
<para>NOTE TO CHECK: There appears to be a minor bug here as if the
Invoice 'Due Date' is different to the Invoice Date (eg. Invoice
Creation Date) then the Invoice Date is used as the Due Date in this
@@ -39,15 +39,14 @@
OFBiz including the use of agreements and billing accounts).
</para>
<para>This screen can be used to locate Sales Invoices as follows:
- </para>
-
- <para>* That will become due within a fixed timeframe (eg the next 5
- days)</para>
- <para>* That may already be overdue</para>
- <para>* That have been automatically generated by the system (eg as a
+ </para><itemizedlist>
+ <listitem><para>That will become due within a fixed timeframe (eg the next 5
+ days)</para></listitem>
+ <listitem><para>That may already be overdue</para></listitem>
+ <listitem><para>That have been automatically generated by the system (eg as a
result of Agreements based on payment in 30 days etc....TO CHECK)
- </para>
-
+ </para></listitem>
+ </itemizedlist>
<para>NOTE: See details from Jacopo below regarding future work
regarding Find Sales Invoice by Due Date and Find Purchase Invoice by
Due Date functionality:</para>
@@ -62,15 +61,17 @@
is still a lot of work to do to make them usable. </para>
<section>
<title>How do I find a Sales Invoice by Due Date?</title>
- <para>Press the 'Find Sales Invoices by Due Date' button</para>
- <para>The Find Sales Invoices by Due Date screen is displayed</para>
- <para>Enter the 'Organization Party Id' (eg. Normally this will be
- Company)</para>
- <para>Enter the 'Party Id' that the Sales Invoice (eg. Normally this
- will be the Customer Party Id)</para>
- <para>Enter a number in the 'Days Offset' field that represents the
+ <orderedlist>
+ <listitem><para>Press the 'Find Sales Invoices by Due Date' button</para></listitem>
+ <listitem><para>The Find Sales Invoices by Due Date screen is displayed</para></listitem>
+ <listitem><para>Enter the 'Organization Party Id' (eg. Normally this will be
+ Company)</para></listitem>
+ <listitem><para>Enter the 'Party Id' that the Sales Invoice (eg. Normally this
+ will be the Customer Party Id)</para></listitem>
+ <listitem><para>Enter a number in the 'Days Offset' field that represents the
number of in which the invoice will become due (eg If an invoice is
- due to be paid in 5 days then enter 5 or greater)</para>
- <para>Press the 'Select' button</para>
+ due to be paid in 5 days then enter 5 or greater)</para></listitem>
+ <listitem><para>Press the 'Select' button</para></listitem>
+ </orderedlist>
</section>
</section>
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml Tue Nov 17 07:45:07 2009
@@ -20,13 +20,15 @@
<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>
+ changed are Due Date, Description, Currency.</para>
<section>
<title>How do I update the header details for an Invoice?</title>
- <para>Select the 'Header' sub menu and the header details of the
- invoice will be displayed</para>
- <para>Update the fields required</para>
- <para> Press the 'Update' button</para>
+ <orderedlist>
+ <listitem><para>Select the 'Header' sub menu and the header details of the
+ invoice will be displayed</para></listitem>
+ <listitem><para>Update the fields required</para></listitem>
+ <listitem><para> Press the 'Update' button</para></listitem>
+ </orderedlist>
</section>
</section>
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml Tue Nov 17 07:45:07 2009
@@ -22,15 +22,17 @@
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
this. The screen is divided into 3 main areas as follows.</para>
- <para> * Payments Applied (which shows details of the total amount
+ <itemizedlist>
+ <listitem><para>Payments Applied (which shows details of the total amount
'Applied' and the total amount 'Open'. Note that 'Open' here means
- outstanding)</para>
- <para>* Possible Payments to Apply (which shows all the payments that
+ outstanding)</para></listitem>
+ <listitem><para>Possible Payments to Apply (which shows all the payments that
have been sent from the same party id as the invoice - for a sales
- invoice this would be the customer party id)</para>
- <para> * Assign Payment to Invoice (which allows you to manually assign
- a specific payment id to this invoice)</para>
- <para>GENERAL NOTE: General Ledger accounting transactions are
+ invoice this would be the customer party id)</para></listitem>
+ <listitem><para>Assign Payment to Invoice (which allows you to manually assign
+ a specific payment id to this invoice)</para></listitem>
+ </itemizedlist>
+ <para>GENERAL NOTE: General Ledger accounting transactions are
generated during the payment application process but unless your GL is
setup with Unapplied Cash and Applied Cash accounts - I'm not sure
that there will be any true accounting impact. In the Sales Order
@@ -59,34 +61,38 @@
multiple payments being applied to it.</para>
<section>
<title>How do I apply a payment (or payments) to an invoice?</title>
- <para>Select the 'Applications' sub menu for the invoice</para>
- <para>A list of unapplied payments for the party id will be displayed
- </para>
- <para>Press the 'Apply' button next to the entry that needs to be
+ <orderedlist>
+ <listitem><para>Select the 'Applications' sub menu for the invoice</para></listitem>
+ <listitem><para>A list of unapplied payments for the party id will be displayed
+ </para></listitem>
+ <listitem><para>Press the 'Apply' button next to the entry that needs to be
applied to the invoice (NOTE: More than one entry may be used. Also
only part of a larger amount may be used)The Payments Applied total
at the top of the screen will be updated with the amount selected.
- Also the Amount Open will be reduced by the amount selected.</para>
- <para> Once the total invoice amount has been selected a message will
+ Also the Amount Open will be reduced by the amount selected.</para></listitem>
+ <listitem><para> Once the total invoice amount has been selected a message will
be displayed and only the first part of the screen will be displayed
- </para>
- <para>The top part of the screen will now be updated to show the
+ </para></listitem>
+ <listitem><para>The top part of the screen will now be updated to show the
'Payments Applied' total is equal to the invoice total and the
- 'Amount Open' is zero. </para>
+ 'Amount Open' is zero. </para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I update an applied payment for an invoice?</title>
- <para>Payments that have been applied to an invoice can be updated.
+ <orderedlist>
+ <listitem><para>Payments that have been applied to an invoice can be updated.
This means that you can change the details of the payment transaction
- or adjust the amount that was applied to the invoice.</para>
- <para>Select the 'Applications' sub menu for the invoice</para>
- <para>A list of payments already applied to the invoice will be
- displayed in the top part of the screen</para>
- <para>Enter or use the lookup to change the 'Payment Id' if required
- </para>
- <para>Enter the updated amount in the 'Amount to Apply' field if
- required</para>
- <para>Press the 'Update' button</para>
+ or adjust the amount that was applied to the invoice.</para></listitem>
+ <listitem><para>Select the 'Applications' sub menu for the invoice</para></listitem>
+ <listitem><para>A list of payments already applied to the invoice will be
+ displayed in the top part of the screen</para></listitem>
+ <listitem><para>Enter or use the lookup to change the 'Payment Id' if required
+ </para></listitem>
+ <listitem><para>Enter the updated amount in the 'Amount to Apply' field if
+ required</para></listitem>
+ <listitem><para>Press the 'Update' button</para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I remove an applied payment (or payments) from an
@@ -94,13 +100,14 @@
<para>NOTE TO CHECK: It can be done before transaction has been posted
to GL but also need to check if its can be done if the transaction
has been posted. </para>
- <para>Select the 'Applications' sub menu for the invoice</para>
- <para>A list of payments already applied to the invoice will be
- displayed in the top part of the screen</para>
- <para>Press the 'Remove' button next to the payment entry that needs
- to be removed</para>
- <para>The entry will be removed and the top part of the screen will be
- update the 'Payments Applied' total and 'Amount Open'</para>
-
+ <orderedlist>
+ <listitem><para>Select the 'Applications' sub menu for the invoice</para></listitem>
+ <listitem><para>A list of payments already applied to the invoice will be
+ displayed in the top part of the screen</para></listitem>
+ <listitem><para>Press the 'Remove' button next to the payment entry that needs
+ to be removed</para></listitem>
+ <listitem><para>The entry will be removed and the top part of the screen will be
+ update the 'Payments Applied' total and 'Amount Open'</para></listitem>
+ </orderedlist>
</section>
</section>
\ No newline at end of file
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml Tue Nov 17 07:45:07 2009
@@ -24,10 +24,13 @@
track any individual work or billable hours against an invoice.</para>
<section>
<title>How do I add a new time entry for an invoice?</title>
- <para>Two options: Add time entry to a new invoice and add time entry
- to an existing invoice.</para>
- <para>Timesheet entries can be added to an existing invoice from
- Workeffort Manager.</para>
+ <para>Threre are two options</para>
+ <orderedlist>
+ <listitem><para>Add time entry to a new invoice and add time entry
+ to an existing invoice.</para></listitem>
+ <listitem><para>Timesheet entries can be added to an existing invoice from
+ Workeffort Manager.</para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I update a time entry for an invoice?</title>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml Tue Nov 17 07:45:07 2009
@@ -22,21 +22,24 @@
transaction and allows all fields to be updated if required. </para>
<para>The following options are currently available from this screen:
- </para>
- <para>* Create New (Create a new payment)</para>
- <para>* Status to 'Received' (Change the status of the current payment
+ </para><itemizedlist>
+ <listitem><para>Create New (Create a new payment)</para></listitem>
+ <listitem><para>Status to 'Received' (Change the status of the current payment
to 'Received. NOTE: This will create the relevant accounting
- transactions and post them to the general ledger)</para>
- <para>* Status to 'Cancelled' (Change the status of the current payment
- to 'Cancelled')</para>
- <para>* Status to 'Confirmed' (Change the status of the current invoice
+ transactions and post them to the general ledger)</para></listitem>
+ <listitem><para>Status to 'Cancelled' (Change the status of the current payment
+ to 'Cancelled')</para></listitem>
+ <listitem><para>Status to 'Confirmed' (Change the status of the current invoice
to 'Confirmed'. NOTE: This status option will not appear until the
- status has been changed to 'Received')</para>
+ status has been changed to 'Received')</para></listitem>
+ </itemizedlist>
<section>
<title>How do I update the header details for a Payment?</title>
- <para>Select the 'Header' sub menu and the header details of the
- payment will be displayed</para>
- <para>Update the fields required</para>
- <para>Press the 'Update' button</para>
+ <orderedlist>
+ <listitem><para>Select the 'Header' sub menu and the header details of the
+ payment will be displayed</para></listitem>
+ <listitem><para>Update the fields required</para></listitem>
+ <listitem><para>Press the 'Update' button</para></listitem>
+ </orderedlist>
</section>
</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml Tue Nov 17 07:45:07 2009
@@ -21,38 +21,35 @@
<para>The Payments Applications sub menu is where payments that have
been made (or received) can be linked or allocated to an invoice,
another payment, a billing account or a tax authority.</para>
-
<para>NOTE: General Ledger accounting transactions are generated during
- the
- payment application process but unless your GL is setup with
- Unapplied
- Cash and Applied Cash accounts - I'm not sure that there will
- be any
- true accounting impact. In the Sales Order process the
- accounting
- transaction generated the following GL Accounting
- transaction is
- generated for 'Payment Applied'</para>
- <para>The following options are currently available from this screen:
- </para>
- <para>* Create New (Create a new payment)</para>
- <para>* Status to 'Received' (Change the status of the current payment
+ the payment application process but unless your GL is setup with
+ Unapplied Cash and Applied Cash accounts - I'm not sure that there will
+ be any true accounting impact. In the Sales Order process the
+ accounting transaction generated the following GL Accounting
+ transaction is generated for 'Payment Applied'</para>
+ <para>The following options are currently available from this screen:
+ </para><itemizedlist>
+ <listitem><para>Create New (Create a new payment)</para></listitem>
+ <listitem><para>Status to 'Received' (Change the status of the current payment
to 'Received. NOTE: This will create the relevant accounting
- transactions and post them to the general ledger)</para>
- <para>* Status to 'Cancelled' (Change the status of the current payment
- to 'Cancelled')</para>
- <para> * Status to 'Confirmed' (Change the status of the current
+ transactions and post them to the general ledger)</para></listitem>
+ <listitem><para>Status to 'Cancelled' (Change the status of the current payment
+ to 'Cancelled')</para></listitem>
+ <listitem><para>Status to 'Confirmed' (Change the status of the current
invoice to 'Confirmed'. NOTE: This status option will not appear until
the status has been changed to 'Received')
- </para>
+ </para></listitem>
+ </itemizedlist>
<section>
<title>How do I apply a payment to an invoice?</title>
- <para>Select the 'Applications' sub menu for the payment</para>
- <para>A list of invoices will be displayed in the 'Possible Invoices
+ <orderedlist>
+ <listitem><para>Select the 'Applications' sub menu for the payment</para></listitem>
+ <listitem><para>A list of invoices will be displayed in the 'Possible Invoices
to Apply' box (NOTE: If no open invoices exist for the party that is
- sending the payment then this may not list any invoices)</para>
- <para>Press the 'Apply' button next to the invoice (or invoices) that
- this payment is for</para>
+ sending the payment then this may not list any invoices)</para></listitem>
+ <listitem><para>Press the 'Apply' button next to the invoice (or invoices) that
+ this payment is for</para></listitem>
+ </orderedlist>
<para>NOTE: Although it can be overriden the 'Amount to Apply' field
will default to the lesser of the invoice total or the payment
amount. This can be shown by examples as follows:</para>
@@ -65,24 +62,26 @@
<section>
<title>How do I apply a payment to an invoice, tax authority, billing
account or another payment?</title>
- <para>Select the 'Applications' sub menu for the payment</para>
- <para>Using the 'Apply this payment to' box at the bottom of the
- screen</para>
- <para>Enter or use the lookup to enter the 'Invoice Id' to apply the
+ <orderedlist>
+ <listitem><para>Select the 'Applications' sub menu for the payment</para></listitem>
+ <listitem><para>Using the 'Apply this payment to' box at the bottom of the
+ screen</para></listitem>
+ <listitem><para>Enter or use the lookup to enter the 'Invoice Id' to apply the
payment to (NOTE: This can be used if the invoice is to another party
eg ordered by a subsidiary but paid for by another company of the
- same group)</para>
- <para>Enter or use the lookup to enter the 'To Payment Id' to apply
+ same group)</para></listitem>
+ <listitem><para>Enter or use the lookup to enter the 'To Payment Id' to apply
the payment to if required (NOTE TO CHECK: How does this work....?)
- </para>
- <para>Enter or use the lookup to enter the 'Billing Account Id' to
- apply the payment to if required</para>
- <para>Enter or use the drop down box to select the 'Tax Auth Geo Id'
+ </para></listitem>
+ <listitem><para>Enter or use the lookup to enter the 'Billing Account Id' to
+ apply the payment to if required</para></listitem>
+ <listitem><para>Enter or use the drop down box to select the 'Tax Auth Geo Id'
to apply the payment to if required (NOTE TO CHECK: This is a country
- so need to test how this actually works......)</para>
- <para>Enter an amount in the 'Amount to Apply' (NOTE: This must be
- less than or equal to the payment amount)</para>
- <para>Press the 'Apply' button
- </para>
+ so need to test how this actually works......)</para></listitem>
+ <listitem><para>Enter an amount in the 'Amount to Apply' (NOTE: This must be
+ less than or equal to the payment amount)</para></listitem>
+ <listitem><para>Press the 'Apply' button
+ </para></listitem>
+ </orderedlist>
</section>
</section>
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml Tue Nov 17 07:45:07 2009
@@ -24,43 +24,51 @@
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>
+ <orderedlist>
+ <listitem><para>Press the 'Search' button to view all invoices</para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I locate an existing invoice?</title>
- <para>Enter the 'Invoice ID' if known</para>
- <para>Enter a word from the invoice description in the 'Description'
- field if known</para>
- <para>Enter the 'Invoice Type' if known</para>
- <para>Enter the 'From Party Id' if known (NOTE: In most cases for a
+ <orderedlist>
+ <listitem><para>Enter the 'Invoice ID' if known</para></listitem>
+ <listitem><para>Enter a word from the invoice description in the 'Description'
+ field if known</para></listitem>
+ <listitem><para>Enter the 'Invoice Type' if known</para></listitem>
+ <listitem><para>Enter the 'From Party Id' if known (NOTE: In most cases for a
Sales Invoices this will be Company. For Purchase Invoice it will be
- the supplier party id)</para>
- <para>Enter the 'Billing Account Id' if known</para>
- <para>Enter the invoice status in the 'Status Id' field if known
- </para>
- <para>Enter the 'To Party Id' if known (NOTE: In most cases for a
+ the supplier party id)</para></listitem>
+ <listitem><para>Enter the 'Billing Account Id' if known</para></listitem>
+ <listitem><para>Enter the invoice status in the 'Status Id' field if known
+ </para></listitem>
+ <listitem><para>Enter the 'To Party Id' if known (NOTE: In most cases for a
Purchase Invoice this will be company. For Sales Invoices it will be
- the customer party id)</para>
- <para>Press the 'Search' button to view all invoices</para>
- <para>All invoices that meet the search criteria will be displayed.
- </para>
+ the customer party id)</para></listitem>
+ <listitem><para>Press the 'Search' button to view all invoices</para></listitem>
+ <listitem><para>All invoices that meet the search criteria will be displayed.
+ </para></listitem>
+ </orderedlist>
</section>
-
<section>
<title>How do I update an invoice?</title>
- <para>Locate the invoice using the 'Find Invoices' screen</para>
- <para>Using the relevant sub menu make the required changes.</para>
+ <orderedlist>
+ <listitem><para>Locate the invoice using the 'Find Invoices' screen</para></listitem>
+ <listitem><para>Using the relevant sub menu make the required changes.</para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I delete an invoice?</title>
<para>Invoices cannot be deleted through the user interface. They can
only be cancelled (eg if they have been entered or created by
mistake).</para>
+
<para>NOTE: They can probably be deleted using Entity Data Maintenance
in the Webtools menu but this is not recommended for 2 reasons:
</para>
- <para>1. it may cause data integrity problems.</para>
- <para>2. In case of audit it would be a problem.
- </para>
+ <orderedlist>
+ <listitem><para>It may cause data integrity problems.</para></listitem>
+ <listitem><para>In case of audit it would be a problem.
+ </para></listitem>
+ </orderedlist>
</section>
</section>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml Tue Nov 17 07:45:07 2009
@@ -33,35 +33,41 @@
automatically by the system or manually by the user. There are
links
from this page that can be used to do the following: </para>
- <para>Create a new incoming or outgoing payment
- </para>
- <para>Find Sales Invoices by due date
- </para>
- <para>Find Purchase Invoices by due date </para>
+ <itemizedlist>
+ <listitem><para>Create a new incoming or outgoing payment
+ </para></listitem>
+ <listitem><para>Find Sales Invoices by due date
+ </para></listitem>
+ <listitem><para>Find Purchase Invoices by due date </para></listitem>
+ </itemizedlist>
<section>
<title>How do I view all payments?</title>
- <para>Press the 'Search' button to view all payments</para>
+ <orderedlist>
+ <listitem><para>Press the 'Search' button to view all payments</para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I locate an existing payment?</title>
- <para>Enter the 'Payment ID' if known</para>
- <para>Enter a word from the payments 'Comment'field if known</para>
- <para>Enter the 'Payment Type Id' if known</para>
- <para>Enter the 'From Party Id' if known (NOTE: In most cases for an
- incoming payment this will be the customer party id)</para>
- <para>Enter the payment amount in the 'Amount' field if known</para>
- <para>Enter some details from the payment reference number in the
+ <orderedlist>
+ <listitem><para>Enter the 'Payment ID' if known</para></listitem>
+ <listitem><para>Enter a word from the payments 'Comment'field if known</para></listitem>
+ <listitem><para>Enter the 'Payment Type Id' if known</para></listitem>
+ <listitem><para>Enter the 'From Party Id' if known (NOTE: In most cases for an
+ incoming payment this will be the customer party id)</para></listitem>
+ <listitem><para>Enter the payment amount in the 'Amount' field if known</para></listitem>
+ <listitem><para>Enter some details from the payment reference number in the
'Reference No' field if known
- </para>
- <para>Enter the status of the payment in the 'Status Id' field if
- known</para>
- <para>Enter the 'To Party Id' if known (NOTE: In most cases for an
+ </para></listitem>
+ <listitem><para>Enter the status of the payment in the 'Status Id' field if
+ known</para></listitem>
+ <listitem><para>Enter the 'To Party Id' if known (NOTE: In most cases for an
incoming payment this will the the customer party id. For outgoing
payments this will be the supplier id, or customer id for a refund)
- </para>
- <para>Press the 'Search' button to view all payments</para>
- <para>All payments that meet the search criteria will be displayed.
- </para>
+ </para></listitem>
+ <listitem><para>Press the 'Search' button to view all payments</para></listitem>
+ <listitem><para>All payments that meet the search criteria will be displayed.
+ </para></listitem>
+ </orderedlist>
</section>
</section>
\ No newline at end of file
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml Tue Nov 17 07:45:07 2009
@@ -25,24 +25,16 @@
<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>
- * Create New (Create a new invoice)
- </para><para>
- * Copy (Create a copy of the current invoice)
- </para><para>
- * PDF (View a PDF of the current invoice)
- </para><para>
- * PDF default currency (NOTE TO CHECK: Need to see how this is different from just the PDF view......)
- </para><para>
- * Status to 'Approved' (Change the status of the current invoice to 'Approved)
- </para><para>
- * Status to 'Sent' (Change the status of the current invoice to 'Sent')
- </para><para>
- * Status to 'Ready' (Change the status of the current invoice to 'Ready'. NOTE: This will create the relevant accounting transactions and post them to the general ledger)
- </para><para>
- * Status to 'Cancelled' (Change the status of the current invoice to 'Cancelled')
- </para><para>
- * Save as Template (NOTE TO CHECK: Save the current invoice format as a template)
- </para>
+ <itemizedlist>
+ <listitem><para>Create New (Create a new invoice)</para></listitem>
+ <listitem><para>Copy (Create a copy of the current invoice)</para></listitem>
+ <listitem><para>PDF (View a PDF of the current invoice)</para></listitem>
+ <listitem><para>PDF default currency (NOTE TO CHECK: Need to see how this is different from just the PDF view......)</para></listitem>
+ <listitem><para>Status to 'Approved' (Change the status of the current invoice to 'Approved)</para></listitem>
+ <listitem><para>Status to 'Sent' (Change the status of the current invoice to 'Sent')</para></listitem>
+ <listitem><para>Status to 'Ready' (Change the status of the current invoice to 'Ready'. NOTE: This will create the relevant accounting transactions and post them to the general ledger)</para></listitem>
+ <listitem><para>Status to 'Cancelled' (Change the status of the current invoice to 'Cancelled')</para></listitem>
+ <listitem><para>Save as Template (NOTE TO CHECK: Save the current invoice format as a template)</para></listitem>
+ </itemizedlist>
</section>
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml Tue Nov 17 07:45:07 2009
@@ -27,14 +27,16 @@
<section>
<title>How do I add a party role to an invoice?</title>
<para>Party roles will automatically be added to an invoices that have been generated as a result of E-Commerce order entry or Sales Order entry. They can also be added be added manually.</para>
- <para>Select the 'Roles' sub menu</para>
- <para>Enter or use the lookup to enter the party to be added to the invoice in the 'Party Id' field</para>
- <para>Use the drop down box to select the 'Role Type Id' </para>
- <para>Leave the 'Date Time Performed' field blank (NOTE: This field is optional and can be entered if required. This field can be used to indicate the date and time this role was performed by the party for this invoice)</para>
- <para>Leave the 'Percentage' field blank (NOTE: This field is optional and can be entered if required. If roles are shared then this field can be used to indicate the assigned percentage for this role) </para>
- <para>Press the 'Submit' button</para>
- <para>The new role entry will be displayed on the bottom part of the screen</para>
- <para>NOTE: If you select a role that is not associated with the party that has been entered an error message will be displayed. To fix it you will need to add the role to the party or choose another party that already has that role associated with it.</para>
+ <orderedlist>
+ <listitem><para>Select the 'Roles' sub menu</para></listitem>
+ <listitem><para>Enter or use the lookup to enter the party to be added to the invoice in the 'Party Id' field</para></listitem>
+ <listitem><para>Use the drop down box to select the 'Role Type Id' </para></listitem>
+ <listitem><para>Leave the 'Date Time Performed' field blank (NOTE: This field is optional and can be entered if required. This field can be used to indicate the date and time this role was performed by the party for this invoice)</para></listitem>
+ <listitem><para>Leave the 'Percentage' field blank (NOTE: This field is optional and can be entered if required. If roles are shared then this field can be used to indicate the assigned percentage for this role) </para></listitem>
+ <listitem><para>Press the 'Submit' button</para></listitem>
+ <listitem><para>The new role entry will be displayed on the bottom part of the screen</para></listitem>
+ <listitem><para>NOTE: If you select a role that is not associated with the party that has been entered an error message will be displayed. To fix it you will need to add the role to the party or choose another party that already has that role associated with it.</para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I update a party role on an invoice?</title>
@@ -42,8 +44,10 @@
</section>
<section>
<title>How do I remove a party role from an invoice?</title>
- <para>Locate the entry that needs to be removed</para>
- <para>Press the 'Remove' button next to the entry that needs to be deleted</para>
- <para>The entry is now removed from the list of invoice roles </para>
+ <orderedlist>
+ <listitem><para>Locate the entry that needs to be removed</para></listitem>
+ <listitem><para>Press the 'Remove' button next to the entry that needs to be deleted</para></listitem>
+ <listitem><para>The entry is now removed from the list of invoice roles </para></listitem>
+ </orderedlist>
</section>
</section>
\ No newline at end of file
Modified: 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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml Tue Nov 17 07:45:07 2009
@@ -60,5 +60,4 @@
<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
+ </section>
\ No newline at end of file
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml Tue Nov 17 07:45:07 2009
@@ -26,34 +26,40 @@
<section>
<title>How do I create a new invoice line item?</title>
<para>Note that only invoices that have specific statuses can have new line items created. This means that if an invoice has already been paid and processed OFBiz will not allow any amendments to it.</para>
- <para>Select the 'Items' sub menu for the invoice</para>
- <para>The 'Add a new invoice item' screen will be displayed</para>
- <para>Leave the 'Item No' field blank (as it will be automatically generated)</para>
- <para>Select the 'Invoice Item Type' from the drop down box (NOTE: A typical line using the demo could be 'Invoice Finished Good Item' but ensure that it corresponds with the type of products setup in your catalog)</para>
- <para>Enter a description describing what the line item is (NOTE: If you are going to enter a product in the Product Id field from the catalog then leave the 'Description' field blank as it will be used to show the product description)</para>
- <para>Leave the 'Override GL Account Id' field blank as it will use the default account based on the Chart of Accounts setup</para>
- <para>Use the lookup or enter a product code in the 'Product Id' field (NOTE: This can be left blank if your invoice line is not related to a product in the catalog)</para>
- <para>Enter a number in the 'Quantity' field</para>
- <para>Enter a 'Unit Price' only if the Product Id field is blank (NOTE: If a Product Id has been entered then leave the 'Unit Price' field blank as it will pick up the product price from the catalog)</para>
- <para>Leave the 'Inventory Item' field blank</para>
- <para>Leave the 'Product Feature Id' field blank</para>
- <para>Leave the 'UOM' field blank</para>
- <para>Select 'Yes' for the 'Taxable Flag' field</para>
+ <orderedlist>
+ <listitem><para>Select the 'Items' sub menu for the invoice</para></listitem>
+ <listitem><para>The 'Add a new invoice item' screen will be displayed</para></listitem>
+ <listitem><para>Leave the 'Item No' field blank (as it will be automatically generated)</para></listitem>
+ <listitem><para>Select the 'Invoice Item Type' from the drop down box (NOTE: A typical line using the demo could be 'Invoice Finished Good Item' but ensure that it corresponds with the type of products setup in your catalog)</para></listitem>
+ <listitem><para>Enter a description describing what the line item is (NOTE: If you are going to enter a product in the Product Id field from the catalog then leave the 'Description' field blank as it will be used to show the product description)</para></listitem>
+ <listitem><para>Leave the 'Override GL Account Id' field blank as it will use the default account based on the Chart of Accounts setup</para></listitem>
+ <listitem><para>Use the lookup or enter a product code in the 'Product Id' field (NOTE: This can be left blank if your invoice line is not related to a product in the catalog)</para></listitem>
+ <listitem><para>Enter a number in the 'Quantity' field</para></listitem>
+ <listitem><para>Enter a 'Unit Price' only if the Product Id field is blank (NOTE: If a Product Id has been entered then leave the 'Unit Price' field blank as it will pick up the product price from the catalog)</para></listitem>
+ <listitem><para>Leave the 'Inventory Item' field blank</para></listitem>
+ <listitem><para>Leave the 'Product Feature Id' field blank</para></listitem>
+ <listitem><para>Leave the 'UOM' field blank</para></listitem>
+ <listitem><para>Select 'Yes' for the 'Taxable Flag' field</para></listitem>
+ </orderedlist>
<para>NOTE TO CHECK: Need to do some tests to see what line item type needs to be used for 'Sales Tax'. I think that it could be 'Invoice Item Sales Tax' since tax is currently calculated at invoice item line level. Also the automatically generated invoices from Order Entry and E-Commerce show taxes at the invoice item line level (think there may be some work going on - see JIRA on to consolidate entries). Need to do some tests using 'Invoice Sales Tax' to see how it works......... </para>
</section>
<section>
<title>How do I update an invoice line item?</title>
<para>Not all the fields on the invoice item line can be updated. For example Taxable Flag and Inventory Item cannot be updated. If these fields need to be amended then the invoice item will need to be removed and then re-created.</para>
- <para>Select the 'Items' sub menu for the invoice</para>
- <para>Any existing line items will be displayed in the 'Items' box</para>
- <para>Amend the details in the line item that needs to be updated (eg Quantity, Invoice Item Type, Product Id, Description, Override GL Account, Unit Price)</para>
- <para>Press the 'Update' button displayed at the end of the line item that has been updated </para>
+ <orderedlist>
+ <listitem><para>Select the 'Items' sub menu for the invoice</para></listitem>
+ <listitem><para>Any existing line items will be displayed in the 'Items' box</para></listitem>
+ <listitem><para>Amend the details in the line item that needs to be updated (eg Quantity, Invoice Item Type, Product Id, Description, Override GL Account, Unit Price)</para></listitem>
+ <listitem><para>Press the 'Update' button displayed at the end of the line item that has been updated </para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I delete an invoice item?</title>
- <para>Select the 'Items' sub menu for the invoice</para>
- <para>Any existing line items will be displayed in the 'Items' box</para>
- <para>Press the 'Remove' button displayed at the end of the line item that needs to be deleted</para>
+ <orderedlist>
+ <listitem><para>Select the 'Items' sub menu for the invoice</para></listitem>
+ <listitem><para>Any existing line items will be displayed in the 'Items' box</para></listitem>
+ <listitem><para>Press the 'Remove' button displayed at the end of the line item that needs to be deleted</para></listitem>
+ </orderedlist>
</section>
</section>
\ No newline at end of file
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml Tue Nov 17 07:45:07 2009
@@ -24,37 +24,41 @@
supplier.</para>
<section>
<title>How do I create a new Sales invoice?</title>
- <para>Press the 'Create New' button</para>
- <para>The New Sales Invoice / New Purchase Invoice screen is
- displayed></para>
- <para>Using the top part of the screen, leave Invoice type with its
- default of 'Sales Invoice'</para>
- <para>Leave 'Organization Party Id' with its default of 'Company'
- </para>
- <para>Enter or use the lookup to find the 'To Party Id' (eg
- DemoCustomer)</para>
- <para>Press the 'Create' button in the top part of the screen</para>
- <para>The invoice header has been created and the default header
- screen will be displayed</para>
- <para>Details on the invoice will need to be entered via the other sub
- menus (eg Items, Time Entries etc) </para>
+ <orderedlist>
+ <listitem><para>Press the 'Create New' button</para></listitem>
+ <listitem><para>The New Sales Invoice / New Purchase Invoice screen is
+ displayed></para></listitem>
+ <listitem><para>Using the top part of the screen, leave Invoice type with its
+ default of 'Sales Invoice'</para></listitem>
+ <listitem><para>Leave 'Organization Party Id' with its default of 'Company'
+ </para></listitem>
+ <listitem><para>Enter or use the lookup to find the 'To Party Id' (eg
+ DemoCustomer)</para></listitem>
+ <listitem><para>Press the 'Create' button in the top part of the screen</para></listitem>
+ <listitem><para>The invoice header has been created and the default header
+ screen will be displayed</para></listitem>
+ <listitem><para>Details on the invoice will need to be entered via the other sub
+ menus (eg Items, Time Entries etc) </para></listitem>
+ </orderedlist>
</section>
<section>
<title>How do I create a new Purchase invoice?</title>
- <para>Press the 'Create New' button</para>
- <para>The New Sales Invoice / New Purchase Invoice screen is
- displayed></para>
- <para>Using the bottom part of the screen, leave Invoice type with its
- default of 'Purchase Invoice'</para>
- <para>Leave 'Organization Party Id' with its default of 'Company'
- </para>
- <para>Enter or use the lookup to find the 'From Party Id' (eg
- DemoSupplier)</para>
- <para>Press the 'Create' button in the bottom part of the screen
- </para>
- <para>The invoice header has been created and the default header
- screen will be displayed</para>
- <para>Details on the invoice will need to be entered via the other sub
- menus (eg Items, Time Entries etc) </para>
+ <orderedlist>
+ <listitem><para>Press the 'Create New' button</para></listitem>
+ <listitem><para>The New Sales Invoice / New Purchase Invoice screen is
+ displayed></para></listitem>
+ <listitem><para>Using the bottom part of the screen, leave Invoice type with its
+ default of 'Purchase Invoice'</para></listitem>
+ <listitem><para>Leave 'Organization Party Id' with its default of 'Company'
+ </para></listitem>
+ <listitem><para>Enter or use the lookup to find the 'From Party Id' (eg
+ DemoSupplier)</para></listitem>
+ <listitem><para>Press the 'Create' button in the bottom part of the screen
+ </para></listitem>
+ <listitem><para>The invoice header has been created and the default header
+ screen will be displayed</para></listitem>
+ <listitem><para>Details on the invoice will need to be entered via the other sub
+ menus (eg Items, Time Entries etc) </para></listitem>
+ </orderedlist>
</section>
</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml Tue Nov 17 07:45:07 2009
@@ -23,44 +23,43 @@
types are used to describe what the payments are used for in the
system.</para>
<para>Examples of incoming payment types are as follows:</para>
- <para>Customer Deposit</para>
- <para>Customer Payment</para>
- <para>Interest In</para>
- <para>POS In (POS = Point of Sale)</para>
+ <itemizedlist>
+ <listitem><para>Customer Deposit</para></listitem>
+ <listitem><para>Customer Payment</para></listitem>
+ <listitem><para>Interest In</para></listitem>
+ <listitem><para>POS In (POS = Point of Sale)</para></listitem>
+ </itemizedlist>
<para>Examples of outgoing payment types are as follows:</para>
- <para>Commission Payment</para>
- <para>Pay Check</para>
- <para>Income Tax Payment</para>
- <para>Vendor Payment</para>
+ <itemizedlist>
+ <listitem><para>Commission Payment</para></listitem>
+ <listitem><para>Pay Check</para></listitem>
+ <listitem><para>Income Tax Payment</para></listitem>
+ <listitem><para>Vendor Payment</para></listitem>
+ </itemizedlist>
<section>
<title>How do I create a new incoming payment?</title>
- <para>Press the 'Create New Payment' button</para>
- <para>The New Incoming Payment / New Outgoing Payment screen is
- displayed</para>
- <para>Leave 'Organization Party Id' with its default of 'Company'
- </para>
- <para>
+ <orderedlist>
+ <listitem><para>Press the 'Create New Payment' button</para></listitem>
+ <listitem><para>The New Incoming Payment / New Outgoing Payment screen is
+ displayed</para></listitem>
+ <listitem><para>Leave 'Organization Party Id' with its default of 'Company'
+ </para></listitem>
+ <listitem><para>
Select the 'Payment Type Id' from the drop down box (NOTE: This
- is
- currently limited to the following: Customer Deposit, Customer
+ is currently limited to the following: Customer Deposit, Customer
Payment, Interest In, POS Paid In and Gift Certificate Deposit)
- </para>
- <para>
- Enter the payment amount in the 'Amount' field</para>
- <para>
- Enter or use the lookup to find the 'From Party Id'</para>
- <para>
- Select the 'Payment Method Type' from the drop down box (eg how
- the payment was paid - cash, cheque, money order etc)</para>
- <para>
- Leave the 'Currency' field with its default of 'USD' (NOTE: This
- default comes from Company)</para>
- <para>
- Press the 'Create' button</para>
- <para>The payment header is created and the default header
- screen will
- be displayed subsection content</para>
- <para>NOTE: Need to understand what happens if customer pays in a
+ </para></listitem>
+ <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem>
+ <listitem><para>Enter or use the lookup to find the 'From Party Id'</para></listitem>
+ <listitem><para>Select the 'Payment Method Type' from the drop down box (eg how
+ the payment was paid - cash, cheque, money order etc)</para></listitem>
+ <listitem><para>Leave the 'Currency' field with its default of 'USD' (NOTE: This
+ default comes from Company)</para></listitem>
+ <listitem><para>Press the 'Create' button</para></listitem>
+ <listitem><para>The payment header is created and the default header
+ screen will be displayed subsection content</para></listitem>
+ </orderedlist>
+ <para>NOTE: Need to understand what happens if customer pays in a
currency that is not the company default.... if the exchange rate is
specified then I think it should convert the currency to the default
currency for accounting purposes.... need to investigate and test.
@@ -68,23 +67,24 @@
</section>
<section>
<title>How do I create a new outgoing payment?</title>
- <para>Press the 'Create New Payment' button</para>
- <para>The New Incoming Payment / New Outgoing Payment screen is
- displayed</para>
- <para>Leave 'Organization Party Id' with its default of 'Company'
- </para>
- <para>Select the 'Payment Type Id' from the drop down box (NOTE: This
+ <orderedlist>
+ <listitem><para>Press the 'Create New Payment' button</para></listitem>
+ <listitem><para>The New Incoming Payment / New Outgoing Payment screen is
+ displayed</para></listitem>
+ <listitem><para>Leave 'Organization Party Id' with its default of 'Company'
+ </para></listitem>
+ <listitem><para>Select the 'Payment Type Id' from the drop down box (NOTE: This
is currently limited to 11 entries including Commission Payment,
- Customer Refund, Vendor Payment, Income Tax Payment)</para>
- <para>Enter the payment amount in the 'Amount' field</para>
- <para>Enter or use the lookup to find the 'To Party Id'</para>
- <para>Select the 'Payment Method Type' from the drop down box (eg how
- the payment is to be paid - cash, cheque, money order etc)</para>
- <para>Leave the 'Currency' field with its default of 'USD' (NOTE: This
- default comes from Company)</para>
- <para>Press the 'Create' button</para>
- <para>The payment header is created and the default header screen will
- be displayed
- subsection content</para>
+ Customer Refund, Vendor Payment, Income Tax Payment)</para></listitem>
+ <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem>
+ <listitem><para>Enter or use the lookup to find the 'To Party Id'</para></listitem>
+ <listitem><para>Select the 'Payment Method Type' from the drop down box (eg how
+ the payment is to be paid - cash, cheque, money order etc)</para></listitem>
+ <listitem><para>Leave the 'Currency' field with its default of 'USD' (NOTE: This
+ default comes from Company)</para></listitem>
+ <listitem><para>Press the 'Create' button</para></listitem>
+ <listitem><para>The payment header is created and the default header screen will
+ be displayed subsection content</para></listitem>
+ </orderedlist>
</section>
</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml?rev=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml Tue Nov 17 07:45:07 2009
@@ -23,22 +23,26 @@
transaction header (eg Payment Type, Status, Amount, Effective Date
etc) and the other it shows if the payment has been applied (or
matched) to an invoice or billing account etc.</para>
- <para>he following options are currently available from this screen:
+ <para>The following options are currently available from this screen:
</para>
-
- <para>* Create New (Create a new payment)</para>
- <para>* Status to 'Received' (Change the status of the current payment
+ <itemizedlist>
+ <listitem><para>Create New (Create a new payment)</para></listitem>
+ <listitem><para>Status to 'Received' (Change the status of the current payment
to 'Received. NOTE: This will create the relevant accounting
- transactions and post them to the general ledger)</para>
- <para>* Status to 'Cancelled' (Change the status of the current payment
- to 'Cancelled')</para>
- <para>* Status to 'Confirmed' (Change the status of the current invoice
+ transactions and post them to the general ledger)</para></listitem>
+ <listitem><para>Status to 'Cancelled' (Change the status of the current payment
+ to 'Cancelled')</para></listitem>
+ <listitem><para>Status to 'Confirmed' (Change the status of the current invoice
to 'Confirmed'. NOTE: This status option will not appear until the
- status has been changed to 'Received')</para>
+ status has been changed to 'Received')</para></listitem>
+ </itemizedlist>
+
<para>NOTE: The general ledger transactions generated as a result of
the payment are based on the GL Account Type defaults for Company as
follows:</para>
- <para>* Debit Entry (GL Account Type defaults)</para>
- <para>* Credit Entry (Payment Method Id / GL Account Id)</para>
+ <itemizedlist>
+ <listitem><para>Debit Entry (GL Account Type defaults)</para></listitem>
+ <listitem><para>Credit Entry (Payment Method Id / GL Account Id)</para></listitem>
+ </itemizedlist>
</section>
Modified: 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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml Tue Nov 17 07:45:07 2009
@@ -19,6 +19,7 @@
xmlns="http://docbook.org/ns/docbook">
<title>Accounting Payments.</title>
<para>Payments are transactions that received by or generated by a business. They can be incoming or outgoing. Incoming payments are normally from customers and outgoing ones to suppliers. </para>
+ <xi:include href="HELP_ACCOUNTING_findPayments.xml" />
<xi:include href="HELP_ACCOUNTING_newPayment.xml" />
<xi:include href="HELP_ACCOUNTING_paymentOverview.xml" />
<xi:include href="HELP_ACCOUNTING_editPaymentApplications.xml" />
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=881180&r1=881179&r2=881180&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml Tue Nov 17 07:45:07 2009
@@ -23,20 +23,22 @@
can add a simple accompanying email message.</para>
<section>
<title>How do I send a copy of an invoice via email?</title>
- <para>Select the 'Send per Email' sub menu</para>
- <para>The 'Send per Email' default screen will be displayed</para>
- <para>Enter the 'From Email Address' (NOTE TO CHECK: Shouldnt this be
- defaulted from the user login.....????)</para>
- <para>Leave the 'To Email Address' as it is as this will be defaulted
- using the customer details from the invoice</para>
- <para>If required enter the 'Copy Email address' for anyone that needs
- to be copied on the email</para>
- <para>Leave the 'Subject' as the default of 'Please find attached
- invoice'</para>
- <para>Leave the 'Other Currency' box blank (NOTE TO CHECK: Investigate
- what effect this has on the email.....)</para>
- <para>Enter a short email message in the 'Email Body' </para>
- <para>Press the 'Submit' button </para>
+ <orderedlist>
+ <listitem><para>Select the 'Send per Email' sub menu</para></listitem>
+ <listitem><para>The 'Send per Email' default screen will be displayed</para></listitem>
+ <listitem><para>Enter the 'From Email Address' (NOTE TO CHECK: Shouldnt this be
+ defaulted from the user login.....????)</para></listitem>
+ <listitem><para>Leave the 'To Email Address' as it is as this will be defaulted
+ using the customer details from the invoice</para></listitem>
+ <listitem><para>If required enter the 'Copy Email address' for anyone that needs
+ to be copied on the email</para></listitem>
+ <listitem><para>Leave the 'Subject' as the default of 'Please find attached
+ invoice'</para></listitem>
+ <listitem><para>Leave the 'Other Currency' box blank (NOTE TO CHECK: Investigate
+ what effect this has on the email.....)</para></listitem>
+ <listitem><para>Enter a short email message in the 'Email Body' </para></listitem>
+ <listitem><para>Press the 'Submit' button </para></listitem>
+ </orderedlist>
</section>
</section>