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/18 18:39:54 UTC
svn commit: r881845 - in /ofbiz/trunk: applications/accounting/data/helpdata/
framework/entity/src/org/ofbiz/entity/util/
Author: jleroux
Date: Wed Nov 18 17:39:53 2009
New Revision: 881845
URL: http://svn.apache.org/viewvc?rev=881845&view=rev
Log:
Some itemizedlists and orderedlists in Accounting Help
Modified:
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml Wed Nov 18 17:39:53 2009
@@ -13,18 +13,30 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
<title>The Edit Payment Gateway Config help screen</title>
<para>This screen allows the user to update the payment gateway configuration.</para>
- <para>A range of parameters need to be set before the payment gateway will work This includes details of the username and password required for the validation of the external account that will be using the gateway.</para>
-<section>
-<title>How do I update a Payment Gateway Configuration?</title>
-<para>Select the gateway Find Payment Gateway Config screen</para>
-<para>Enter the details required for the configuration type selected (NOTE: This will be different for each individual configuration selected)</para>
-<para>Press the 'Update' button</para>
-<para></para>
+ <para>A range of parameters need to be set before the payment gateway will work This includes
+ details of the username and password required for the validation of the external account
+ that will be using the gateway.</para>
+ <section>
+ <title>How do I update a Payment Gateway Configuration?</title>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Select the gateway Find Payment Gateway Config screen</para>
+ </listitem>
+ <listitem>
+ <para>Enter the details required for the configuration type selected (NOTE: This
+ will be different for each individual configuration selected)</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Update' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
</section>
-</section>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml Wed Nov 18 17:39:53 2009
@@ -13,18 +13,24 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
<title>The Find Gateway Responses help screen</title>
- <para>This is the default screen for the 'Transactions' sub menu. Press
- the 'Lookup' button to display details of all transactions that have
- been authorised, captured or manually entered.</para>
+ <para>This is the default screen for the 'Transactions' sub menu. Press the 'Lookup' button to
+ display details of all transactions that have been authorised, captured or manually
+ entered.</para>
<section>
<title>How do I view all Gateway response transactions?</title>
- <para>Press the 'Lookup' button</para>
- <para>A list of all transactions that have been authorised, captured
- or manually entered will be displayed.</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Press the 'Lookup' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>A list of all transactions that have been authorised, captured or manually entered
+ will be displayed.</para>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml Wed Nov 18 17:39:53 2009
@@ -17,40 +17,90 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>The Find Tax Authorities screen.</title>
- <para>The default screen displays a list of Tax Authorities that have been setup.</para>
- <para>IMPORTANT: You will need to create a party in Party Manager for the tax authority before you can add a new tax authority in the accounting / tax authorities screen.</para>
- <para>Steps to create the party to be used for the tax authority are as follows:</para>
- <para>* Create New Party Group</para>
- <para>* Fill in basic details (eg name, address etc)</para>
- <para>* Once the party record is created then add the role of 'Tax Authority' to the party</para>
- <para>Only when the tax authority party record is created can you continue.</para>
- <section>
+ <title>The Find Tax Authorities screen.</title>
+ <para>The default screen displays a list of Tax Authorities that have been setup.</para>
+ <para>IMPORTANT: You will need to create a party in Party Manager for the tax authority before
+ you can add a new tax authority in the accounting / tax authorities screen.</para>
+ <para>Steps to create the party to be used for the tax authority are as follows:</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Create New Party Group</para>
+ </listitem>
+ <listitem>
+ <para>Fill in basic details (eg name, address etc)</para>
+ </listitem>
+ <listitem>
+ <para>Once the party record is created then add the role of 'Tax Authority' to the
+ party</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>Only when the tax authority party record is created can you continue.</para>
+ <section>
<title>How do I create a new tax authority?</title>
<para>Press the 'New Tax Authority' button</para>
- <para>Select or enter the code for the country, state or region that is applicable for the 'Geo' field</para>
- <para>Select or enter the party id of the Tax Authority party that has been created in Party Manager</para>
- <para>Leave the 'Require Tax Id for Exemption' field at its default of 'Y'(NOTE: This triggers tax not to be charged if a valid Tax Id is found!)</para>
- <para>Leave 'Tax Id Format Pattern' blank (NOTE: This specifies the format of the Tax Id so that it can be validated)</para>
- <para>Fill in the 'Include Tax in the price' - the default is 'N'. (NOTE: If prices need to include tax such as GST or VAT in the price then change this to 'Y')</para>
- <para>Press the 'Update' button</para>
- <para>NOTE: The above process creates the basic tax authority detail but there are further details that can be added via the other tax authority sub menus</para>
- </section>
- <section>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Select or enter the code for the country, state or region that is
+ applicable for the 'Geo' field</para>
+ </listitem>
+ <listitem>
+ <para>Select or enter the party id of the Tax Authority party that has been
+ created in Party Manager</para>
+ </listitem>
+ <listitem>
+ <para>Leave the 'Require Tax Id for Exemption' field at its default of 'Y'(NOTE:
+ This triggers tax not to be charged if a valid Tax Id is found!)</para>
+ </listitem>
+ <listitem>
+ <para>Leave 'Tax Id Format Pattern' blank (NOTE: This specifies the format of
+ the Tax Id so that it can be validated)</para>
+ </listitem>
+ <listitem>
+ <para>Fill in the 'Include Tax in the price' - the default is 'N'. (NOTE: If
+ prices need to include tax such as GST or VAT in the price then change this
+ to 'Y')</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Update' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>NOTE: The above process creates the basic tax authority detail but there are further
+ details that can be added via the other tax authority sub menus</para>
+ </section>
+ <section>
<title>How do I update a tax authority?</title>
- <para>Select the 'Edit' button next to the tax authority that you wish to update</para>
- <para>The 'Edit Tax Authority' screen is displayed</para>
- <para>Update the details of the tax authority as required including any submenus</para>
- <para>Press the 'Update' button</para>
- </section>
- <section>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Select the 'Edit' button next to the tax authority that you wish to
+ update</para>
+ </listitem>
+ <listitem>
+ <para>The 'Edit Tax Authority' screen is displayed</para>
+ </listitem>
+ <listitem>
+ <para>Update the details of the tax authority as required including any
+ submenus</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Update' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+ <section>
<title>How do I delete / remove a tax authority?</title>
- <para>Tax authorities cannot be deleted via the Tax Authority screens. If they need to be removed then it can be done via the Webtools and Entity Data maintenance.</para>
- <para>NOTE: Be very careful removing tax authorities records unless you are completely certain that they have not been already used for transaction calculations. </para>
- </section>
-</section>
\ No newline at end of file
+ <para>Tax authorities cannot be deleted via the Tax Authority screens. If they need to be
+ removed then it can be done via the Webtools and Entity Data maintenance.</para>
+ <para>NOTE: Be very careful removing tax authorities records unless you are completely
+ certain that they have not been already used for transaction calculations. </para>
+ </section>
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml Wed Nov 18 17:39:53 2009
@@ -13,34 +13,62 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
<title>The Manual Transaction help screen</title>
- <para>The Manual Electronic Transaction screen allows the user to
- manually input and process payment related transactions.</para>
+ <para>The Manual Electronic Transaction screen allows the user to manually input and process
+ payment related transactions.</para>
<para>Options available include the following:</para>
- <para>Authorising payment transactions</para>
- <para>Refunding payments</para>
- <para>Payment Re-Authorisation</para>
- <para>Payment Capture</para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>Authorising payment transactions</para>
+ </listitem>
+ <listitem>
+ <para>Refunding payments</para>
+ </listitem>
+ <listitem>
+ <para>Payment Re-Authorisation</para>
+ </listitem>
+ <listitem>
+ <para>Payment Capture</para>
+ </listitem>
+ </itemizedlist>
+ </para>
<section>
<title>How do I create a manual electronic transaction?</title>
- <para>Select the 'Payment Method Type' (eg Credit Card)</para>
- <para>Select the 'Product Store'</para>
- <para>Select the 'Transaction Type' (NOTE: This is the type of
- transaction that needs to be created, eg authorisation,
- capture,refund etc)</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Select the 'Payment Method Type' (eg Credit Card)</para>
+ </listitem>
+ <listitem>
+ <para>Select the 'Product Store'</para>
+ </listitem>
+ <listitem>
+ <para>Select the 'Transaction Type' (NOTE: This is the type of transaction that
+ needs to be created, eg authorisation, capture,refund etc)</para>
+ </listitem>
+ </orderedlist>
+ </para>
<para>Additional fields will be displayed </para>
- <para>Enter the required details (eg name, credit card, billing
- address, amount etc)</para>
- <para>Press the 'Submit' button</para>
- <para>A transsaction will be created that can be viewed via the
- Gateway Transactions screen</para>
- <para>NOTE TO CHECK: Possible bug as could not get this to work using
- 'Payment Authorisation Service' and error message appeared regarding
- a missing parameter missing for Order Preference Id but the Order
- Preference Id was not displayed on the screen</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Enter the required details (eg name, credit card, billing address, amount
+ etc)</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Submit' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>A transsaction will be created that can be viewed via the Gateway Transactions
+ screen</para>
+ <para>NOTE TO CHECK: Possible bug as could not get this to work using 'Payment Authorisation
+ Service' and error message appeared regarding a missing parameter missing for Order
+ Preference Id but the Order Preference Id was not displayed on the screen</para>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml Wed Nov 18 17:39:53 2009
@@ -17,34 +17,77 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>The Financial Account New Deposit Payment screen.</title>
- <para>This screen allows the user to create an incoming payment to a financial account that has been linked to the company bank account.</para>
- <para></para>
- <section>
+ <title>The Financial Account New Deposit Payment screen.</title>
+ <para>This screen allows the user to create an incoming payment to a financial account that has
+ been linked to the company bank account.</para>
+ <para/>
+ <section>
<title>How do I create a New Deposit Payment?</title>
- <para>Press the 'Create New Deposit Payment' button</para>
- <para>The 'Create New Deposit for Financial Account' screen is displayed</para>
- <para>Select the 'Payment Type' from the drop down menu (NOTE: Only incoming transaction payment types are shown)</para>
- <para>Select the 'Payment Method Type' from the drop down menu (eg Cash)</para>
- <para>Enter or use the lookup to select the 'From Party Id' (eg DemoCustomer)</para>
- <para>Enter or use the lookup to select the 'To Party Id' (eg Company)</para>
- <para>Enter the date of the deposit in the 'Effective Date' field</para>
- <para>Enter the amount in the 'Amount' field for the deposit</para>
- <para>If required then tick the box next to 'Deposit Payment in:....' (NOTE: If this is ticked then the transaction will not be displayed and so will not have a deposit slip associated with it)</para>
- <para>Press the 'Create' button</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Press the 'Create New Deposit Payment' button</para>
+ </listitem>
+ <listitem>
+ <para>The 'Create New Deposit for Financial Account' screen is displayed</para>
+ </listitem>
+ <listitem>
+ <para>Select the 'Payment Type' from the drop down menu (NOTE: Only incoming
+ transaction payment types are shown)</para>
+ </listitem>
+ <listitem>
+ <para>Select the 'Payment Method Type' from the drop down menu (eg Cash)</para>
+ </listitem>
+ <listitem>
+ <para>Enter or use the lookup to select the 'From Party Id' (eg
+ DemoCustomer)</para>
+ </listitem>
+ <listitem>
+ <para>Enter or use the lookup to select the 'To Party Id' (eg Company)</para>
+ </listitem>
+ <listitem>
+ <para>Enter the date of the deposit in the 'Effective Date' field</para>
+ </listitem>
+ <listitem>
+ <para>Enter the amount in the 'Amount' field for the deposit</para>
+ </listitem>
+ <listitem>
+ <para>If required then tick the box next to 'Deposit Payment in:....' (NOTE: If
+ this is ticked then the transaction will not be displayed and so will not
+ have a deposit slip associated with it)</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Create' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
<para>The new transaction will be created.</para>
- <para>NOTE: The default status of the payment will be 'Received'.A new payment transaction will be created and it will be linked to the specified bank account but the status of the transaction will be 'Created'.</para>
- </section>
- <section>
+ <para>NOTE: The default status of the payment will be 'Received'.A new payment transaction
+ will be created and it will be linked to the specified bank account but the status of
+ the transaction will be 'Created'.</para>
+ </section>
+ <section>
<title>How do I view a newly created Deposit Payment transaction?</title>
- <para>Go to the 'Transactions' submenu</para>
- <para>Press the 'Search' button</para>
- <para>The newly created transaction should be displayed in the search results at the bottom of the screen.</para>
- <para>NOTE: If when the transaction was created the 'Deposit Payment in:....' was ticked then the transaction will not be displayed on this screen. It will still show up under the 'Transactions' tab and linked to the bank account.</para>
- </section>
-</section>
\ No newline at end of file
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Go to the 'Transactions' submenu</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Search' button</para>
+ </listitem>
+ <listitem>
+ <para>The newly created transaction should be displayed in the search results at
+ the bottom of the screen.</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>NOTE: If when the transaction was created the 'Deposit Payment in:....' was ticked
+ then the transaction will not be displayed on this screen. It will still show up under
+ the 'Transactions' tab and linked to the bank account.</para>
+ </section>
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml Wed Nov 18 17:39:53 2009
@@ -17,19 +17,37 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>The Financial Account New Deposit Slip screen.</title>
- <para>This screen allows the user to create an Payment Group and the transactions associated with the Payment Group will generate a deposit slip.</para>
- <section>
+ <title>The Financial Account New Deposit Slip screen.</title>
+ <para>This screen allows the user to create an Payment Group and the transactions associated
+ with the Payment Group will generate a deposit slip.</para>
+ <section>
<title>How do I create a New Deposit Slip?</title>
- <para>Press the 'Find' button to list all the available transactions</para>
- <para>Select the transactions to include in the Payment Group by using the 'Select All' or the check box that corresponds to the transactions required</para>
- <para>Enter a 'Payment Group Name' if required (If none is entered then by default this will be 'Payment Group Name')</para>
- <para>Press the 'Create Batch' button</para>
- <para>A button to print the deposit slip will be displayed as well as the edit screen to make any further changes to the Payment Batch</para>
- </section>
-</section>
\ No newline at end of file
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Press the 'Find' button to list all the available transactions</para>
+ </listitem>
+ <listitem>
+ <para>Select the transactions to include in the Payment Group by using the
+ 'Select All' or the check box that corresponds to the transactions
+ required</para>
+ </listitem>
+ <listitem>
+ <para>Enter a 'Payment Group Name' if required (If none is entered then by
+ default this will be 'Payment Group Name')</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Create Batch' button</para>
+ </listitem>
+ <listitem>
+ <para>A button to print the deposit slip will be displayed as well as the edit
+ screen to make any further changes to the Payment Batch</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml Wed Nov 18 17:39:53 2009
@@ -17,38 +17,79 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>The Financial Account New Withdrawal Payment screen.</title>
- <para>This screen allows the user to create an outgoing payment to a financial account that has been linked to the company bank account.</para>
- <para></para>
- <section>
+ <title>The Financial Account New Withdrawal Payment screen.</title>
+ <para>This screen allows the user to create an outgoing payment to a financial account that has
+ been linked to the company bank account.</para>
+ <section>
<title>How do I create a New Withdrawal Payment?</title>
- <para>Press the 'Create New Withdrawal Payment' button</para>
- <para>The 'Create New Withdrawal for Financial Account' screen is displayed</para>
- <para>Select the 'Payment Type' from the drop down menu (NOTE: Only outgoing transaction payment types are shown)</para>
- <para>Select the 'Payment Method Type' from the drop down menu (eg Cash)</para>
- <para>Enter or use the lookup to select the 'From Party Id' (eg Company)</para>
- <para>Enter or use the lookup to select the 'To Party Id' (eg DemoSupplier)</para>
- <para>Enter the date of the withdrawal in the 'Effective Date' field</para>
- <para>Enter the amount in the 'Amount' field for the withdrawal</para>
- <para>If required the tick the box next to 'Withdrawal Payment from:....' (NOTE: If this is ticked then the transaction will not be displayed but it can be found under the 'Transactions' tab for the bank account.)</para>
- <para>Press the 'Create' button</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Press the 'Create New Withdrawal Payment' button</para>
+ </listitem>
+ <listitem>
+ <para>The 'Create New Withdrawal for Financial Account' screen is
+ displayed</para>
+ </listitem>
+ <listitem>
+ <para>Select the 'Payment Type' from the drop down menu (NOTE: Only outgoing
+ transaction payment types are shown)</para>
+ </listitem>
+ <listitem>
+ <para>Select the 'Payment Method Type' from the drop down menu (eg Cash)</para>
+ </listitem>
+ <listitem>
+ <para>Enter or use the lookup to select the 'From Party Id' (eg Company)</para>
+ </listitem>
+ <listitem>
+ <para>Enter or use the lookup to select the 'To Party Id' (eg
+ DemoSupplier)</para>
+ </listitem>
+ <listitem>
+ <para>Enter the date of the withdrawal in the 'Effective Date' field</para>
+ </listitem>
+ <listitem>
+ <para>Enter the amount in the 'Amount' field for the withdrawal</para>
+ </listitem>
+ <listitem>
+ <para>If required tick the box next to 'Withdrawal Payment from:....' (NOTE: If
+ this is ticked then the transaction will not be displayed but it can be
+ found under the 'Transactions' tab for the bank account.)</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Create' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
<para>The new transaction will be created.</para>
- <para>NOTE: The default status of the payment will be 'Sent'. A new payment transaction will be created and it will be linked to the specified bank account and will have a default status of 'Created'.</para>
- </section>
- <section>
+ <para>NOTE: The default status of the payment will be 'Sent'. A new payment transaction will
+ be created and it will be linked to the specified bank account and will have a default
+ status of 'Created'.</para>
+ </section>
+ <section>
<title>How do I view a newly created Withdrawal Payment transaction?</title>
- <para>Go to the 'Transactions' submenu</para>
- <para>Press the 'Search' button</para>
- <para>The newly created transaction should be displayed in the search results at the bottom of the screen.</para>
- <para>NOTE: If when the transaction was created the 'Withdrawal Payment from:....' was ticked then the transaction will not be displayed on this screen. It will still show up under the 'Transactions' tab and linked to the bank account</para>
- </section>
- <section>
- <title></title>
- <para></para>
- </section>
-</section>
\ No newline at end of file
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Go to the 'Transactions' submenu</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Search' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>The newly created transaction should be displayed in the search results at the bottom
+ of the screen.</para>
+ <para>NOTE: If when the transaction was created the 'Withdrawal Payment from:....' was
+ ticked then the transaction will not be displayed on this screen. It will still show up
+ under the 'Transactions' tab and linked to the bank account</para>
+ </section>
+ <section>
+ <title/>
+ <para/>
+ </section>
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml Wed Nov 18 17:39:53 2009
@@ -17,28 +17,57 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>The Financial Account Deposit / Withdraw screen.</title>
- <para>By default this screen will display all payment transactions both incoming and outgoing that have not already been associated with a financial account that represents one of the company's bank accounts.</para>
- <para>This screen also gives the option to create new deposit or withdrawal payments.</para>
- <para>The user can select a number of incoming deposit payments (eg Customer Payments etc) and group them together into a payment group (i.e AR Batch of Payments) that will create a 'deposit slip'.</para>
- <para>If you select a number of incoming payments and dont group them then no payment group is created (and therefore not deposit slip either) but the individual transactions will be created for the 'bank account' financial account.</para>
- <para>Note that outgoing payments cannot be grouped together and will not create a 'deposit slip'.</para>
- <section>
+ <title>The Financial Account Deposit / Withdraw screen.</title>
+ <para>By default this screen will display all payment transactions both incoming and outgoing
+ that have not already been associated with a financial account that represents one of the
+ company's bank accounts.</para>
+ <para>This screen also gives the option to create new deposit or withdrawal payments.</para>
+ <para>The user can select a number of incoming deposit payments (eg Customer Payments etc) and
+ group them together into a payment group (i.e AR Batch of Payments) that will create a
+ 'deposit slip'.</para>
+ <para>If you select a number of incoming payments and dont group them then no payment group is
+ created (and therefore not deposit slip either) but the individual transactions will be
+ created for the 'bank account' financial account.</para>
+ <para>Note that outgoing payments cannot be grouped together and will not create a 'deposit
+ slip'.</para>
+ <section>
<title>How do I list Deposit or Withdrawal Payments not linked to a Bank Account?</title>
- <para>Press the 'Find' button on the 'Deposit/Withdraw' screen.</para>
- <para>All deposit and withdrawal transactions not associated with a bank 'financial account' will be displayed.</para>
- </section>
- <section>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Press the 'Find' button on the 'Deposit/Withdraw' screen.</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>All deposit and withdrawal transactions not associated with a bank 'financial account'
+ will be displayed.</para>
+ </section>
+ <section>
<title>How do I group payments and create a deposit slip?</title>
- <para>Press 'Find' to list all Deposit or Withdrawal payments</para>
- <para>Use the 'Select All' or click on the check box associated with the transactions required </para>
- <para>Enter a name for the Payment Party Group Name (eg XYZ Deposits) to group the transactions together</para>
- <para>Press the 'Deposit/Withdraw' button</para>
- <para>A deposit will be created that can be viewed under the 'Deposit Slip' tab and grouped transaction will be created under the 'Transactions' tab with a link to the deposit slip breakdown</para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Press 'Find' to list all Deposit or Withdrawal payments</para>
+ </listitem>
+ <listitem>
+ <para>Use the 'Select All' or click on the check box associated with the
+ transactions required </para>
+ </listitem>
+ <listitem>
+ <para>Enter a name for the Payment Party Group Name (eg XYZ Deposits) to group
+ the transactions together</para>
+ </listitem>
+ <listitem>
+ <para>Press the 'Deposit/Withdraw' button</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>A deposit will be created that can be viewed under the 'Deposit Slip' tab and grouped
+ transaction will be created under the 'Transactions' tab with a link to the deposit slip
+ breakdown</para>
+ </section>
</section>
-</section>
\ No newline at end of file
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=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml Wed Nov 18 17:39:53 2009
@@ -13,101 +13,130 @@
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"
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
<title>The Accounting 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
- this. The screen is divided into 3 main areas as follows.</para>
+ <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 this. The screen is divided into 3 main areas as follows.</para>
+ <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>
+ </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>
+ </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
+ process the accounting transaction generated the following GL Accounting transaction is
+ generated for 'Payment Applied' o add some text here.</para>
+ <para>DR 120000 Accounts Receivable / CR 120000 Accounts Receivable - This transaction doesnt
+ really do anything! </para>
+ <para>It is used to link payments to invoices. It is also used to allocate which part of a
+ payment is allocated or applied to a specific invoice. This is extremely useful if your
+ customers pay multiple invoices with a single payment.</para>
+ <para>Example:</para>
+ <para>
<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></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></listitem>
- <listitem><para>Assign Payment to Invoice (which allows you to manually assign
- a specific payment id to this invoice)</para></listitem>
+ <listitem>
+ <para>A customer could send a single payment of $1000 that can be used to pay for
+ two invoices (eg $400 and $600)</para>
+ </listitem>
+ <listitem>
+ <para>Using this applications sub menu allows you to allocate part of the $400 to
+ one invoice and the balance ($600) to the other 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
- process the accounting transaction generated the following GL
- Accounting transaction is generated for 'Payment Applied' o add some
- text here.</para>
- <para>DR 120000 Accounts Receivable / CR 120000 Accounts Receivable -
- This transaction doesnt really do anything! </para>
- <para>It is used to link payments to invoices. It is also used to
- allocate which part of a payment is allocated or applied to a specific
- invoice. This is extremely useful if your customers pay multiple
- invoices with a single payment.</para>
- <para>Example:</para>
- <para> * A customer could send a single payment of $1000 that can be
- used to pay for two invoices (eg $400 and $600)</para>
- <para>* Using this applications sub menu allows you to allocate part of
- the $400 to one invoice and the balance ($600) to the other invoice
</para>
- <para>By default all 'unapplied' payments that have been entered into
- OFBiz from the customer will be available for selection even if they
- have not yet been flagged as formally 'Received'. This means that
- these are payments that have not already been linked to another
- invoice. If only part of a payment amount has been linked to an
- invoice then the remaining amount is left available to be allocated to
- another invoice. Also note that a single invoice could be paid by
- multiple payments being applied to it.</para>
+ <para>By default all 'unapplied' payments that have been entered into OFBiz from the customer
+ will be available for selection even if they have not yet been flagged as formally
+ 'Received'. This means that these are payments that have not already been linked to another
+ invoice. If only part of a payment amount has been linked to an invoice then the remaining
+ amount is left available to be allocated to another invoice. Also note that a single invoice
+ could be paid by multiple payments being applied to it.</para>
<section>
<title>How do I apply a payment (or payments) to an invoice?</title>
<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></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></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></listitem>
+ <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>
+ </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>
+ </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>
+ </listitem>
</orderedlist>
</section>
<section>
<title>How do I update an applied payment for an invoice?</title>
<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></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>
+ <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>
+ </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
- invoice?</title>
- <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>
+ <title>How do I remove an applied payment (or payments) from an invoice?</title>
+ <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>
<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>
+ <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
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml Wed Nov 18 17:39:53 2009
@@ -13,23 +13,32 @@
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"
+<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 Config.</title>
- <para>Payment Gateway Configuration is used to setup the parameters
- required for the system to accept payments via different or external
- applications</para>
+ <para>Payment Gateway Configuration is used to setup the parameters required for the system to
+ accept payments via different or external applications</para>
<para>Examples of these include:</para>
- <para>Paypal</para>
- <para>PayFlow</para>
- <para>Authorise.net</para>
- <para>Clear Commerce</para>
-
- <xi:include href="HELP_ACCOUNTING_FindPaymentGatewayConfig.xml" />
- <xi:include href="HELP_ACCOUNTING_EditPaymentGatewayConfig.xml" />
- <xi:include href="HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml" />
- <xi:include href="HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml" />
-
-</section>
\ No newline at end of file
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>Paypal</para>
+ </listitem>
+ <listitem>
+ <para>PayFlow</para>
+ </listitem>
+ <listitem>
+ <para>Authorise.net</para>
+ </listitem>
+ <listitem>
+ <para>Clear Commerce</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <xi:include href="HELP_ACCOUNTING_FindPaymentGatewayConfig.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditPaymentGatewayConfig.xml"/>
+ <xi:include href="HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml"/>
+</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml Wed Nov 18 17:39:53 2009
@@ -13,27 +13,44 @@
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"
+<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 Tax Authorities.</title>
- <para>A tax authority is legal body usually the state (country) that imposes a financial levy on business transactions.</para>
- <para>In OFBiz tax authorities are used to calculate where business or related taxes are due.</para>
- <para>Tax setup is very important as it links into the calculated price that you can charge your customers and also flows through into any related legal documents that are generated (eg Sales Order, Sales Invoice, Purchase Order etc).</para>
- <para>Each country or region will have specific rules regarding what should or should not be taxed. There will also be very strict regulations on how taxable transactions should be recorded and tracked in the general ledger or chart of accounts.</para>
+ <para>A tax authority is legal body usually the state (country) that imposes a financial levy on
+ business transactions.</para>
+ <para>In OFBiz tax authorities are used to calculate where business or related taxes are
+ due.</para>
+ <para>Tax setup is very important as it links into the calculated price that you can charge your
+ customers and also flows through into any related legal documents that are generated (eg
+ Sales Order, Sales Invoice, Purchase Order etc).</para>
+ <para>Each country or region will have specific rules regarding what should or should not be
+ taxed. There will also be very strict regulations on how taxable transactions should be
+ recorded and tracked in the general ledger or chart of accounts.</para>
<para>Tax authority setup allows configuration of the following :</para>
- <para>* Income tax</para>
- <para>* Value Added Tax (VAT) / Goods and Services Tax (GST)</para>
- <para>* Import / Export tax /Custom and Excise Duty</para>
- <para>* State, City or County taxes
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>Income tax</para>
+ </listitem>
+ <listitem>
+ <para>Value Added Tax (VAT) / Goods and Services Tax (GST)</para>
+ </listitem>
+ <listitem>
+ <para>Import / Export tax /Custom and Excise Duty</para>
+ </listitem>
+ <listitem>
+ <para>State, City or County taxes </para>
+ </listitem>
+ </itemizedlist>
</para>
- <xi:include href="HELP_ACCOUNTING_FindTaxAuthority.xml" />
- <xi:include href="HELP_ACCOUNTING_EditTaxAuthority.xml" />
- <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityCategories.xml" />
- <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml" />
- <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml" />
- <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml" />
- <xi:include href="HELP_ACCOUNTING_ListTaxAuthorityParties.xml" />
- <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml" />
-</section>
\ No newline at end of file
+ <xi:include href="HELP_ACCOUNTING_FindTaxAuthority.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditTaxAuthority.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityCategories.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml"/>
+ <xi:include href="HELP_ACCOUNTING_ListTaxAuthorityParties.xml"/>
+ <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml"/>
+</section>
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java?rev=881845&r1=881844&r2=881845&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataAssert.java Wed Nov 18 17:39:53 2009
@@ -72,8 +72,7 @@
if (valueList == null) return;
Iterator<GenericValue> valueIter = valueList.iterator();
- while (valueIter.hasNext()) {
- GenericValue checkValue = valueIter.next();
+ for (GenericValue checkValue : valueList) {
checkSingleValue(checkValue, delegator, errorMessages);
}
}