svn commit: r739764 [2/3] - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/content/webapp/content/layout/ applications/content/webapp/content/lookup/ applications/content/webapp/content/survey/ applications/content/widget/ appli...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r739764 [2/3] - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/content/webapp/content/layout/ applications/content/webapp/content/lookup/ applications/content/webapp/content/survey/ applications/content/widget/ appli...

jleroux@apache.org
Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Sun Feb  1 13:54:08 2009
@@ -118,7 +118,7 @@
                 
                 <set field="idValue" from-field="parameters.idValue"/>
                 <entity-one entity-name="Product" value-field="idProduct" auto-field-map="false">
-                    <field-map field-name="productId" env-name="idValue"/>
+                    <field-map field-name="productId" from-field="idValue"/>
                 </entity-one>
 
                 <entity-condition entity-name="GoodIdentification" list="goodIdentifications">

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sun Feb  1 13:54:08 2009
@@ -478,7 +478,7 @@
                     <order-by field-name="sequenceNum"/>
                 </entity-and>
                 <entity-and entity-name="ProductAssoc" list-name="parents">
-                    <field-map env-name="productId" field-name="productIdTo"/>
+                    <field-map from-field="productId" field-name="productIdTo"/>
                     <field-map field-name="productAssocTypeId"/>
                 </entity-and>
                 <entity-and entity-name="WorkEffortGoodStandard" list-name="routings">
@@ -553,7 +553,7 @@
                 
                 <entity-one entity-name="Product" value-field="product"/>
                 <entity-one entity-name="CostComponent" value-field="costComponent" auto-field-map="false">
-                    <field-map field-name="costComponentId" env-name="productCostComponentId"/>
+                    <field-map field-name="costComponentId" from-field="productCostComponentId"/>
                 </entity-one>
                 <!--<entity-and entity-name="CostComponent" list-name="costs" filter-by-date="true">-->
                 <entity-and entity-name="CostComponent" list-name="costs">
@@ -1078,7 +1078,7 @@
                 <entity-one entity-name="Product" value-field="product"/>
                 <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.groovy"/>
                 <entity-and entity-name="ProductFeatureIactn" list-name="featureInteractions">
-                    <field-map field-name="productId" env-name="parameters.productId"/>
+                    <field-map field-name="productId" from-field="parameters.productId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -1440,7 +1440,7 @@
                     <order-by field-name="productAssocTypeId"/>
                 </entity-and>
                 <entity-and entity-name="ProductAssoc" list-name="productAssocsTo">
-                    <field-map env-name="productId" field-name="productIdTo"/>
+                    <field-map from-field="productId" field-name="productIdTo"/>
                     <order-by field-name="productAssocTypeId"/>
                 </entity-and>
             </actions>

Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sun Feb  1 13:54:08 2009
@@ -91,8 +91,8 @@
         header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table"
         paginate-target="FindSubscription" paginate="true">
         <actions>
-            <service service-name="performFind" result-map-list-name="listIt" result-map-name="performFindResult">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map-list-name="listIt" result-map="performFindResult">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Subscription"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Feb  1 13:54:08 2009
@@ -1297,7 +1297,7 @@
                 <!-- get the default facility Uom -->
                 <entity-one entity-name="Facility" value-field="facility"/>
                 <entity-one entity-name="Uom" value-field="defaultWeightUom" use-cache="true" auto-field-map="false">
-                    <field-map env-name="facility.defaultWeightUomId" field-name="uomId"/>
+                    <field-map from-field="facility.defaultWeightUomId" field-name="uomId"/>
                 </entity-one>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml Sun Feb  1 13:54:08 2009
@@ -25,7 +25,7 @@
         <node name="node-root" render-style="simple">
             <sub-node node-name="node-body">
                 <entity-and entity-name="Facility">
-                    <field-map field-name="parentFacilityId" env-name="facilityId"/>
+                    <field-map field-name="parentFacilityId" from-field="facilityId"/>
                     <order-by field-name="facilityName"/>
                 </entity-and>
             </sub-node>
@@ -34,7 +34,7 @@
             <link target="EditFacility?facilityId=${facilityId}" text="${facilityName} [${facilityId}]"/>
             <sub-node node-name="node-body">
                 <entity-and entity-name="Facility">
-                    <field-map field-name="parentFacilityId" env-name="facilityId"/>
+                    <field-map field-name="parentFacilityId" from-field="facilityId"/>
                     <order-by field-name="facilityName"/>
                 </entity-and>
             </sub-node>

Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Sun Feb  1 13:54:08 2009
@@ -135,8 +135,8 @@
     <form name="listLookupWorkEffort" list-name="listIt" target="" title="" type="list" paginate-target="LookupWorkEffort"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="WorkEffort"/>
                 <field-map field-name="orderBy" value="workEffortId"/>
             </service>
@@ -164,8 +164,8 @@
     <form name="listLookupTimesheet" list-name="listIt" target="" title="" type="list" paginate-target="LookupPerson"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Timesheet"/>
                 <field-map field-name="orderBy" value="timesheetId"/>
             </service>

Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Sun Feb  1 13:54:08 2009
@@ -23,7 +23,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="Timesheet" list-name="timesheets">
-                <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                <field-map field-name="partyId" from-field="userLogin.partyId"/>
                 <order-by field-name="-fromDate"/>
             </entity-and>
         </actions>
