svn commit: r930707 - in /ofbiz/trunk: applications/accounting/widget/ applications/order/widget/ordermgr/ applications/party/widget/partymgr/ applications/product/widget/catalog/ applications/product/widget/facility/ applications/workeffort/widget/ fr...

[bibryam]

Author: bibryam
Date: Sun Apr  4 16:06:24 2010
New Revision: 930707

URL: http://svn.apache.org/viewvc?rev=930707&view=rev
Log:
Cleanup autocompleter fields. Removed type fields from the list.

Modified:
    ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
    ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
    ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml
    ofbiz/trunk/framework/common/widget/LookupScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -84,7 +84,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="FixedAsset"/>
-                <set field="searchFields" value="[fixedAssetId, fixedAssetName, fixedAssetTypeId]"/>
+                <set field="searchFields" value="[fixedAssetId, fixedAssetName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -165,7 +165,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Agreement"/>
-                <set field="searchFields" value="[agreementId, productId, description, agreementTypeId]"/>
+                <set field="searchFields" value="[agreementId, productId, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -191,8 +191,8 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
-                <set field="entityName" value="Agreement"/>
-                <set field="searchFields" value="[agreementItemSeqId, agreementId, agreementItemTypeId, currencyUomId]"/>
+                <set field="entityName" value="AgreementItem"/>
+                <set field="searchFields" value="[agreementItemSeqId, agreementId, currencyUomId]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -218,6 +218,8 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+                <set field="entityName" value="PaymentGroupMember"/>
+                <set field="searchFields" value="[paymentGroupId, paymentId, sequenceNum]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -35,7 +35,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="OrderHeader"/>
-                <set field="searchFields" value="[orderId, orderName, orderTypeId]"/>                
+                <set field="searchFields" value="[orderId, orderName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -62,7 +62,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="OrderHeaderAndShipGroups"/>
-                <set field="searchFields" value="[orderId, toName, orderTypeId]"/>                
+                <set field="searchFields" value="[orderId, orderName, toName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -88,7 +88,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="OrderHeaderAndShipGroups"/>
-                <set field="searchFields" value="[orderId, toName, orderTypeId]"/>                
+                <set field="searchFields" value="[orderId, orderName, toName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -115,7 +115,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="CustRequest"/>
-                <set field="searchFields" value="[custRequestId, custRequestName, statusId]"/>                
+                <set field="searchFields" value="[custRequestId, custRequestName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -168,7 +168,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Quote"/>
-                <set field="searchFields" value="[quoteId, quoteName, description]"/>                
+                <set field="searchFields" value="[quoteId, quoteName, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -195,7 +195,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="QuoteItem"/>
-                <set field="searchFields" value="[quoteItemSeqId, quoteId, productId, comments]"/>                
+                <set field="searchFields" value="[quoteItemSeqId, quoteId, productId, comments]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -221,7 +221,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Requirement"/>
-                <set field="searchFields" value="[requirementId, description, requirementTypeId]"/>                
+                <set field="searchFields" value="[requirementId, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -247,7 +247,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="ShoppingList"/>
-                <set field="searchFields" value="[shoppingListId, listName, description]"/>                
+                <set field="searchFields" value="[shoppingListId, listName, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -70,6 +70,8 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+                <set field="entityName" value="PartyNameContactMechView"/>
+                <set field="searchFields" value="[contactMechId, partyId, firstName, middleName, lastName, groupName]"/>  
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -94,6 +96,9 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+                <set field="entityName" value="PartyRoleNameDetail"/>
+                <set field="searchFields" value="[partyId, firstName, middleName, lastName, groupName]"/>
+                <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition(&quot;roleTypeId&quot;, &quot;CUSTOMER&quot;)}"/>        
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -397,7 +402,7 @@ under the License.
                 <set field="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
                 <set field="searchFields" value="[partyId, groupName, partyGroupComments]"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>      
