svn commit: r1006041 - /ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml

[jonesde]

Author: jonesde
Date: Fri Oct  8 22:00:04 2010
New Revision: 1006041

URL: http://svn.apache.org/viewvc?rev=1006041&view=rev
Log:
Changed store shipping setup Geo drop-downs to lookup screens to better handle the case where a system has a more complete set of Geos, like an imported zip code database, etc

Modified:
    ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=1006041&r1=1006040&r2=1006041&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Fri Oct  8 22:00:04 2010
@@ -659,20 +659,10 @@
             <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
         <field name="includeGeoId" title="${uiLabelMap.ProductIncludeGeo}" tooltip="${uiLabelMap.ProductIncludeGeoMessage}">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
-                    <entity-order-by field-name="geoTypeId"/>
-                    <entity-order-by field-name="geoName"/>
-                </entity-options>
-            </drop-down>
+            <lookup target-form-name="LookupGeo"/>
         </field>
         <field name="excludeGeoId" title="${uiLabelMap.ProductExcludeGeo}" tooltip="${uiLabelMap.ProductExcludeGeoMessage}">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
-                    <entity-order-by field-name="geoTypeId"/>
-                    <entity-order-by field-name="geoName"/>
-                </entity-options>
-            </drop-down>
+            <lookup target-form-name="LookupGeo"/>
         </field>
         <field name="includeFeatureGroup" title="${uiLabelMap.ProductIncludeFeature}" tooltip="${uiLabelMap.ProductIncludeFeatureMessage}"><text/></field>
         <field name="excludeFeatureGroup" title="${uiLabelMap.ProductExcludeFeature}" tooltip="${uiLabelMap.ProductExcludeFeatureMessage}"><text/></field>
@@ -756,20 +746,10 @@
             </drop-down>
         </field>
         <field name="fromGeo" title="${uiLabelMap.ProductFromGeo}">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
-                    <entity-order-by field-name="geoTypeId"/>
-                    <entity-order-by field-name="geoName"/>
-                </entity-options>
-            </drop-down>
+            <lookup target-form-name="LookupGeo"/>
         </field>
         <field name="toGeo" title="${uiLabelMap.ProductToGeo}">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
-                    <entity-order-by field-name="geoTypeId"/>
-                    <entity-order-by field-name="geoName"/>
-                </entity-options>
-            </drop-down>
+            <lookup target-form-name="LookupGeo"/>
         </field>
         <field name="partyId"><text/></field>
         <field name="roleTypeId"><text/></field>