@@ -38,7 +38,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="PartyRate" list-name="partyRates">
-                <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                <field-map field-name="partyId" from-field="userLogin.partyId"/>
                 <order-by field-name="-fromDate"/>
             </entity-and>
         </actions>
@@ -75,8 +75,8 @@
     <form name="ListFindTimesheet" target="" title="" type="list" list-name="listIt" paginate-target="FindTimesheet" paginate="true"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Timesheet"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sun Feb  1 13:54:08 2009
@@ -71,7 +71,7 @@
                                                 <section>
                                                     <actions>
                                                         <entity-one entity-name="RateType" value-field="currentRateType" auto-field-map="false">
-                                                            <field-map field-name="rateTypeId" env-name="currentTimeEntry.rateTypeId"/>
+                                                            <field-map field-name="rateTypeId" from-field="currentTimeEntry.rateTypeId"/>
                                                         </entity-one>
                                                     </actions>
                                                     <widgets>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Feb  1 13:54:08 2009
@@ -263,8 +263,8 @@
     <form name="ListLookupWorkEffort" target="" title="" list-name="listIt" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="WorkEffort"/>
             </service>
         </actions>
@@ -383,8 +383,8 @@
     <form name="ListWorkEfforts" type="list" list-name="listIt" paginate-target="ListWorkEfforts"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="WorkEffort"/>
                 <field-map field-name="orderBy" value="lastModifiedDate DESC"/>
             </service>
@@ -467,9 +467,9 @@
     <form  name="ListWorkEffortParties" list-name="listIt" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
-                <field-map env-name="parameters" field-name="inputFields"/>
-                <field-map env-name="entityName" field-name="entityName"/>
+            <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+                <field-map from-field="parameters" field-name="inputFields"/>
+                <field-map from-field="entityName" field-name="entityName"/>
             </service>
         </actions>
         <field name="workEffortId"><display/></field>
@@ -593,9 +593,9 @@
     <form name="ListWorkEffortCommEvents" default-map-name="workEffortCommEvent" title="" list-name="listIt" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
-                <field-map env-name="requestParameters" field-name="inputFields"/>
-                <field-map env-name="entityName" field-name="entityName"/>
+            <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+                <field-map from-field="requestParameters" field-name="inputFields"/>
+                <field-map from-field="entityName" field-name="entityName"/>
             </service>
         </actions>
         <field name="communicationEventId">
@@ -672,9 +672,9 @@
     <form name="ListLookupCommEvent" target="" title="" list-name="listIt" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
-                <field-map env-name="parameters" field-name="inputFields"/>
-                <field-map env-name="entityName" field-name="entityName"/>
+            <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+                <field-map from-field="parameters" field-name="inputFields"/>
+                <field-map from-field="entityName" field-name="entityName"/>
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}" widget-style="buttontext">
@@ -901,7 +901,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortContent" use-cache="true" list-name="workEffortContents">
-                <field-map env-name="workEffortId" field-name="workEffortId" />
+                <field-map from-field="workEffortId" field-name="workEffortId" />
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" />
@@ -948,7 +948,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list-name="workEffortGoodStandards">
-                <field-map env-name="workEffortId" field-name="workEffortId" />
+                <field-map from-field="workEffortId" field-name="workEffortId" />
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" />
@@ -998,7 +998,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortReview" use-cache="true" list-name="workEffortReviews">
-                <field-map env-name="workEffortId" field-name="workEffortId" />
+                <field-map from-field="workEffortId" field-name="workEffortId" />
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortReview" default-field-type="edit" />
@@ -1035,7 +1035,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortKeyword" use-cache="true" list-name="workEffortkeywords">
-                <field-map env-name="workEffortId" field-name="workEffortId" />
+                <field-map from-field="workEffortId" field-name="workEffortId" />
             </entity-and>
         </actions>
         <field name="workEffortId" widget-style="buttontext"><hidden/></field>        
@@ -1058,7 +1058,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortContactMech" list-name="workEffortContactMechs">
-                <field-map env-name="workEffortId" field-name="workEffortId" />
+                <field-map from-field="workEffortId" field-name="workEffortId" />
             </entity-and>
         </actions>
         <row-actions>
@@ -1092,7 +1092,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list-name="agreementWorkEffortAppls">
-                <field-map env-name="workEffortId" field-name="workEffortId" />
+                <field-map from-field="workEffortId" field-name="workEffortId" />
             </entity-and>
         </actions>    
         <field name="agreementId">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml Sun Feb  1 13:54:08 2009
@@ -33,7 +33,7 @@
         </node>
         <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdTo" render-style="expand-collapse">
             <entity-one entity-name="WorkEffort" value-field="workEffort">
