You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2009/09/24 02:38:34 UTC
svn commit: r818327 [2/2] - in /ofbiz/trunk/applications:
accounting/data/helpdata/ accounting/documents/ commonext/data/helpdata/
commonext/documents/ commonext/script/
commonext/webapp/ofbizsetup/WEB-INF/actions/ content/data/helpdata/
content/docume...
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=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml Thu Sep 24 00:38:31 2009
@@ -18,42 +18,42 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting Edit Invoice Items screen.</title>
- <para>The Invoice Items screen displays the individual invoice line details and allows the user to update or remove an entry. As each invoice line is created it is allocated a specific sequence (or Item Number) which acts as a unique identifier.</para>
- <section>
- <title>How do I create a new invoice line item?</title>
- <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>
- <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>
- </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>
- </section>
-
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The Accounting Edit Invoice Items screen.</title>
+ <para>The Invoice Items screen displays the individual invoice line details and allows the user to update or remove an entry. As each invoice line is created it is allocated a specific sequence (or Item Number) which acts as a unique identifier.</para>
+ <section>
+ <title>How do I create a new invoice line item?</title>
+ <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>
+ <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>
+ </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>
+ </section>
+
</section>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml Thu Sep 24 00:38:31 2009
@@ -18,11 +18,11 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting Main screen.</title>
+ xmlns:xl="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The Accounting Main screen.</title>
<para>
This is the default tab for the Accounting Manager application. The screen currently shows links that will display more detailed screens
related to Agreements, Billing Accounts, Invoices and Payments.
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=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml Thu Sep 24 00:38:31 2009
@@ -14,47 +14,47 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting New Invoice screen.</title>
- <para>This screen allows the user to create a new Sales or Purchase
- Invoice. Sales Invoices are created when a customer buys something
- from you. Purchase Invoices are created when you buy something from a
- 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>
- </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>
- </section>
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The Accounting New Invoice screen.</title>
+ <para>This screen allows the user to create a new Sales or Purchase
+ Invoice. Sales Invoices are created when a customer buys something
+ from you. Purchase Invoices are created when you buy something from a
+ 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>
+ </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>
+ </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=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml Thu Sep 24 00:38:31 2009
@@ -14,77 +14,77 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting New Payment help screen.</title>
- <para>This screen is used to create a new payment. Payments can be
- incoming (eg from a customer) or outgoing (eg to a supplier). Payment
- 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>
- <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>
- <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>
- Select the 'Payment Type Id' from the drop down box (NOTE: This
- 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
- 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.
- </para>
- </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
- 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>
- </section>
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The Accounting New Payment help screen.</title>
+ <para>This screen is used to create a new payment. Payments can be
+ incoming (eg from a customer) or outgoing (eg to a supplier). Payment
+ 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>
+ <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>
+ <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>
+ Select the 'Payment Type Id' from the drop down box (NOTE: This
+ 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
+ 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.
+ </para>
+ </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
+ 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>
+ </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=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml Thu Sep 24 00:38:31 2009
@@ -14,31 +14,31 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting Payment Overview help screen.</title>
- <para>The Payments Overview screen displays the summary details of the
- payment. On one side it shows information related to the payment
- 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>
+ 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 Payment Overview help screen.</title>
+ <para>The Payments Overview screen displays the summary details of the
+ payment. On one side it shows information related to the payment
+ 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>
- <para>* Create New (Create a new payment)</para>
- <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
- to 'Confirmed'. NOTE: This status option will not appear until the
- status has been changed to 'Received')</para>
- <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>
+ <para>* Create New (Create a new payment)</para>
+ <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
+ to 'Confirmed'. NOTE: This status option will not appear until the
+ status has been changed to 'Received')</para>
+ <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>
</section>
Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml Thu Sep 24 00:38:31 2009
@@ -14,9 +14,9 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
<title>Accounting Payment Gateway.</title>
<xi:include href="HELP_ACCOUNTING_FindGatewayResponses.xml" />
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=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml Thu Sep 24 00:38:31 2009
@@ -14,9 +14,9 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
<title>Accounting Payments.</title>
<xi:include href="HELP_ACCOUNTING_newPayment.xml" />
<xi:include href="HELP_ACCOUNTING_paymentOverview.xml" />
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=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml Thu Sep 24 00:38:31 2009
@@ -14,29 +14,29 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Accounting Send Per Email screen.</title>
- <para>This is used to send a copy of the invoice details to one or more
- email addresses. The invoice is included as an attachment and the user
- can add a simple accompanying email message.</para>
- <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>
- </section>
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The Accounting Send Per Email screen.</title>
+ <para>This is used to send a copy of the invoice details to one or more
+ email addresses. The invoice is included as an attachment and the user
+ can add a simple accompanying email message.</para>
+ <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>
+ </section>
</section>
Modified: ofbiz/trunk/applications/accounting/documents/Accounting.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/documents/Accounting.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/documents/Accounting.xml (original)
+++ ofbiz/trunk/applications/accounting/documents/Accounting.xml Thu Sep 24 00:38:31 2009
@@ -18,10 +18,10 @@
under the License.
-->
<chapter 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 Component.</title>
+ 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 Component.</title>
<xi:include href="../data/helpdata/HELP_ACCOUNTING.xml" />
<xi:include href="../data/helpdata/HELP_ACCOUNTING_main.xml" />
<xi:include href="../data/helpdata/HELP_ACCOUNTING_invoices.xml" />
Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_COMMONEXT.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_COMMONEXT.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_COMMONEXT.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_COMMONEXT.xml Thu Sep 24 00:38:31 2009
@@ -18,11 +18,11 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Application Common Component Main Help</title>
+ 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 Application Common Component Main Help</title>
<para>
The Application Common component stores items which either are used in many components but do not fit in the Framework or
stores items which uses functions stored in many components.
Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml Thu Sep 24 00:38:31 2009
@@ -18,10 +18,10 @@
under the License.
-->
<set 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">
+ 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">
<info>
<title>Apache OFBiz official documentation.</title>
Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml Thu Sep 24 00:38:31 2009
@@ -18,10 +18,10 @@
under the License.
-->
<book 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">
+ 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">
<info>
<title>Apache OFBiz Technical documentation.</title>
@@ -131,7 +131,7 @@
<appendix>
- <title>The Apache OFBiz documentation system</title>
+ <title>The Apache OFBiz documentation system</title>
<section>
<title>Overview.</title>
@@ -145,14 +145,14 @@
docbook schemas are stored in the applications/content/dtd
directory and the stylesheets are
stored in the applications/content/templates/docbook directory.
- </para>
+ </para>
<para>
the definition of the content and dataresource records can be found in
the application/content/data/ContentType.xml file at the
bottom. They are in this file because the documentation and
helpfile
are considered 'seed' data: essential for the operation of OFBiz.
- </para>
+ </para>
<para>
If you are looking for docbook files format examples, please
look at the following files:
Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<book 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">
+ 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">
- <info>
- <title>Apache OFBiz User documentation</title>
+ <info>
+ <title>Apache OFBiz User documentation</title>
<copyright><year>2009</year><holder>Apache Foundation</holder></copyright>
- </info>
+ </info>
<chapter>
<title>Introduction</title>
Modified: ofbiz/trunk/applications/commonext/documents/CommonExt.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/CommonExt.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/CommonExt.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/CommonExt.xml Thu Sep 24 00:38:31 2009
@@ -19,9 +19,9 @@
-->
<chapter 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">
+ 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 Application Common Component.</title>
Modified: ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy (original)
+++ ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy Thu Sep 24 00:38:31 2009
@@ -31,7 +31,7 @@
organizationRoles = delegator.findByAnd("PartyRole",[partyId : group.partyId, roleTypeId : "ORGANIZATION_ROLE"]);
organizationRole = EntityUtil.getFirst(organizationRoles);
if(organizationRole){
- organizationList.add(organizationRole);
+ organizationList.add(organizationRole);
}
}
globalContext.PartyAcctgPrefAndGroupList = partyAcctgPrefAndGroupList;
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy Thu Sep 24 00:38:31 2009
@@ -37,11 +37,11 @@
context.partyPostalAddress = partyPostalAddress;
if("productstore".equals(tabButtonItemTop)){
- if(findResultSize == 0){
- request.setAttribute("_ERROR_MESSAGE_", "Facility not set!");
- context.showScreen = "message";
+ if(findResultSize == 0){
+ request.setAttribute("_ERROR_MESSAGE_", "Facility not set!");
+ context.showScreen = "message";
return;
- }else{
- context.showScreen = "origin";
- }
+ }else{
+ context.showScreen = "origin";
+ }
}
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy Thu Sep 24 00:38:31 2009
@@ -27,23 +27,23 @@
productStore = EntityUtil.getFirst(delegator.findByAnd("ProductStore", [payToPartyId: partyId]));
if(productStore){
- context.productStoreId = productStore.productStoreId;
+ context.productStoreId = productStore.productStoreId;
}
if(UtilValidate.isEmpty(productStore)){
- errMsgList.add("Product Store not set!");
- showScreen = "message";
+ errMsgList.add("Product Store not set!");
+ showScreen = "message";
}else{
- facility = delegator.findByPrimaryKey("Facility", [facilityId : productStore.inventoryFacilityId]);
- webSite = EntityUtil.getFirst(delegator.findByAnd("WebSite", [productStoreId: productStore.productStoreId]));
-
- if(UtilValidate.isEmpty(facility)){
- errMsgList.add("Facility not set!");
- showScreen = "message";
- }
- if(UtilValidate.isEmpty(webSite)){
- errMsgList.add("WebSite not set!");
- showScreen = "message";
- }
+ facility = delegator.findByPrimaryKey("Facility", [facilityId : productStore.inventoryFacilityId]);
+ webSite = EntityUtil.getFirst(delegator.findByAnd("WebSite", [productStoreId: productStore.productStoreId]));
+
+ if(UtilValidate.isEmpty(facility)){
+ errMsgList.add("Facility not set!");
+ showScreen = "message";
+ }
+ if(UtilValidate.isEmpty(webSite)){
+ errMsgList.add("WebSite not set!");
+ showScreen = "message";
+ }
}
if (errMsgList) {
request.setAttribute("_ERROR_MESSAGE_LIST_", errMsgList);
@@ -52,70 +52,70 @@
productStoreCatalog = EntityUtil.getFirst(delegator.findByAnd("ProductStoreCatalog", [productStoreId: productStore.productStoreId]));
if(productStoreCatalog){
- prodCatalog = productStoreCatalog.getRelatedOne("ProdCatalog");
- prodCatalogId = prodCatalog.prodCatalogId;
+ prodCatalog = productStoreCatalog.getRelatedOne("ProdCatalog");
+ prodCatalogId = prodCatalog.prodCatalogId;
}
context.prodCatalog = prodCatalog;
context.prodCatalogId = prodCatalogId
context.showScreen = showScreen;
if(("productcategory".equals(tabButtonItem)) || ("product".equals(tabButtonItem))){
- productCategory = null;
- productCategoryId = parameters.productCategoryId;
- showErrorMsg = "N";
-
- if(UtilValidate.isEmpty(prodCatalogId)){
- errMsgList.add("Product Catalog not set!");
- showErrorMsg = "Y";
- }
+ productCategory = null;
+ productCategoryId = parameters.productCategoryId;
+ showErrorMsg = "N";
+
+ if(UtilValidate.isEmpty(prodCatalogId)){
+ errMsgList.add("Product Catalog not set!");
+ showErrorMsg = "Y";
+ }
- prodCatalogCategory = EntityUtil.getFirst(delegator.findByAnd("ProdCatalogCategory", [prodCatalogId: prodCatalogId]));
-
- if(prodCatalogCategory){
- productCategory = prodCatalogCategory.getRelatedOne("ProductCategory");
- productCategoryId = productCategory.productCategoryId;
-
- }
- context.productCategoryId = productCategoryId;
- context.productCategory = productCategory;
-
- if("product".equals(tabButtonItem)){
- productId = parameters.productId;
- product = null;
-
- if(UtilValidate.isEmpty(productCategoryId)){
- errMsgList.add("Product Category not set!");
- showErrorMsg = "Y";
- }
- /**************** get product from ProductCategory ******************/
- productCategoryMember = EntityUtil.getFirst(delegator.findByAnd("ProductCategoryMember", [productCategoryId: productCategoryId]));
- if(productCategoryMember){
- product = productCategoryMember.getRelatedOne("Product");
- productId = product.productId;
- // Average cost
- averageCostValues = delegator.findByAnd("ProductPrice", [productId : productId, productPricePurposeId : "PURCHASE", productPriceTypeId : "AVERAGE_COST"]);
- if(averageCostValues){
- averageCostValue = EntityUtil.getFirst(EntityUtil.filterByDate(averageCostValues));
- if (averageCostValue?.price != null) {
- context.averageCost = averageCostValue.price;
- }
- }
- // Default cost
- defaultPriceValues = delegator.findByAnd("ProductPrice", [productId : productId, productPricePurposeId : "PURCHASE", productPriceTypeId : "DEFAULT_PRICE"]);
- if(defaultPriceValues){
- defaultPrice = EntityUtil.getFirst(EntityUtil.filterByDate(defaultPriceValues));
- if (defaultPrice?.price != null) {
- context.defaultPrice = defaultPrice.price;
- }
- }
- }
- context.productId = productId;
- context.product = product;
- }
-
- if (errMsgList) {
- request.setAttribute("_ERROR_MESSAGE_LIST_", errMsgList);
- return;
- }
- context.showErrorMsg = showErrorMsg;
+ prodCatalogCategory = EntityUtil.getFirst(delegator.findByAnd("ProdCatalogCategory", [prodCatalogId: prodCatalogId]));
+
+ if(prodCatalogCategory){
+ productCategory = prodCatalogCategory.getRelatedOne("ProductCategory");
+ productCategoryId = productCategory.productCategoryId;
+
+ }
+ context.productCategoryId = productCategoryId;
+ context.productCategory = productCategory;
+
+ if("product".equals(tabButtonItem)){
+ productId = parameters.productId;
+ product = null;
+
+ if(UtilValidate.isEmpty(productCategoryId)){
+ errMsgList.add("Product Category not set!");
+ showErrorMsg = "Y";
+ }
+ /**************** get product from ProductCategory ******************/
+ productCategoryMember = EntityUtil.getFirst(delegator.findByAnd("ProductCategoryMember", [productCategoryId: productCategoryId]));
+ if(productCategoryMember){
+ product = productCategoryMember.getRelatedOne("Product");
+ productId = product.productId;
+ // Average cost
+ averageCostValues = delegator.findByAnd("ProductPrice", [productId : productId, productPricePurposeId : "PURCHASE", productPriceTypeId : "AVERAGE_COST"]);
+ if(averageCostValues){
+ averageCostValue = EntityUtil.getFirst(EntityUtil.filterByDate(averageCostValues));
+ if (averageCostValue?.price != null) {
+ context.averageCost = averageCostValue.price;
+ }
+ }
+ // Default cost
+ defaultPriceValues = delegator.findByAnd("ProductPrice", [productId : productId, productPricePurposeId : "PURCHASE", productPriceTypeId : "DEFAULT_PRICE"]);
+ if(defaultPriceValues){
+ defaultPrice = EntityUtil.getFirst(EntityUtil.filterByDate(defaultPriceValues));
+ if (defaultPrice?.price != null) {
+ context.defaultPrice = defaultPrice.price;
+ }
+ }
+ }
+ context.productId = productId;
+ context.product = product;
+ }
+
+ if (errMsgList) {
+ request.setAttribute("_ERROR_MESSAGE_LIST_", errMsgList);
+ return;
+ }
+ context.showErrorMsg = showErrorMsg;
}
\ No newline at end of file
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy Thu Sep 24 00:38:31 2009
@@ -25,24 +25,24 @@
productStore = EntityUtil.getFirst(delegator.findByAnd("ProductStore", [payToPartyId: partyId]));
if(productStore){
- productStoreId = productStore.productStoreId
+ productStoreId = productStore.productStoreId
}
context.productStoreId = productStoreId;
context.productStore = productStore;
if("website".equals(tabButtonItemTop)){
- if(productStoreId != null){
- webSite = EntityUtil.getFirst(delegator.findByAnd("WebSite", [productStoreId: productStoreId]));
- context.showScreen = "origin";
- }else{
- request.setAttribute("_ERROR_MESSAGE_", "Product Store not set!");
- context.showScreen = "message";
+ if(productStoreId != null){
+ webSite = EntityUtil.getFirst(delegator.findByAnd("WebSite", [productStoreId: productStoreId]));
+ context.showScreen = "origin";
+ }else{
+ request.setAttribute("_ERROR_MESSAGE_", "Product Store not set!");
+ context.showScreen = "message";
return;
- }
-
- if(webSite){
- webSiteId = webSite.webSiteId;
- }
- context.webSiteId = webSiteId;
- context.webSite = webSite;
+ }
+
+ if(webSite){
+ webSiteId = webSite.webSiteId;
+ }
+ context.webSiteId = webSiteId;
+ context.webSite = webSite;
}
\ No newline at end of file
Modified: ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml (original)
+++ ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml Thu Sep 24 00:38:31 2009
@@ -18,20 +18,20 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Main Content help screen</title>
+ 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 Main Content help screen</title>
<para>Introductory text for the content component</para>
<section>
<title>subsection heading</title>
<para>Subsection content</para>
</section>
- <section>
+ <section>
<title>Subsection 2 title</title>
<para>
- for more info see the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> for more info.
+ for more info see the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> for more info.
</para>
</section>
</section>
Modified: ofbiz/trunk/applications/content/documents/Content.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/documents/Content.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/documents/Content.xml (original)
+++ ofbiz/trunk/applications/content/documents/Content.xml Thu Sep 24 00:38:31 2009
@@ -18,13 +18,13 @@
under the License.
-->
<chapter 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 Content Component</title>
- <section>
- <title>Introduction</title>
- <para>
+ 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 Content Component</title>
+ <section>
+ <title>Introduction</title>
+ <para>
</para>
- </section>
+ </section>
</chapter>
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Thu Sep 24 00:38:31 2009
@@ -116,7 +116,7 @@
GenericValue v = (GenericValue) i.next();
String sub = null;
try {
- Map<String, Object> dummy = FastMap.newInstance();
+ Map<String, Object> dummy = FastMap.newInstance();
sub = ContentWorker.renderSubContentAsText(dispatcher, delegator, v.getString("contentId"), mapKey, dummy, locale, mimeTypeId, true);
} catch (GeneralException e) {
Debug.logError(e, module);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Sep 24 00:38:31 2009
@@ -182,7 +182,7 @@
public static void renderContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, GenericValue content, Appendable out,
Map<String,Object>templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
// if the content has a service attached run the service
-
+
String serviceName = content.getString("serviceName");
if (dispatcher != null && UtilValidate.isNotEmpty(serviceName)) {
DispatchContext dctx = dispatcher.getDispatchContext();
@@ -276,24 +276,24 @@
// This part is using an xml file as the input data and an ftl or xsl file to present it.
if (UtilValidate.isNotEmpty(mimeType)) {
- if (mimeType.toLowerCase().indexOf("xml") >= 0) {
- GenericValue dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
- GenericValue templateDataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", templateDataResourceId));
- if ("FTL".equals(templateDataResource.getString("dataTemplateTypeId"))) {
- StringReader sr = new StringReader(textData);
- try {
- NodeModel nodeModel = NodeModel.parse(new InputSource(sr));
- templateContext.put("doc", nodeModel) ;
- } catch (SAXException e) {
- throw new GeneralException(e.getMessage());
- } catch (ParserConfigurationException e2) {
- throw new GeneralException(e2.getMessage());
- }
- } else {
- templateContext.put("docFile", DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).getAbsoluteFile().toString());
- }
- } else {
- // must be text
+ if (mimeType.toLowerCase().indexOf("xml") >= 0) {
+ GenericValue dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
+ GenericValue templateDataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", templateDataResourceId));
+ if ("FTL".equals(templateDataResource.getString("dataTemplateTypeId"))) {
+ StringReader sr = new StringReader(textData);
+ try {
+ NodeModel nodeModel = NodeModel.parse(new InputSource(sr));
+ templateContext.put("doc", nodeModel) ;
+ } catch (SAXException e) {
+ throw new GeneralException(e.getMessage());
+ } catch (ParserConfigurationException e2) {
+ throw new GeneralException(e2.getMessage());
+ }
+ } else {
+ templateContext.put("docFile", DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).getAbsoluteFile().toString());
+ }
+ } else {
+ // must be text
templateContext.put("textData", textData);
}
} else {
Modified: ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl Thu Sep 24 00:38:31 2009
@@ -18,20 +18,20 @@
-->
<div class="screenlet">
<table cellspacing="0" width="100%">
- <tr colspan="3">
- <td align="left">
+ <tr colspan="3">
+ <td align="left">
<#if (viewIndex > 0)>
- <#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexFirst>
+ <#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexFirst>
<a href="javascript:nextPrevDocumentList('${url}');" class="nav-next">${uiLabelMap.CommonFirst}</a>|
- <#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexPrevious>
- <a href="javascript:nextPrevDocumentList('${url}');" class="nav-previous">${uiLabelMap.CommonPrevious}</a>|
+ <#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexPrevious>
+ <a href="javascript:nextPrevDocumentList('${url}');" class="nav-previous">${uiLabelMap.CommonPrevious}</a>|
</#if>
<#if (arraySize > 0)>
- ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${arraySize}
+ ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${arraySize}
</#if>
<#if (arraySize > highIndex)>
- <#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexNext>|
- <a href="javascript:nextPrevDocumentList('${url}');" class="nav-next">${uiLabelMap.CommonNext}</a>
+ <#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexNext>|
+ <a href="javascript:nextPrevDocumentList('${url}');" class="nav-next">${uiLabelMap.CommonNext}</a>
<#assign url='/views/'+tabButtonItem+'?'+curFindString+'&VIEW_SIZE='+viewSize+'&VIEW_INDEX='+viewIndexLast>|
<a href="javascript:nextPrevDocumentList('${url}');" class="nav-next">${uiLabelMap.CommonLast}</a>
</#if>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml Thu Sep 24 00:38:31 2009
@@ -18,10 +18,10 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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>Marketing overview</title>
<section>
<para>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml Thu Sep 24 00:38:31 2009
@@ -18,10 +18,10 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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>Marketing main help screen.</title>
<section>
<para>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml Thu Sep 24 00:38:31 2009
@@ -18,10 +18,10 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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>SFA overview</title>
<section>
<para>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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 SFA Accounts find/list screen</title>
- <section>
- <para>
- The Accounts screen will show you the list which you have created ore which have been assigned to you.
+ <section>
+ <para>
+ The Accounts screen will show you the list which you have created ore which have been assigned to you.
</para>
- </section>
+ </section>
</section>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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 SFA Accounts find/list screen</title>
- <section>
- <para>
- The Accounts screen will show you the list which you have created ore which have been assigned to you.
+ <section>
+ <para>
+ The Accounts screen will show you the list which you have created ore which have been assigned to you.
</para>
- </section>
+ </section>
</section>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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 SFA Leads find/list screen</title>
- <section>
- <para>
- The leads screen will show you the list which you have created ore which have been assigned to you.
+ <section>
+ <para>
+ The leads screen will show you the list which you have created ore which have been assigned to you.
</para>
- </section>
+ </section>
</section>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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 SFA SalesOpportunity find/list screen</title>
- <section>
- <para>
- The SalesOpportunity screen will show you the list which you have created.
+ <section>
+ <para>
+ The SalesOpportunity screen will show you the list which you have created.
</para>
- </section>
+ </section>
</section>
Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml Thu Sep 24 00:38:31 2009
@@ -18,18 +18,18 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
+ 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 SFA Main screen</title>
- <section>
- <para>
- The SFA main screen allows the quick create of any new lead and/or
- contact which is available on any SFA screen.
- Further this screen is designed to provide an overview of this users
- activity.
+ <section>
+ <para>
+ The SFA main screen allows the quick create of any new lead and/or
+ contact which is available on any SFA screen.
+ Further this screen is designed to provide an overview of this users
+ activity.
</para>
- </section>
+ </section>
</section>
Modified: ofbiz/trunk/applications/marketing/documents/Marketing.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/documents/Marketing.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/documents/Marketing.xml (original)
+++ ofbiz/trunk/applications/marketing/documents/Marketing.xml Thu Sep 24 00:38:31 2009
@@ -19,9 +19,9 @@
-->
<chapter 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">
+ 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 Marketing Component.</title>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Thu Sep 24 00:38:31 2009
@@ -83,29 +83,29 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen>
<screen name="AssignAccountToMe">
- <section>
- <actions>
- <set field="headerItem" value="Accounts" />
- <set field="titleProperty" value="PageTitleCreateAccount" />
- <set field="accountType" from-field="parameters.accountType" />
- <property-to-field field="defaultCountryGeoId"
- resource="general" property="country.geo.id.default" default="USA" />
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="no-clear">
- <screenlet title="${uiLabelMap.PageTitleAssignAccountFromExisting}">
- <include-form name="AssignAccountToMe"
- location="component://marketing/widget/sfa/forms/AccountForms.xml" />
- </screenlet>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+ <section>
+ <actions>
+ <set field="headerItem" value="Accounts" />
+ <set field="titleProperty" value="PageTitleCreateAccount" />
+ <set field="accountType" from-field="parameters.accountType" />
+ <property-to-field field="defaultCountryGeoId"
+ resource="general" property="country.geo.id.default" default="USA" />
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="no-clear">
+ <screenlet title="${uiLabelMap.PageTitleAssignAccountFromExisting}">
+ <include-form name="AssignAccountToMe"
+ location="component://marketing/widget/sfa/forms/AccountForms.xml" />
+ </screenlet>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Thu Sep 24 00:38:31 2009
@@ -212,27 +212,27 @@
</section>
</screen>
- <screen name="AssignLeadToMe">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleAssignLeadFromExisting" />
- <set field="headerItem" value="Leads" />
- </actions>
- <widgets>
- <decorator-screen name="CommonPartyDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="no-clear">
- <screenlet title="${uiLabelMap.PageTitleAssignLeadFromExisting}">
- <include-form name="AssignLeadToMe"
- location="component://marketing/widget/sfa/forms/LeadForms.xml" />
- </screenlet>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+ <screen name="AssignLeadToMe">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleAssignLeadFromExisting" />
+ <set field="headerItem" value="Leads" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="no-clear">
+ <screenlet title="${uiLabelMap.PageTitleAssignLeadFromExisting}">
+ <include-form name="AssignLeadToMe"
+ location="component://marketing/widget/sfa/forms/LeadForms.xml" />
+ </screenlet>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="LeadPartyDataSource">
<section>
Modified: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml (original)
+++ ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY.xml Thu Sep 24 00:38:31 2009
@@ -18,11 +18,11 @@
under the License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
- xmlns:xl="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Party Introduction</title>
+ 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 Party Introduction</title>
<para>
The Party Manager application is used to manage the parties, i.e any legal entity your company has to deal with.
</para>
Modified: ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml (original)
+++ ofbiz/trunk/applications/party/data/helpdata/HELP_PARTY_findparty.xml Thu Sep 24 00:38:31 2009
@@ -14,12 +14,12 @@
License.
-->
<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
- xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Party Find help screen.</title>
- <para>The default screen is for the Party tab is 'Find Party'. It
- is used to locate existing parties. Vrious serach criteria can be used, either based on the
+ 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 Party Find help screen.</title>
+ <para>The default screen is for the Party tab is 'Find Party'. It
+ is used to locate existing parties. Vrious serach criteria can be used, either based on the
the general party data like name role and type but also on the postal address, telephone (Telecom)
and other like email address.
</para>
Modified: ofbiz/trunk/applications/party/documents/Party.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/documents/Party.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/documents/Party.xml (original)
+++ ofbiz/trunk/applications/party/documents/Party.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<chapter 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 Party Component.</title>
- <section>
- <title>Introduction</title>
- <para>
- Please find here a general introduction to the party component (to be continued)
+ 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 Party Component.</title>
+ <section>
+ <title>Introduction</title>
+ <para>
+ Please find here a general introduction to the party component (to be continued)
</para>
- </section>
- <xi:include href="../data/helpdata/HELP_PARTY_findparty.xml" />
+ </section>
+ <xi:include href="../data/helpdata/HELP_PARTY_findparty.xml" />
</chapter>
Modified: ofbiz/trunk/applications/product/documents/Product.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/documents/Product.xml?rev=818327&r1=818326&r2=818327&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/documents/Product.xml (original)
+++ ofbiz/trunk/applications/product/documents/Product.xml Thu Sep 24 00:38:31 2009
@@ -18,15 +18,15 @@
under the License.
-->
<chapter 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 Product Catalog Component</title>
- <section>
- <title>Introduction Paragraph</title>
- <para>
- and a introduction paragraph
+ 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 Product Catalog Component</title>
+ <section>
+ <title>Introduction Paragraph</title>
+ <para>
+ and a introduction paragraph
</para>
- </section>
- <xi:include href="../data/helpdata/HELP_PRODCATALOG_main.xml" />
+ </section>
+ <xi:include href="../data/helpdata/HELP_PRODCATALOG_main.xml" />
</chapter>