You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/03/17 15:59:03 UTC

svn commit: r1787430 - in /ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing: BomForms.xml BomScreens.xml CostForms.xml CostScreens.xml MrpForms.xml MrpScreens.xml RoutingScreens.xml RoutingTaskForms.xml

Author: jleroux
Date: Fri Mar 17 15:59:03 2017
New Revision: 1787430

URL: http://svn.apache.org/viewvc?rev=1787430&view=rev
Log:
Improved: partially refactor list related forms in Manufacturing widgets
(OFBIZ-9236)

Refactoring various list forms into grids
Refactoring various list form references in screen widgets

Thanks: Pierre Smits

Modified:
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml Fri Mar 17 15:59:03 2017
@@ -70,7 +70,7 @@ under the License.
         </field>
     </form>
 
-    <form name="ListProductManufacturingRules" type="list" target="UpdateProductManufacturingRule" title="" list-name="manufacturingRules"
+    <grid name="ListProductManufacturingRules" target="UpdateProductManufacturingRule" title="" list-name="manufacturingRules"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateProductManufacturingRule" map-name="manufacturingRule"/>
         <field name="ruleId"><display/></field>
@@ -95,7 +95,7 @@ under the License.
                 <parameter param-name="ruleId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
 
     <form name="UpdateProductManufacturingRule" type="single" target="UpdateProductManufacturingRule" title=""
         header-row-style="header-row" default-table-style="basic-table">
@@ -141,7 +141,8 @@ under the License.
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="submit" title="${uiLabelMap.CommonFind}"><submit/></field>
     </form>
-    <form name="ListBom"  type="list" list-name="ListProductBom" odd-row-style="alternate-row"
+    
+    <grid name="ListBom" list-name="ListProductBom" odd-row-style="alternate-row"
         default-table-style="basic-table hover-bar"  paginate-target="FindBom">
         <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="">
             <hyperlink description="${productId}" target="EditProductBom">
@@ -153,5 +154,5 @@ under the License.
         <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}">
             <display-entity entity-name="ProductAssocType" key-field-name="productAssocTypeId"/>
         </field>
-    </form>
+    </grid>
 </forms>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Fri Mar 17 15:59:03 2017
@@ -86,7 +86,7 @@ under the License.
                         <screenlet id="EditProductManufacturingRulePanel" title="${uiLabelMap.PageTitleEditProductManufacturingRules}" collapsible="true">
                             <include-form name="UpdateProductManufacturingRule" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
                         </screenlet>
-                        <include-form name="ListProductManufacturingRules" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
+                        <include-grid name="ListProductManufacturingRules" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -129,6 +129,7 @@ under the License.
             </widgets>
         </section>
     </screen>
+    
     <screen name="FindBom">
         <section>
             <actions>
@@ -149,7 +150,7 @@ under the License.
                                 <include-form name="FindBom" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
                             </decorator-section>
                             <decorator-section name="search-results">
-                                <include-form name="ListBom" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
+                                <include-grid name="ListBom" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </decorator-section>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Fri Mar 17 15:59:03 2017
@@ -20,7 +20,7 @@ under the License.
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="ListCostComponentCalc" type="list" title="" list-name="allCostComponentCalcs"
+    <grid name="ListCostComponentCalc" title="" list-name="allCostComponentCalcs"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="CostComponentCalc" default-field-type="display"/>
         <field name="costComponentCalcId" widget-style="buttontext">
@@ -41,7 +41,8 @@ under the License.
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
+    
     <form name="EditCostComponentCalc" type="single" target="updateCostComponentCalc" title="" default-map-name="costComponentCalc"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="costComponentCalc==null" target="createCostComponentCalc"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Fri Mar 17 15:59:03 2017
@@ -42,7 +42,7 @@ under the License.
                         <screenlet id="ManufacturingCostComponentCalcPanel" title="${uiLabelMap.ManufacturingEditCostComponentCalc}" collapsible="true">
                             <include-form name="EditCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
                         </screenlet>