-                <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
+                <field-map field-name="workEffortId" from-field="workEffortAssoc.workEffortIdTo"/>
             </entity-one>
             <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/>
             <sub-node node-name="node-list">

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Feb  1 13:54:08 2009
@@ -128,7 +128,7 @@
                 <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="DEFAULT" global="true"/>
                 <service service-name="getVisualThemeResources">
                     <field-map field-name="visualThemeId"/>
-                    <field-map field-name="themeResources" env-name="layoutSettings"/>
+                    <field-map field-name="themeResources" from-field="layoutSettings"/>
                 </service>
                 <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
                 <set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/header.ftl"/>
@@ -139,7 +139,7 @@
                 <set field="defaultOrganizationPartyId" value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}" global="true"/>
                 <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
                 <entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
-                    <field-map field-name="partyId" env-name="defaultOrganizationPartyId"/>
+                    <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
                 </entity-one>
                 <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="defaultCurrencyUomId" global="true"/>
                 <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
@@ -220,7 +220,7 @@
                 <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="DEFAULT" global="true"/>
                 <service service-name="getVisualThemeResources">
                     <field-map field-name="visualThemeId"/>
-                    <field-map field-name="themeResources" env-name="layoutSettings"/>
+                    <field-map field-name="themeResources" from-field="layoutSettings"/>
                 </service>
                 <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
             </actions>

Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupForms.xml Sun Feb  1 13:54:08 2009
@@ -39,8 +39,8 @@
     </form>
     <form name="listLookupGeo" list-name="listIt" target="" title="" type="list" paginate-target="LookupGeo">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Geo"/>
                 <field-map field-name="orderBy" value="geoName"/>
             </service>

Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sun Feb  1 13:54:08 2009
@@ -35,7 +35,7 @@
             <display>
                 <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
                     <simple-editor/>
-                    <field-map field-name="portalPageId" env-name="portalPageId"/>
+                    <field-map field-name="portalPageId" from-field="portalPageId"/>
                 </in-place-editor>
             </display>
         </field>
@@ -44,7 +44,7 @@
                 <display>
                 <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
                     <simple-editor/>
-                    <field-map field-name="portalPageId" env-name="portalPageId"/>
+                    <field-map field-name="portalPageId" from-field="portalPageId"/>
                 </in-place-editor>
             </display>
         </field>

Modified: ofbiz/trunk/framework/common/widget/PortletEditForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortletEditForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortletEditForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortletEditForms.xml Sun Feb  1 13:54:08 2009
@@ -24,9 +24,9 @@
     <form name="CommonPortletEdit" type="single" target="setPortalPortletAttributes" title="">
         <actions>
             <service service-name="getPortletAttributes">
-                <field-map field-name="portalPageId" env-name="parameters.portalPageId"/>
-                <field-map field-name="portalPortletId" env-name="parameters.portalPortletId"/>
-                <field-map field-name="portletSeqId" env-name="parameters.portletSeqId"/>
+                <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+                <field-map field-name="portalPortletId" from-field="parameters.portalPortletId"/>
+                <field-map field-name="portletSeqId" from-field="parameters.portletSeqId"/>
             </service>      
         </actions>
         <field name="portalPageId"><hidden/></field>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml Sun Feb  1 13:54:08 2009
@@ -73,10 +73,10 @@
     <form name="ListJobs" type="list" list-name="listIt" paginate-target="FindJob" default-entity-name="JobSandbox" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="jobCtx"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="jobCtx"/>
                 <field-map field-name="entityName" value="JobSandbox"/>
-                <field-map field-name="orderBy" env-name="parameters.sortField"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
             </service>
         </actions>
         <field name="jobName" title="${uiLabelMap.WebtoolsJob}" sort-field="true"><display/></field>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml Sun Feb  1 13:54:08 2009
@@ -52,8 +52,8 @@
 
     <form name="ListTemporalExpressions" extends="BasicExpressionList" list-name="listIt" paginate="true">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="TemporalExpression"/>
             </service>
         </actions>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sun Feb  1 13:54:08 2009
@@ -302,7 +302,7 @@
             <actions>
                 <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="WebtoolsEntityReferenceChart"/>          
-                <service service-name="getEntityRefData" result-map-name="result"/>
+                <service service-name="getEntityRefData" result-map="result"/>
                 <set field="numberOfEntities" from-field="result.numberOfEntities"/>
                 <set field="packagesList" from-field="result.packagesList"/>
             </actions>
@@ -354,7 +354,7 @@
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="WebtoolsEntityReferenceChart"/>
-                <service service-name="getEntityRefData" result-map-name="result"/>
+                <service service-name="getEntityRefData" result-map="result"/>
                 <set field="numberOfEntities" from-field="result.numberOfEntities"/>
                 <set field="packagesList" from-field="result.packagesList"/>
             </actions>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Sun Feb  1 13:54:08 2009
@@ -67,8 +67,8 @@
     <form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true"
         header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service  service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service  service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="FixedAssetMaintWorkEffort"/>
                 <field-map field-name="orderBy" value="-actualStartDate"/>
             </service>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Sun Feb  1 13:54:08 2009
@@ -60,8 +60,8 @@
     <form name="ListProducts" type="list" list-name="listIt" paginate-target="${submitTarget}"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Product"/>
             </service>
         </actions>
