svn commit: r557086 - in /ofbiz/trunk/applications: accounting/webapp/accounting/admin/ accounting/webapp/accounting/agreement/ accounting/webapp/accounting/fixedasset/ accounting/webapp/accounting/payment/ accounting/widget/ content/webapp/content/sur...

[adrianc]

Author: adrianc
Date: Tue Jul 17 16:45:33 2007
New Revision: 557086

URL: http://svn.apache.org/viewvc?view=rev&rev=557086
Log:
Improved currency UOM drop-down lists. Patch provided by Bilgin Ibryam, OFBIZ-1153. I tested a handful of instances. Since the same change is made in all places, I will assume the patch works just as well in the screens I didn't check.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
    ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
    ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
    ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Tue Jul 17 16:45:33 2007
@@ -80,9 +80,9 @@
         </field>
         <field name="baseCurrencyUomId" use-when="partyAcctgPreference==null">
             <drop-down no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -194,17 +194,17 @@
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}">
             <drop-down no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}">
             <drop-down no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Tue Jul 17 16:45:33 2007
@@ -134,8 +134,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Tue Jul 17 16:45:33 2007
@@ -176,9 +176,9 @@
         </field>
         <field name="amountUomId">
             <drop-down allow-empty="true">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="uomId"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -198,9 +198,9 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"/>
         <field name="amountUomId">
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="uomId"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Tue Jul 17 16:45:33 2007
@@ -102,7 +102,7 @@
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -139,7 +139,7 @@
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -200,7 +200,7 @@
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -209,7 +209,7 @@
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Tue Jul 17 16:45:33 2007
@@ -97,8 +97,8 @@
                 
         <field name="accountCurrencyUomId">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" description="[${abbreviation}] ${description}" key-field-name="uomId">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
                     <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Jul 17 16:45:33 2007
@@ -72,9 +72,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="uomId"/>                    
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Tue Jul 17 16:45:33 2007
@@ -43,8 +43,8 @@
         </field>
         <field name="currencyUomId" required-field="false">
             <drop-down allow-empty="true" no-current-selected-key="USD">
-                <entity-options entity-name="Uom" description="[${abbreviation}] ${description}" key-field-name="uomId">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
                     <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
@@ -68,4 +68,4 @@
         <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 </forms>
-    
\ No newline at end of file
+    

Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Tue Jul 17 16:45:33 2007
@@ -215,10 +215,10 @@
         
         <field name="amountBaseUomId">
             <drop-down allow-empty="true">
-               <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
-                   <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                   <entity-order-by field-name="description"/>
-               </entity-options>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="durationUomId">

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml Tue Jul 17 16:45:33 2007
@@ -58,9 +58,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}">
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Tue Jul 17 16:45:33 2007
@@ -57,9 +57,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Tue Jul 17 16:45:33 2007
@@ -51,8 +51,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="false" current="selected" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options description="${abbreviation}" key-field-name="uomId" entity-name="Uom">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Tue Jul 17 16:45:33 2007
@@ -50,9 +50,9 @@
         <field name="productStoreId"><lookup target-form-name="/marketing/control/LookupProductStore"/></field>
         <field name="currencyUom" widget-style="selectBox">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Uom" key-field-name="uomId">
+                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -314,8 +314,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Tue Jul 17 16:45:33 2007
@@ -66,9 +66,9 @@
         
         <field name="currencyUom" widget-style="selectBox">
             <drop-down>
-                <entity-options description="${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Tue Jul 17 16:45:33 2007
@@ -51,8 +51,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -140,9 +141,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="uomId"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Tue Jul 17 16:45:33 2007
@@ -182,8 +182,9 @@
         </field>
         <field name="maximumAmountUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Tue Jul 17 16:45:33 2007
@@ -488,8 +488,8 @@
         </field>
         <field name="currencyUomId">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" description="[${abbreviation}] ${description}" key-field-name="uomId">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
                     <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Tue Jul 17 16:45:33 2007
@@ -107,8 +107,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Tue Jul 17 16:45:33 2007
@@ -225,9 +225,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}" widget-style="selectBox">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -555,9 +555,9 @@
         </field>
         <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}" use-when="supplierProduct==null">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -888,9 +888,9 @@
         </field>
         <field name="costUomId" title="${uiLabelMap.CommonCurrency}" widget-style="selectBox">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -1471,4 +1471,4 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>  
  </forms>
-
\ No newline at end of file
+

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Tue Jul 17 16:45:33 2007
@@ -129,9 +129,9 @@
         -->
         <field name="defaultCurrencyUomId">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -611,9 +611,9 @@
         </field>
         <field name="puom" title="${uiLabelMap.ProductUnitOfMeasure}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Tue Jul 17 16:45:33 2007
@@ -87,8 +87,8 @@
         <field name="estimatedShipCost" title="${uiLabelMap.ProductEstimatedShipCost}"><text/></field>
         <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}">
             <drop-down allow-empty="true" current="first-in-list">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${abbreviation} [${description}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
                     <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Tue Jul 17 16:45:33 2007
@@ -69,8 +69,9 @@
         </field>
         <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="[${uomId}] - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?view=diff&rev=557086&r1=557085&r2=557086
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Jul 17 16:45:33 2007
@@ -113,8 +113,9 @@
         <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
         <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="[${uomId}] - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -217,8 +218,9 @@
         </field>
         <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
             <drop-down allow-empty="true">
-                <entity-options description="[${uomId}] - ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="abbreviation"/>
                 </entity-options>
             </drop-down>
         </field>