-                        <include-form name="ListCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
+                        <include-grid name="ListCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml Fri Mar 17 15:59:03 2017
@@ -42,7 +42,7 @@ under the License.
         </field>
     </form>
 
-    <form name="ListRunningMrpJobs" list-name="mrpActiveJobs" title="" type="list"
+    <grid name="ListRunningMrpJobs" list-name="mrpActiveJobs" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
         <field name="statusId">
@@ -60,8 +60,9 @@ under the License.
         <field name="startDateTime"><hidden/></field>
         <field name="finishDateTime"><hidden/></field>
         <field name="cancelDateTime"><hidden/></field>
-    </form>
-    <form name="ListFinishedMrpJobs" list-name="lastFinishedJobs" title="" type="list"
+    </grid>
+    
+    <grid name="ListFinishedMrpJobs" list-name="lastFinishedJobs" title=""
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
         <field name="statusId">
@@ -76,5 +77,5 @@ under the License.
         <field name="runtimeDataId"><hidden/></field>
         <field name="recurrenceInfoId"><hidden/></field>
         <field name="serviceName"><hidden/></field>
-    </form>
+    </grid>
 </forms>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Fri Mar 17 15:59:03 2017
@@ -101,10 +101,10 @@ under the License.
                 <decorator-screen name="CommonMrpDecorator">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingMrpJobLastExecuted}">
-                            <include-form name="ListFinishedMrpJobs" location="component://manufacturing/widget/manufacturing/MrpForms.xml"/>
+                            <include-grid name="ListFinishedMrpJobs" location="component://manufacturing/widget/manufacturing/MrpForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.ManufacturingMrpJobScheduledOrRunning}">
-                            <include-form name="ListRunningMrpJobs" location="component://manufacturing/widget/manufacturing/MrpForms.xml"/>
+                            <include-grid name="ListRunningMrpJobs" location="component://manufacturing/widget/manufacturing/MrpForms.xml"/>
                         </screenlet>
                         <section>
                             <condition>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Fri Mar 17 15:59:03 2017
@@ -117,7 +117,7 @@ under the License.
                                         <include-form name="FindRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
-                                        <include-form name="ListRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                                        <include-grid name="ListRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                                     </decorator-section>
                                 </decorator-screen>
                             </widgets>
@@ -173,7 +173,7 @@ under the License.
                                         <include-form name="FindRoutingTasks" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
-                                        <include-form name="ListRoutingTasks" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                                        <include-grid name="ListRoutingTasks" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                                     </decorator-section>
                                 </decorator-screen>
                             </widgets>
@@ -226,7 +226,7 @@ under the License.
                         <screenlet id="AddRoutingTaskCostPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTaskCosts}" collapsible="true">
                             <include-form name="AddRoutingTaskCost" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
-                        <include-form name="ListRoutingTaskCosts" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                        <include-grid name="ListRoutingTaskCosts" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -249,7 +249,7 @@ under the License.
                 <decorator-screen name="CommonRoutingTaskDecorator">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleListRoutingTaskRoutings}">
-                            <include-form name="ListRoutingTaskRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                            <include-grid name="ListRoutingTaskRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -277,7 +277,7 @@ under the License.
                             <link target="EditRoutingTaskProduct" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext">
                                 <parameter param-name="workEffortId"/>
                             </link>
-                            <include-form name="ListRoutingTaskProducts" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                            <include-grid name="ListRoutingTaskProducts" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -334,7 +334,7 @@ under the License.
                             </platform-specific>
                         </screenlet>
                         <screenlet title="${uiLabelMap.PageTitleListRoutingTaskAssoc}">
-                            <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                            <include-grid name="ListRoutingTaskAssoc" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -365,7 +365,7 @@ under the License.
                         <screenlet id="EditRoutingProductLinkPanel" title="${uiLabelMap.PageTitleEditRoutingProductLink}" collapsible="true">
                             <include-form name="EditRoutingProductLink" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