@@ -88,8 +88,8 @@
     <form name="listLookupProduct" list-name="listIt" paginate-target="${submitTarget}" title="" type="list"
          odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Product"/>
             </service>
         </actions>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml Sun Feb  1 13:54:08 2009
@@ -42,8 +42,8 @@
     <form name="ListLookupComputerHardware" list-name="listIt" title="" type="list" paginate-target="LookupComputerHardware"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="FixedAsset"/>
             </service>
         </actions>
@@ -75,8 +75,8 @@
     <form name="ListLookupComputerSoftware" list-name="listIt" title="" type="list" paginate-target="LookupComputerSoftware"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="FixedAsset"/>
             </service>
         </actions>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Sun Feb  1 13:54:08 2009
@@ -111,8 +111,8 @@
     <form name="ListComputerHardware" type="list" list-name="listIt" paginate-target="ListFixedAssets"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="FixedAsset"/>
             </service>
         </actions>
@@ -137,8 +137,8 @@
     <form name="ListComputerSoftware" type="list" list-name="listIt" paginate-target="ListFixedAssets"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="FixedAsset"/>
             </service>
         </actions>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Feb  1 13:54:08 2009
@@ -54,7 +54,7 @@
                 <section>
                     <condition><not><if-empty field="userLogin"/></not></condition>
                     <actions>
-                        <service service-name="getUserPreferenceGroup" result-map-name="preferences">
+                        <service service-name="getUserPreferenceGroup" result-map="preferences">
                             <field-map field-name="userPrefGroupTypeId" value="MyPage" />
                         </service>
                     </actions>
@@ -115,7 +115,7 @@
             <actions>
                 <set field="headerItem" value="${parameters.donePage}"/>
                 <entity-one entity-name="CommunicationEvent" value-field="commEvent">
-                    <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
+                    <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
                 </entity-one>
                 <script location="component://mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy"/>
             </actions>
@@ -327,7 +327,7 @@
                     </condition-list>
                     <order-by field-name="-datetimeStarted" />
                 </entity-condition>
-                <service service-name="getUserPreferenceGroup" result-map-name="preferences">
+                <service service-name="getUserPreferenceGroup" result-map="preferences">
                     <field-map field-name="userPrefGroupTypeId" value="MyPage" />
                 </service>
             </actions>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sun Feb  1 13:54:08 2009
@@ -123,8 +123,8 @@
     </form>
     <form name="ListCustRequests" type="list"  list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updateRequest">
         <row-actions>
-            <service service-name="getProjectTask" result-map-name="taskResult">
-                <field-map field-name="taskId" env-name="workEffortId"/>
+            <service service-name="getProjectTask" result-map="taskResult">
+                <field-map field-name="taskId" from-field="workEffortId"/>
             </service>
         </row-actions>
         <field name="custRequestId"><hidden/></field>
@@ -174,14 +174,14 @@
     <form name="ListInvoices" type="list" separate-columns="true" paginate-target="listInvoices" list-name="invoices"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
-                <field-map field-name="partyId" env-name="partyIdFrom"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
+                <field-map field-name="partyId" from-field="partyIdFrom"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
-                <field-map field-name="partyId" env-name="partyId"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
+                <field-map field-name="partyId" from-field="partyId"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
             <script location="component://mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Feb  1 13:54:08 2009
@@ -97,7 +97,7 @@
                 <set field="donePage" value="myTasks"/>
                 <entity-and entity-name="WorkEffortAndPartyAssign"
                     list-name="tasks" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId" />
+                    <field-map field-name="partyId" from-field="userLogin.partyId" />
                     <field-map field-name="workEffortTypeId" value="TASK" />
                     <field-map field-name="currentStatusId" value="PTS_CREATED" />
                 </entity-and>
@@ -227,7 +227,7 @@
                     <order-by field-name="-datetimeStarted" />
                 </entity-condition>
                 <entity-one entity-name="PartyNameView" value-field="partyName">
-                    <field-map field-name="partyId" env-name="partyId"/>
+                    <field-map field-name="partyId" from-field="partyId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -409,16 +409,16 @@
                 <get-related-one value-name="custRequest" relation-name="ProductStore" to-value-name="store"/>
                 <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/>
                 <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort">
-                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
                 </entity-and>
                 <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/>
                 <set field="orderBy[]" value="sequenceNum"/>
                 <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/>
                 <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest">
-                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
                 </entity-and>
                 <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>                
             </actions>
             <widgets>
@@ -637,10 +637,10 @@
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <entity-and entity-name="CommEventContentAssoc" list-name="commEventContent">
-                    <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
+                    <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
                 </entity-and>
                 <entity-and entity-name="PartyContent" list-name="partyContent">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -678,8 +678,8 @@
                                     <set field="projectId" from-field="project.workEffortId"/>
                                     <set field="parameters.projectId" from-field="project.workEffortId"/>
                                     <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/>