-                <set field="updateStatCond" value="${groovy: context.andCondition = org.ofbiz.entity.condition.EntityCondition.makeCondition([context.andCondition,
+                <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition([context.andCondition,
                     org.ofbiz.entity.condition.EntityCondition.makeCondition(&quot;roleTypeId&quot;, &quot;INTERNAL_ORGANIZATIO&quot;)])}"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -30,7 +30,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupProduct}"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="entityName" value="Product"/>
-                <set field="searchFields" value="[productId, brandName, internalName, productTypeId]"/>                
+                <set field="searchFields" value="[productId, brandName, internalName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -54,8 +54,8 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupProductVirtual}"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="entityName" value="Product"/>
-                <set field="searchFields" value="[productId, brandName, internalName, productTypeId]"/>  
-                <set field="onlyVirtual" value="${groovy: context.andCondition = org.ofbiz.entity.condition.EntityCondition.makeCondition(&quot;isVirtual&quot;, &quot;Y&quot;)}"/>
+                <set field="searchFields" value="[productId, brandName, internalName]"/>
+                <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition(&quot;isVirtual&quot;, &quot;Y&quot;)}"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -105,8 +105,8 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
                 <set field="entityName" value="ProductAndPriceView"/>
-                <set field="searchFields" value="[productId, internalName, productTypeId]"/>    
-                <set field="displayFields" value="[productId, internalName, productTypeId, price, currencyUomId]"/>                          
+                <set field="searchFields" value="[productId, internalName]"/>
+                <set field="displayFields" value="[productId, internalName, price, currencyUomId]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -130,7 +130,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupProductCategory}"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="entityName" value="ProductCategory"/>
-                <set field="searchFields" value="[productCategoryId, categoryName, description, productCategoryTypeId]"/>                
+                <set field="searchFields" value="[productCategoryId, categoryName, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -154,7 +154,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupProductFeature}"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="entityName" value="ProductFeature"/>
-                <set field="searchFields" value="[productFeatureId, description, productFeatureCategoryId, productFeatureTypeId]"/>                
+                <set field="searchFields" value="[productFeatureId, description, productFeatureCategoryId]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -181,7 +181,7 @@ under the License.
                 <set field="entityName" value="ProductStore"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="entityName" value="ProductStore"/>
-                <set field="searchFields" value="[productStoreId, companyName, storeName, primaryStoreGroupId]"/>                
+                <set field="searchFields" value="[productStoreId, companyName, storeName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -207,7 +207,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupSupplierProduct} ${pnv.firstName} ${pnv.middleName} ${pnv.lastName} ${pnv.groupName} [${parameters.partyId}]"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="entityName" value="SupplierProductAndProduct"/>
-                <set field="searchFields" value="[productId, partyId, brandName, internalName, productTypeId]"/>                
+                <set field="searchFields" value="[productId, partyId, brandName, internalName]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -32,7 +32,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Facility"/>
-                <set field="searchFields" value="[facilityId, facilityName, facilityTypeId]"/>                
+                <set field="searchFields" value="[facilityId, facilityName, description]"/>                
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -83,7 +83,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Shipment"/>
-                <set field="searchFields" value="[shipmentId, shipmentTypeId, statusId]"/>                
+                <set field="searchFields" value="[shipmentId, shipmentTypeId]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -32,7 +32,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="WorkEffort"/>
-                <set field="searchFields" value="[workEffortId, workEffortName, workEffortTypeId]"/>                
+                <set field="searchFields" value="[workEffortId, workEffortName, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -59,7 +59,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Timesheet"/>
-                <set field="searchFields" value="[timesheetId, partyId, clientPartyId, comments]"/>                
+                <set field="searchFields" value="[timesheetId, partyId, clientPartyId, comments]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -86,7 +86,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="WorkEffort"/>
-                <set field="searchFields" value="[workEffortId, workEffortName, workEffortTypeId]"/>                
+                <set field="searchFields" value="[workEffortId, workEffortName, description]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=930707&r1=930706&r2=930707&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Sun Apr  4 16:06:24 2010
@@ -31,7 +31,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="Geo"/>
-                <set field="searchFields" value="[geoId, geoName, geoTypeId, geoCode]"/>                
+                <set field="searchFields" value="[geoId, geoName, geoCode]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">