svn commit: r1338699 - in /ofbiz/trunk/applications/accounting/widget: InvoiceForms.xml InvoiceScreens.xml

[ChrisG-2]

Author: chrisg
Date: Tue May 15 13:30:52 2012
New Revision: 1338699

URL: http://svn.apache.org/viewvc?rev=1338699&view=rev
Log:
show localized description in invoice item type drop-down

Modified:
    ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1338699&r1=1338698&r2=1338699&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Tue May 15 13:30:52 2012
@@ -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="${description}"/>
+               <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${groovy:uiLabelMap.get('InvoiceItemType.description.'+invoiceItemTypeId)}"/>
            </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="${description}"/>
+                <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${groovy:uiLabelMap.get('InvoiceItemType.description.'+invoiceItemTypeId)}"/>
             </drop-down>
         </field>
         <field position="1" name="description"><text size="80"/></field>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1338699&r1=1338698&r2=1338699&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue May 15 13:30:52 2012
@@ -421,6 +421,7 @@ under the License.
     <screen name="EditInvoiceItems">
         <section>
             <actions>
+                <property-map resource="AccountingEntityLabels" map-name="uiLabelMap" global="true"/>
                 <set field="viewIndex" from-field="parameters.viewIndex"/>
                 <set field="viewSize" from-field="parameters.viewSize"/>
                 <set field="titleProperty" value="PageTitleListInvoices"/>