-                                    <service service-name="getProject" result-map-name="result">
-                                        <field-map field-name="projectId" env-name="projectId"/>
+                                    <service service-name="getProject" result-map="result">
+                                        <field-map field-name="projectId" from-field="projectId"/>
                                     </service>
                                     <set field="project" from-field="result.projectInfo"/>
                                 </actions>
@@ -691,8 +691,8 @@
                                         </screenlet>
                                         <section>
                                             <actions>
-                                                <service service-name="getProjectPhaseList" result-map-name="result">
-                                                    <field-map field-name="projectId" env-name="projectId"/>
+                                                <service service-name="getProjectPhaseList" result-map="result">
+                                                    <field-map field-name="projectId" from-field="projectId"/>
                                                 </service>
                                                 <set field="phases" from-field="result.phaseList"/>
                                             </actions>
@@ -708,8 +708,8 @@
                                     <container style="righthalf">
                                         <section>
                                             <actions>
-                                                <service service-name="getProjectTaskList" result-map-name="result">
-                                                    <field-map field-name="projectId" env-name="projectId"/>
+                                                <service service-name="getProjectTaskList" result-map="result">
+                                                    <field-map field-name="projectId" from-field="projectId"/>
                                                 </service>
                                                 <set field="tasks" from-field="result.taskList"/>
                                             </actions>
@@ -752,10 +752,10 @@
                 <entity-one entity-name="Content" value-field="content"/>
                 <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
                 <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sun Feb  1 13:54:08 2009
@@ -51,7 +51,7 @@
                 <set field="parameters.userLogin.userLoginId" from-field="userLogin.userLoginId"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
                 <entity-one entity-name="PartyNameView" value-field="partyNameView">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
                 </entity-one>
                 <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
             </actions>
@@ -112,7 +112,7 @@
             <actions>
                 <set field="headerItem" value="${parameters.portalPageId}"/>
                 <entity-one entity-name="CommunicationEvent" value-field="commEvent">
-                    <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
+                    <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
                 </entity-one>
                 <script location="component://myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy"/>
             </actions>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Feb  1 13:54:08 2009
@@ -144,8 +144,8 @@
     
     <form name="ListCustRequests" type="list"  list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updateRequest">
         <row-actions>
-            <service service-name="getProjectTask" result-map-name="taskResult">
-                <field-map field-name="taskId" env-name="workEffortId"/>
+            <service service-name="getProjectTask" result-map="taskResult">
+                <field-map field-name="taskId" from-field="workEffortId"/>
             </service>
         </row-actions>
         <field name="custRequestId"><hidden/></field>
@@ -196,14 +196,14 @@
     <form name="ListInvoices" type="list" separate-columns="true" paginate-target="listInvoices" list-name="invoices"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
-                <field-map field-name="partyId" env-name="partyIdFrom"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
+                <field-map field-name="partyId" from-field="partyIdFrom"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
-                <field-map field-name="partyId" env-name="partyId"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
+                <field-map field-name="partyId" from-field="partyId"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
             <script location="component://myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy"/>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Feb  1 13:54:08 2009
@@ -98,7 +98,7 @@
                 <set field="portalPageId" value="myTasks"/>
                 <entity-and entity-name="WorkEffortAndPartyAssign"
                     list-name="tasks" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId" />
+                    <field-map field-name="partyId" from-field="userLogin.partyId" />
                     <field-map field-name="workEffortTypeId" value="TASK" />
                     <field-map field-name="currentStatusId" value="PTS_CREATED" />
                 </entity-and>
@@ -228,7 +228,7 @@
                     <order-by field-name="-datetimeStarted" />
                 </entity-condition>
                 <entity-one entity-name="PartyNameView" value-field="partyName">
-                    <field-map field-name="partyId" env-name="partyId"/>
+                    <field-map field-name="partyId" from-field="partyId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -410,16 +410,16 @@
                 <get-related-one value-name="custRequest" relation-name="ProductStore" to-value-name="store"/>
                 <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/>
                 <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort">
-                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
                 </entity-and>
                 <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/>
                 <set field="orderBy[]" value="sequenceNum"/>
                 <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/>
                 <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest">
-                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
                 </entity-and>
                 <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>                
             </actions>
             <widgets>
@@ -636,10 +636,10 @@
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <entity-and entity-name="CommEventContentAssoc" list-name="commEventContent">
-                    <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
+                    <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
                 </entity-and>
                 <entity-and entity-name="PartyContent" list-name="partyContent">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -675,8 +675,8 @@
                                     <set field="projectId" from-field="project.workEffortId"/>
                                     <set field="parameters.projectId" from-field="project.workEffortId"/>
                                     <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/>
-                                    <service service-name="getProject" result-map-name="result">
-                                        <field-map field-name="projectId" env-name="projectId"/>
+                                    <service service-name="getProject" result-map="result">
+                                        <field-map field-name="projectId" from-field="projectId"/>
                                     </service>
                                     <set field="project" from-field="result.projectInfo"/>
                                 </actions>
@@ -688,8 +688,8 @@
                                         </screenlet>
                                         <section>
                                             <actions>
