svn commit: r1626410 - in /ofbiz/branches/release13.07/applications/accounting: webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy widget/InvoiceForms.xml

[ashish-18]

Author: ashish
Date: Sat Sep 20 10:10:18 2014
New Revision: 1626410

URL: http://svn.apache.org/r1626410
Log:
Applied bug fix from trunk r1626409.
Applied bug fix from jira issue - OFBIZ-3537 - Not all sales invoice item types are showing in listInvoiceItems screen.
Thanks Arun Patidar for the contribution.

Modified:
    ofbiz/branches/release13.07/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy
    ofbiz/branches/release13.07/applications/accounting/widget/InvoiceForms.xml

Modified: ofbiz/branches/release13.07/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy?rev=1626410&r1=1626409&r2=1626410&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy (original)
+++ ofbiz/branches/release13.07/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy Sat Sep 20 10:10:18 2014
@@ -33,10 +33,10 @@ if (!invoice) return;
 glAccountOrganizationAndClassList = null;
 if ("SALES_INVOICE".equals(invoice.invoiceTypeId)) {
     itemTypesCond = exprBldr.OR() {
-        EQUALS(invoiceItemTypeId: "INVOICE_ADJ")
-        EQUALS(parentTypeId: "INVOICE_ADJ")
-        EQUALS(invoiceItemTypeId: "INVOICE_ITM_ADJ")
-        EQUALS(parentTypeId: "INVOICE_ITM_ADJ")
+        EQUALS(invoiceItemTypeId: "SINVOICE_ADJ")
+        EQUALS(parentTypeId: "SINVOICE_ADJ")
+        EQUALS(invoiceItemTypeId: "SINVOICE_ITM_ADJ")
+        EQUALS(parentTypeId: "SINVOICE_ITM_ADJ")
         EQUALS(invoiceItemTypeId: "INV_PROD_ITEM")
         EQUALS(parentTypeId: "INV_PROD_ITEM")
     }

Modified: ofbiz/branches/release13.07/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/widget/InvoiceForms.xml?rev=1626410&r1=1626409&r2=1626410&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/branches/release13.07/applications/accounting/widget/InvoiceForms.xml Sat Sep 20 10:10:18 2014
@@ -368,7 +368,7 @@ under the License.
        <field name="quantity"><text size="3"/></field>
        <field name="invoiceItemTypeId">
            <drop-down allow-empty="false">
-               <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${groovy:uiLabelMap.get('InvoiceItemType.description.'+invoiceItemTypeId)}"/>
+               <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/>
            </drop-down>
        </field>
        <field name="productId"><lookup target-form-name="LookupProduct" size="20"/></field>
@@ -396,7 +396,7 @@ under the License.
         <field name="invoiceId"><hidden/></field>
         <field position="1" name="invoiceItemTypeId">
             <drop-down allow-empty="false">
-                <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${groovy:uiLabelMap.get('InvoiceItemType.description.'+invoiceItemTypeId)}"/>
+                <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/>
             </drop-down>
         </field>
         <field position="1" name="description"><text size="80"/></field>