-                        <include-form name="ListRoutingProductLink" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                        <include-grid name="ListRoutingProductLink" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -388,7 +388,7 @@ under the License.
                         <screenlet id="EditRoutingTaskFixedAssetPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTasks} ${uiLabelMap.ManufacturingRoutingTaskFixedAssets}" collapsible="true">
                             <include-form name="EditRoutingTaskFixedAsset" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
-                        <include-form name="ListRoutingTaskFixedAssets" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                        <include-grid name="ListRoutingTaskFixedAssets" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -409,7 +409,7 @@ under the License.
                         <screenlet title="${uiLabelMap.AddParty}">
                             <include-form name="AddRoutingTaskParty" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
-                        <include-form name="ListRoutingTaskParties" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                        <include-grid name="ListRoutingTaskParties" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -429,7 +429,7 @@ under the License.
                         <screenlet title="Add Skill">
                             <include-form name="AddRoutingTaskSkill" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                         </screenlet>
-                        <include-form name="ListRoutingTaskSkills" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
+                        <include-grid name="ListRoutingTaskSkills" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=1787430&r1=1787429&r2=1787430&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Fri Mar 17 15:59:03 2017
@@ -40,7 +40,8 @@ under the License.
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListRoutings" type="list" title="" list-name="listIt"
+    
+    <grid name="ListRoutings" title="" list-name="listIt"
         paginate-target="FindRouting" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <set field="entityName" value="WorkEffort"/>
@@ -60,7 +61,8 @@ under the License.
         <field name="description"><display/></field>
         <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}"><display/></field>
         <field name="currentStatusId"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
-    </form>
+    </grid>
+    
     <form name="EditRouting" type="single" target="UpdateRouting" title="" default-map-name="routing"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="routing==null" target="CreateRouting"/>
@@ -101,7 +103,8 @@ under the License.
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListRoutingTasks" type="list" title="" list-name="listIt"
+    
+    <grid name="ListRoutingTasks" title="" list-name="listIt"
         paginate-target="FindRoutingTask" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <set field="entityName" value="WorkEffort"/>
@@ -127,7 +130,8 @@ under the License.
         </field>
         <field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><display/></field>
         <field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><display/></field>
-    </form>
+    </grid>
+    
     <form name="EditRoutingTask" type="single" target="UpdateRoutingTask" title="" default-map-name="routingTask"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="routingTask==null" target="CreateRoutingTask"/>
@@ -164,7 +168,8 @@ under the License.
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListRoutingTaskCosts" type="list" title="" list-name="allCosts"
+    
+    <grid name="ListRoutingTaskCosts" title="" list-name="allCosts"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="WorkEffortCostCalc" default-field-type="display"/>
         <field name="workEffortId"><hidden/></field>
@@ -189,7 +194,8 @@ under the License.
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
+    
     <form name="AddRoutingTaskCost" type="single" target="addRoutingTaskCost" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="WorkEffortCostCalc" default-field-type="edit"/>
@@ -212,7 +218,8 @@ under the License.
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListRoutingTaskRoutings" type="list" title="" list-name="allRoutings"
+    
+    <grid name="ListRoutingTaskRoutings" title="" list-name="allRoutings"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="workEffortIdFrom" title="${uiLabelMap.ManufacturingRouting}">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="[${workEffortId}] ${workEffortName}"/>
@@ -225,10 +232,10 @@ under the License.
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
 
     <!-- Routing Task Assoc Forms -->
-    <form name="ListRoutingTaskAssoc" type="list" target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks"
+    <grid name="ListRoutingTaskAssoc" target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateWorkEffortAssoc" map-name="routingTaskAssoc"/>
         <field name="workEffortIdFrom"><hidden/></field>