-                                                <service service-name="getProjectPhaseList" result-map-name="result">
-                                                    <field-map field-name="projectId" env-name="projectId"/>
+                                                <service service-name="getProjectPhaseList" result-map="result">
+                                                    <field-map field-name="projectId" from-field="projectId"/>
                                                 </service>
                                                 <set field="phases" from-field="result.phaseList"/>
                                             </actions>
@@ -705,8 +705,8 @@
                                     <container style="righthalf">
                                         <section>
                                             <actions>
-                                                <service service-name="getProjectTaskList" result-map-name="result">
-                                                    <field-map field-name="projectId" env-name="projectId"/>
+                                                <service service-name="getProjectTaskList" result-map="result">
+                                                    <field-map field-name="projectId" from-field="projectId"/>
                                                 </service>
                                                 <set field="tasks" from-field="result.taskList"/>
                                             </actions>
@@ -747,10 +747,10 @@
                 <entity-one entity-name="Content" value-field="content"/>
                 <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
                 <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -769,7 +769,7 @@
     <screen name="ListRequestList">
         <section>
             <actions>
-                <service service-name="getUserPreferenceGroup" result-map-name="preferences">
+                <service service-name="getUserPreferenceGroup" result-map="preferences">
                     <field-map field-name="userPrefGroupTypeId" value="MyPortal"/>
                 </service>
                 <!--  check if there are any customer requests for this user -->
@@ -1002,7 +1002,7 @@
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <entity-and entity-name="PartyContent" list-name="partyContent">
-                    <field-map field-name="partyId" env-name="parameters.partyId"/>
+                    <field-map field-name="partyId" from-field="parameters.partyId"/>
                 </entity-and>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml Sun Feb  1 13:54:08 2009
@@ -24,9 +24,9 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <set field="entityName" value="OagisMessageInfo"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <field-map field-name="entityName" env-name="entityName"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="requestParameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
             </service>
         </actions>
         <auto-fields-entity entity-name="OagisMessageInfo" default-field-type="display"/>
@@ -62,9 +62,9 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <set field="entityName" value="OagisMessageErrorInfo"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <field-map field-name="entityName" env-name="entityName"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="requestParameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
             </service>
         </actions>
         <auto-fields-entity entity-name="OagisMessageErrorInfo" default-field-type="display"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Feb  1 13:54:08 2009
@@ -56,7 +56,7 @@
                 <set field="headerItem" value="projects"/>                
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <entity-one entity-name="WorkEffort" value-field="project">
-                    <field-map field-name="workEffortId" env-name="projectId"/>
+                    <field-map field-name="workEffortId" from-field="projectId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -96,8 +96,8 @@
             <actions>
                 <set field="headerItem" value="task"/>
                 <entity-one entity-name="WorkEffort" value-field="workEffort"/>
-                <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
-                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
+                <service service-name="getProjectIdAndNameFromTask" result-map="result">
+                    <field-map field-name="taskId" from-field="parameters.workEffortId"/>
                 </service>
                 <set field="projectId" from-field="result.projectId"/>
                 <set field="projectName" from-field="result.projectName"/>
@@ -188,7 +188,7 @@
                 <set field="timesheetId" from-field="parameters.timesheetId"/>
                 <entity-one entity-name="Timesheet" value-field="timesheet"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName">
-                    <field-map field-name="partyId" env-name="timesheet.partyId"/>
+                    <field-map field-name="partyId" from-field="timesheet.partyId"/>
                 </entity-one>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sun Feb  1 13:54:08 2009
@@ -29,7 +29,7 @@
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <entity-and entity-name="WorkEffort" list-name="projects">
                     <field-map field-name="workEffortTypeId" value="PROJECT"/>
-                    <field-map field-name="workEffortParentId" env-name="projectId"/>
+                    <field-map field-name="workEffortParentId" from-field="projectId"/>
                 </entity-and>
             </actions>                                                
             <widgets>  
@@ -74,8 +74,8 @@
                 <set field="tabButtonItem" value="editproject"/>                
                 <set field="labelTitleProperty" value="PageTitleEditProject"/>
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-                <service service-name="getProject" result-map-name="result">
-                    <field-map field-name="projectId" env-name="projectId"/>
+                <service service-name="getProject" result-map="result">
+                    <field-map field-name="projectId" from-field="projectId"/>
                 </service>
                 <set field="project" from-field="result.projectInfo"/>
             </actions>
@@ -206,12 +206,12 @@
                 <set field="labelTitleProperty" value="PageTitleFindTask"/>                
                 <set field="projectId" from-field="parameters.projectId"/>
                 <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks">
-                    <field-map field-name="projectId" env-name="parameters.projectId"/>
+                    <field-map field-name="projectId" from-field="parameters.projectId"/>
                     <order-by field-name="phaseName"/>
                     <order-by field-name="workEffortName"/>
                 </entity-and>
                 <entity-and entity-name="WorkEffort" list-name="phases">
-                    <field-map field-name="workEffortParentId" env-name="parameters.projectId"/>
+                    <field-map field-name="workEffortParentId" from-field="parameters.projectId"/>
                     <field-map field-name="workEffortTypeId" value="PHASE"/>
                 </entity-and>
             </actions>
@@ -340,8 +340,8 @@
                 <set field="tabButtonItem" value="phases"/>
                 <set field="labelTitleProperty" value="PageTitleFindPhase"/>
                 <set field="projectId" from-field="parameters.projectId"/>
-                <service service-name="getProjectPhaseList" result-map-name="result">
-                    <field-map field-name="projectId" env-name="projectId"/>
+                <service service-name="getProjectPhaseList" result-map="result">
+                    <field-map field-name="projectId" from-field="projectId"/>
                 </service>
                 <set field="phases" from-field="result.phaseList"/>
             </actions>
@@ -473,8 +473,8 @@
                 <set field="titleProperty" value="ProjectMgrProjectSummary"/>
                 <set field="tabButtonItem" value="projectView"/>
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-                <service service-name="getProject" result-map-name="result">
-                    <field-map field-name="projectId" env-name="projectId"/>
+                <service service-name="getProject" result-map="result">
+                    <field-map field-name="projectId" from-field="projectId"/>
                 </service>
                 <set field="project" from-field="result.projectInfo"/>
             </actions>                        
@@ -549,8 +549,8 @@
     <screen name="PhasesInfo">
         <section>
             <actions>
-                <service service-name="getProjectPhaseList" result-map-name="result">
-                    <field-map field-name="projectId" env-name="projectId"/>
+                <service service-name="getProjectPhaseList" result-map="result">
+                    <field-map field-name="projectId" from-field="projectId"/>
                 </service>
                 <set field="phases" from-field="result.phaseList"/>
             </actions>
@@ -566,8 +566,8 @@
     <screen name="TasksInfo">
         <section>
             <actions>
-                <service service-name="getProjectTaskList" result-map-name="result">
-                    <field-map field-name="projectId" env-name="projectId"/>
+                <service service-name="getProjectTaskList" result-map="result">
+                    <field-map field-name="projectId" from-field="projectId"/>
                 </service>
                 <set field="tasks" from-field="result.taskList"/>
             </actions>
@@ -647,7 +647,7 @@
             <actions>
                 <set field="workEffortId" from-field="projectId"/>
                 <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>
+                    <field-map field-name="workEffortId" from-field="workEffortId"/>
                     <order-by field-name="-noteDateTime"/>
                 </entity-and>
             </actions>
@@ -667,12 +667,12 @@
                 <set field="workEffortId" from-field="parameters.projectId"/>
                 <entity-and entity-name="WorkEffortAndPartyAssign" list-name="parties">
                     <field-map field-name="workEffortTypeId" value="PROJECT"/>
-                    <field-map field-name="partyId" env-name="parameters.partyId"/>
+                    <field-map field-name="partyId" from-field="parameters.partyId"/>
                     <order-by field-name="workEffortId"/>
                 </entity-and>
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-                <service service-name="getProject" result-map-name="result">
-                    <field-map field-name="projectId" env-name="projectId"/>
+                <service service-name="getProject" result-map="result">
+                    <field-map field-name="projectId" from-field="projectId"/>
                 </service>
                 <set field="project" from-field="result.projectInfo"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
@@ -699,7 +699,7 @@
                 <set field="titleProperty" value="PageTitleListTaskByParty"/>
                 <set field="workEffortId" from-field="parameters.projectId"/>
                 <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks">
-                    <field-map field-name="partyId" env-name="parameters.partyId"/>
+                    <field-map field-name="partyId" from-field="parameters.partyId"/>
                     <field-map field-name="workEffortTypeId" value="TASK"/>
                     <field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/>
                     <order-by field-name="workEffortId"/>
@@ -1050,7 +1050,7 @@
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <entity-and entity-name="WorkEffortAndContentDataResource" list-name="workEffortAndContentDataResources">
-                    <field-map field-name="workEffortId" env-name="projectId"/>
+                    <field-map field-name="workEffortId" from-field="projectId"/>
                 </entity-and>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Sun Feb  1 13:54:08 2009
@@ -87,23 +87,23 @@
                 <get-related-one value-name="custRequest" relation-name="ProductStore" to-value-name="store"/>
                 <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/>
                 <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort">
-                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
                 </entity-and>
                 <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/>
                 <set field="orderBy[]" value="sequenceNum"/>
                 <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/>
                 <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest">
-                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
                 </entity-and>
                 <entity-condition entity-name="CustRequestItemNoteView" list="custRequestItemNoteViews">
                     <condition-expr field-name="custRequestId" operator="equals" env-name="parameters.custRequestId"/>
                     <order-by  field-name="-noteDateTime"/>
                 </entity-condition>
                 <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
                 <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents">
-                    <field-map field-name="custRequestId" env-name="custRequestId"/>
+                    <field-map field-name="custRequestId" from-field="custRequestId"/>
                 </entity-and>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Feb  1 13:54:08 2009
@@ -27,8 +27,8 @@
                 <set field="titleProperty" value="PageTitleDependencies"/>                
                 <set field="tabButtonItem" value="dependencies"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