@@ -257,7 +264,7 @@ under the License.
             <sort-field name="workEffortIdTo"/>
             <sort-field name="sequenceNum"/>
         </sort-order>
-    </form>
+    </grid>
 
      <form name="UpdateRoutingTaskAssoc" type="single" target="UpdateRoutingTaskAssoc" title=""
         header-row-style="header-row" default-table-style="basic-table">
@@ -298,7 +305,7 @@ under the License.
         </field>
     </form>
 
-   <form name="ListRoutingProductLink" type="list" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks"
+   <grid name="ListRoutingProductLink" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="productId" widget-style="buttontext">
             <hyperlink description="${productId}" target="/catalog/control/ViewProductManufacturing" also-hidden="false" target-type="inter-app">
@@ -327,8 +334,9 @@ under the License.
                 <parameter param-name="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/>
             </hyperlink>
         </field>
-    </form>
-   <form name="ListRoutingTaskProducts" type="list" target="ListRoutingTaskProducts" title="" list-name="allProducts"
+    </grid>
+    
+   <grid name="ListRoutingTaskProducts" target="ListRoutingTaskProducts" title="" list-name="allProducts"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="productId" title="${uiLabelMap.ProductProductName}">
             <display-entity entity-name="Product" description="${productId} ${internalName}"/>
@@ -351,7 +359,7 @@ under the License.
                 <parameter param-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/>
                 </hyperlink>
         </field>
-    </form>
+    </grid>
     <form name="EditRoutingTaskProduct" type="single" target="updateRoutingTaskProduct" title="" default-map-name="routingProductLink"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="routingProductLink==null" target="addRoutingTaskProduct"/>
@@ -374,7 +382,7 @@ under the License.
     </form>
 
     <!-- RoutingTask-FixedAsset association (WorkEffortFixedAssetStd) -->
-    <form name="ListRoutingTaskFixedAssets" type="list" title="" target="updateRoutingTaskFixedAsset" list-name="allFixedAssets"
+    <grid name="ListRoutingTaskFixedAssets" title="" target="updateRoutingTaskFixedAsset" list-name="allFixedAssets"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
         <auto-fields-entity entity-name="WorkEffortFixedAssetStd"/>
         <field name="workEffortId"><hidden/></field>
@@ -390,7 +398,8 @@ under the License.
                 <parameter param-name="fixedAssetTypeId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
+    
     <form name="EditRoutingTaskFixedAsset" type="single" title="" target="createRoutingTaskFixedAsset"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="WorkEffortFixedAssetStd" default-field-type="edit"/>
@@ -420,7 +429,8 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListRoutingTaskParties" type="list" target="updateRoutinTaskPartyAssign" list-name="routingTaskParties"
+    
+    <grid name="ListRoutingTaskParties" target="updateRoutinTaskPartyAssign" list-name="routingTaskParties"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditRoutingTaskParties">
         <field name="workEffortId"><hidden/></field>
         <field name="partyId">
@@ -434,7 +444,8 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
-    </form>
+    </grid>
+    
     <form name="AddRoutingTaskSkill" target="createRoutingTaskSkill" type="single"
           header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="WorkEffortSkillStandard" default-field-type="edit"/>
@@ -448,7 +459,8 @@ under the License.
         </field>
         <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListRoutingTaskSkills" type="list" target="updateRoutingTaskSkill" list-name="routingTaskSkills"
+    
+    <grid name="ListRoutingTaskSkills" target="updateRoutingTaskSkill" list-name="routingTaskSkills"
           odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditRoutingTaskSkills" separate-columns="true">
         <auto-fields-entity entity-name="WorkEffortSkillStandard"/>
         <field name="workEffortId"><hidden/></field>
@@ -464,5 +476,5 @@ under the License.
                 <parameter param-name="skillTypeId"/>
             </hyperlink>
         </field>
-    </form>
+    </grid>
 </forms>