-                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
+                <service service-name="getProjectIdAndNameFromTask" result-map="result">
+                    <field-map field-name="taskId" from-field="parameters.workEffortId"/>
                 </service>
                 <set field="projectId" from-field="result.projectId"/>
             </actions>
@@ -38,7 +38,7 @@
                             <section>
                                 <actions>
                                     <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
-                                        <field-map field-name="workEffortIdTo" env-name="parameters.workEffortId"/>
+                                        <field-map field-name="workEffortIdTo" from-field="parameters.workEffortId"/>
                                         <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
                                     </entity-and>
                                 </actions>
@@ -54,7 +54,7 @@
                             <section>
                                 <actions>
                                     <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
-                                        <field-map field-name="workEffortIdFrom" env-name="parameters.workEffortId"/>
+                                        <field-map field-name="workEffortIdFrom" from-field="parameters.workEffortId"/>
                                         <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
                                     </entity-and>
                                 </actions>
@@ -79,7 +79,7 @@
                 <set field="headerItem" value="mytasks"/>
                 <set field="labelTitleProperty" value="ProjectMgrMyTasks"/>
                 <entity-and entity-name="WorkEffortAndPartyAssign" list-name="projects" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
                     <field-map field-name="workEffortTypeId" value="PROJECT"/>
                 </entity-and>
                 <entity-one entity-name="WorkEffort" value-field="task">
@@ -126,7 +126,7 @@
         <section>
             <actions>
                 <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
+                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
                     <field-map field-name="workEffortTypeId" value="TASK"/>
                     <field-map field-name="currentStatusId" value="PTS_CREATED"/>
                 </entity-and>
@@ -250,7 +250,7 @@
                 <set field="labelTitleProperty" value="PageTitleEditSkill"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandards">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>
+                    <field-map field-name="workEffortId" from-field="workEffortId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -340,8 +340,8 @@
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
                 <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>
-                <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
-                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
+                <service service-name="getProjectIdAndNameFromTask" result-map="result">
+                    <field-map field-name="taskId" from-field="parameters.workEffortId"/>
                 </service>
                 <set field="projectId" from-field="result.projectId"/>
             </actions>            
@@ -387,12 +387,12 @@
                 <set field="tabButtonItem" value="taskView"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <set field="projectId" from-field="parameters.workEffortId"/>
-                <service service-name="getProjectTask" result-map-name="taskResult">
-                    <field-map field-name="taskId" env-name="workEffortId"/>
+                <service service-name="getProjectTask" result-map="taskResult">
+                    <field-map field-name="taskId" from-field="workEffortId"/>
                 </service>
                 <set field="task" from-field="taskResult.taskInfo"/>
-                <service service-name="getProjectIdAndNameFromTask" result-map-name="projectResult">
-                    <field-map field-name="taskId" env-name="workEffortId"/>
+                <service service-name="getProjectIdAndNameFromTask" result-map="projectResult">
+                    <field-map field-name="taskId" from-field="workEffortId"/>
                 </service>
             </actions>                        
             <widgets>
@@ -455,7 +455,7 @@
             <actions>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>
+                    <field-map field-name="workEffortId" from-field="workEffortId"/>
                     <order-by field-name="-noteDateTime"/>
                 </entity-and>
             </actions>
@@ -469,8 +469,8 @@
     <screen name="TaskTeamInfo">      
         <section>        
             <actions>                      
-                <service service-name="getTasksByParties" result-map-name="result">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>                  
+                <service service-name="getTasksByParties" result-map="result">
+                    <field-map field-name="workEffortId" from-field="workEffortId"/>                  
                 </service>
                 <set field="taskParties" from-field="result.taskParties"/>    
             </actions>          
@@ -505,7 +505,7 @@
         <section>
             <actions>
                 <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
-                    <field-map field-name="workEffortIdTo" env-name="parameters.workEffortId"/>
+                    <field-map field-name="workEffortIdTo" from-field="parameters.workEffortId"/>
                     <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
                 </entity-and>
             </actions>
@@ -531,7 +531,7 @@
         <section>
             <actions>
                 <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true">
-                    <field-map field-name="workEffortIdFrom" env-name="parameters.workEffortId"/>
+                    <field-map field-name="workEffortIdFrom" from-field="parameters.workEffortId"/>
                     <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
                 </entity-and>
             </actions>
@@ -562,7 +562,7 @@
                 <set field="labelTitleProperty" value="PageTitleEditTask"/>
                 <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName">
-                    <field-map field-name="partyId" env-name="custRequest.fromPartyId"/>
+                    <field-map field-name="partyId" from-field="custRequest.fromPartyId"/>
                 </entity-one>
                 </actions>
             <widgets>
@@ -595,7 +595,7 @@
                 <entity-one entity-name="Content" value-field="content"/>
                 <set field="workEffortId" from-field="parameters.workEffortId" default-value="${parameters.workEffortId}"/>
                 <entity-and entity-name="WorkEffortAndContentDataResource" list-name="workEffortAndContentDataResources">
-                    <field-map field-name="workEffortId" env-name="workEffortId"/>
+                    <field-map field-name="workEffortId" from-field="workEffortId"/>
                 </entity-and>
             </actions>
             <widgets>