svn commit: r730096 [1/2] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accounting/script/org/ofbiz/accounting/fixedasset/ applications/account...

Author: jleroux
Date: Tue Dec 30 03:17:32 2008
New Revision: 730096

URL: http://svn.apache.org/viewvc?rev=730096&view=rev
Log:
<first-from-list(.*)list-name => <first-from-list$1list
and
<first-from-list(.*)entry-name => <first-from-list$1entry

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
    ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
    ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
    ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
    ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
    ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
    ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
    ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Tue Dec 30 03:17:32 2008
@@ -86,7 +86,7 @@
                 </entity-and>
                 
                 <if-not-empty field="parentPartyRelationships">
-                    <first-from-list list="parentPartyRelationships" entry-name="parentPartyRelationship"/>
+                    <first-from-list list="parentPartyRelationships" entry="parentPartyRelationship"/>
                     <set field="currentOrganizationPartyId" from-field="parentPartyRelationship.partyIdFrom"/>
                 <else>
                     <clear-field field-name="currentOrganizationPartyId"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 03:17:32 2008
@@ -145,7 +145,7 @@
             <field-map field-name="finAccountId" from-field="parameters.finAccountId"/>
             <order-by field-name="-statusDate"/>
         </entity-and>
-        <first-from-list entry-name="oldFinAccountStatus" list-name="oldFinAccountStatusList"/>
+        <first-from-list entry="oldFinAccountStatus" list="oldFinAccountStatusList"/>
         <if-not-empty field="oldFinAccountStatus">
             <set field="oldFinAccountStatus.statusEndDate" from-field="nowTimestamp"/>
             <store-value value-name="oldFinAccountStatus"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 30 03:17:32 2008
@@ -713,7 +713,7 @@
             <field-map field-name="fixedAssetId" from-field="parameters.fixedAssetId"/>
         </entity-and>
         <if-not-empty field="fixedAssetDepMethods">
-            <first-from-list list="fixedAssetDepMethods" entry-name="fixedAssetDepMethod"/>
+            <first-from-list list="fixedAssetDepMethods" entry="fixedAssetDepMethod"/>
             <get-related-one relation-name="CustomMethod" value-name="fixedAssetDepMethod" to-value-name="customMethod"/>
             <log level="info" message="Depreciation service name for the FixedAsset ${parameters.fixedAssetId} is ${customMethod.customMethodName}"/>
             

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 03:17:32 2008
@@ -318,7 +318,7 @@
                 <clear-field field-name="invoicePaymentInfo"/>
                 <set field="andMap.termTypeId" value="FIN_PAYMENT_TERM"/>
                 <filter-list-by-and list-name="invoiceTerms" map-name="andMap"/>
-                <first-from-list list="invoiceTerms" entry-name="invoiceTerm"/>
+                <first-from-list list="invoiceTerms" entry="invoiceTerm"/>
                 <if-not-empty field="invoiceTerm">
                     <set field="invoicePaymentInfo.termTypeId" from-field="invoiceTerm.termTypeId"/>
                     <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field-name="invoicePaymentInfo.dueDate">

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 03:17:32 2008
@@ -55,7 +55,7 @@
 
         <!-- end existing value -->
         <if-not-empty field="rateAmounts">
-            <first-from-list entry-name="rateAmount" list-name="rateAmounts"/>
+            <first-from-list entry="rateAmount" list="rateAmounts"/>
             <if-compare-field field="rateAmount.rateAmount" operator="not-equals" to-field="parameters.rateAmount">
                 <set-service-fields service-name="deleteRateAmount" map-name="rateAmount" to-map-name="delRateAmount"/>
                 <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/>
@@ -139,7 +139,7 @@
                     <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
                 </entity-and>
                 <if-not-empty field="amounts">
-                    <first-from-list entry-name="amount" list-name="amounts"/>
+                    <first-from-list entry="amount" list="amounts"/>
                     <if-not-empty field="amount.rateAmount">
                         <set field="level" value="workEffort"/>
                     </if-not-empty>
@@ -161,7 +161,7 @@
                     <field-map field-name="partyId" from-field="parameters.partyId"/>
                 </entity-and>
                 <if-not-empty field="amounts">
-                    <first-from-list entry-name="amount" list-name="amounts"/>
+                    <first-from-list entry="amount" list="amounts"/>
                     <if-not-empty field="amount.rateAmount">
                         <set field="level" value="party"/>
                     </if-not-empty>
@@ -183,7 +183,7 @@
                     <field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
                 </entity-and>
                 <if-not-empty field="amounts">
-                    <first-from-list entry-name="amount" list-name="amounts"/>
+                    <first-from-list entry="amount" list="amounts"/>
                     <if-not-empty field="amount.rateAmount">
                         <set field="level" value="emplPositionType"/>
                     </if-not-empty>
@@ -277,7 +277,7 @@
             </if-empty>
         </if-compare>
         <if-not-empty field="amounts">
-            <first-from-list entry-name="amount" list-name="amounts"/>
+            <first-from-list entry="amount" list="amounts"/>
             <if-empty field="amount.rateAmount">
                 <set field="amount.rateAmount" value="0" type="Double"/>
             </if-empty>
@@ -302,7 +302,7 @@
             <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
         </entity-and>
         <if-not-empty field="partyRates">
-            <first-from-list entry-name="partyRate" list-name="partyRates"/>
+            <first-from-list entry="partyRate" list="partyRates"/>
             <now-timestamp-to-env env-name="partyRate.thruDate"/>
             <store-value value-name="partyRate"/>
         </if-not-empty>
@@ -330,7 +330,7 @@
                 <field-map field-name="defaultRate" value="Y"/>
             </entity-and>
             <if-not-empty field="rates">
-                <first-from-list entry-name="rate" list-name="rates"/>
+                <first-from-list entry="rate" list="rates"/>
                 <set field="rate.defaultRate" value="N"/>
                 <store-value value-name="rate"/>
             </if-not-empty>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 03:17:32 2008
@@ -38,7 +38,7 @@
                 <field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
                 <order-by field-name="sequenceId"/>
             </entity-and>
-            <first-from-list entry-name="statusItem" list-name="contentStatus"/>
+            <first-from-list entry="statusItem" list="contentStatus"/>
             <set field="content.statusId" from-field="statusItem.statusId"/>
         </if-empty>
 
@@ -1209,7 +1209,7 @@
           </condition-list>
         </entity-condition>
         <clear-field field-name="view2"/>
-        <first-from-list entry-name="view2" list-name="viewList"/>
+        <first-from-list entry="view2" list="viewList"/>
         <clear-field field-name="map"/>
         <set field="map.contentIdFrom" from-field="view.contentId"/>
         <set field="map.dataResourceIdFrom" from-field="view.dataResourceId"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 03:17:32 2008
@@ -47,7 +47,7 @@
                 <field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
                 <order-by field-name="sequenceId"/>
             </entity-and>
-            <first-from-list entry-name="statusItem" list-name="contentStatus"/>
+            <first-from-list entry="statusItem" list="contentStatus"/>
             <set field="newEntity.statusId" from-field="statusItem.statusId"/>
         </if-empty>
 
@@ -687,7 +687,7 @@
 
         <set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
         <find-by-and entity-name="FileExtension" map-name="extenLookup" list-name="extensions"/>
-        <first-from-list entry-name="extension" list-name="extensions"/>
+        <first-from-list entry="extension" list="extensions"/>
 
         <set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
         <set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>

Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 03:17:32 2008
@@ -613,7 +613,7 @@
             <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
         </entity-and>
         <if-not-empty field="emplPositionTypeRates">
-            <first-from-list entry-name="emplPositionTypeRate" list-name="emplPositionTypeRates"/>
+            <first-from-list entry="emplPositionTypeRate" list="emplPositionTypeRates"/>
             <now-timestamp-to-env env-name="emplPositionTypeRate.thruDate"/>
             <store-value value-name="emplPositionTypeRate"/>
         </if-not-empty>

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Tue Dec 30 03:17:32 2008
@@ -36,7 +36,7 @@
             <set from-field="parameters.workEffortId" field="lookupRouting.workEffortId"/>
             <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/>
             <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
-            <first-from-list list="routings" entry-name="routingGS"/>
+            <first-from-list list="routings" entry="routingGS"/>
             <!-- If the routing is not associated with our product and it's a variant, then
                  check to see if it's virtual product has the routing -->
             <if-empty field="routingGS">
@@ -46,13 +46,13 @@
                         <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
                     </condition-list>
                 </entity-condition>
-                <first-from-list list="virtualProductAssocList" entry-name="virtualProductAssoc"/>
+                <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc"/>
                 <if-not-empty field="virtualProductAssoc">
                     <set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/>
                     <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/>
                     <!-- Consider the validity against a date passed as (optional) parameter -->
                     <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
-                    <first-from-list list="routings" entry-name="routingGS"/>
+                    <first-from-list list="routings" entry="routingGS"/>
                 </if-not-empty>
             </if-empty>
             <!-- No workEffortId has been passed, so retrieve the first routing found for this product-->
@@ -61,7 +61,7 @@
                 <!-- Consider the validity against a date passed as (optional) parameter -->
                 <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
                 <!-- TODO: we should consider the quantity to select the best routing -->
-                <first-from-list list="routings" entry-name="routingGS"/>
+                <first-from-list list="routings" entry="routingGS"/>
                 <!-- If there are no routings associated with our product and it's a variant, then
                      check to see if it's virtual product has a routing -->
                 <if-empty field="routingGS">
@@ -72,7 +72,7 @@
                         </condition-list>
                     </entity-condition>
                     <filter-list-by-date list-name="virtualProductAssocList" valid-date-name="filterDate"/>
-                    <first-from-list list="virtualProductAssocList" entry-name="virtualProductAssoc"/>
+                    <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc"/>
                     <if-not-empty field="virtualProductAssoc">
                         <set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/>
                         <set value="ROU_PROD_TEMPLATE" field="lookupRouting.workEffortGoodStdTypeId"/>
@@ -80,7 +80,7 @@
                         <!-- Consider the validity against a date passed as (optional) parameter -->
                         <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
                         <!-- TODO: we should consider the quantity to select the best routing -->
-                        <first-from-list list="routings" entry-name="routingGS"/>
+                        <first-from-list list="routings" entry="routingGS"/>
                     </if-not-empty>
                 </if-empty>
             </else>

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml Tue Dec 30 03:17:32 2008
@@ -67,7 +67,7 @@
         <make-value value-name="lookupPKMap" entity-name="TechDataCalendar"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcDay" list-name="relatedResultList" />
-        <first-from-list entry-name="relatedResult" list-name="relatedResultList"/>
+        <first-from-list entry="relatedResult" list="relatedResultList"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionDayUseCalendar"/>
@@ -75,7 +75,7 @@
             <check-errors/>
         </if-not-empty>
         <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcWeek" list-name="relatedResultList" />
-        <first-from-list entry-name="relatedResult" list-name="relatedResultList"/>
+        <first-from-list entry="relatedResult" list="relatedResultList"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionWeekUseCalendar"/>
@@ -124,7 +124,7 @@
         <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <get-related value-name="lookupPKMap" relation-name="TechDataCalendar" list-name="relatedResultList" />
-        <first-from-list entry-name="relatedResult" list-name="relatedResultList"/>
+        <first-from-list entry="relatedResult" list="relatedResultList"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarUseCalendarWeek"/>
@@ -132,7 +132,7 @@
             <check-errors/>
         </if-not-empty>
         <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcWeek" list-name="relatedResultList" />
-        <first-from-list entry-name="relatedResult" list-name="relatedResultList"/>
+        <first-from-list entry="relatedResult" list="relatedResultList"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekExceptionUseCalendarWeek"/>

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 03:17:32 2008
@@ -198,7 +198,7 @@
                     </condition-list>
                     <order-by field-name="-statusDate"/>
                 </entity-condition>
-                <first-from-list entry-name="lastContactListPartyStatus" list-name="lastContactListPartyStatusList"/>
+                <first-from-list entry="lastContactListPartyStatus" list="lastContactListPartyStatusList"/>
 
                 <!-- only require an optInVerifyCode if there was one in place -->
                 <if-not-empty field="lastContactListPartyStatus.optInVerifyCode">
@@ -257,7 +257,7 @@
                     </condition-list>
                     <order-by field-name="-statusDate"/>
                 </entity-condition>
-                <first-from-list entry-name="contactListPartyStatus" list-name="lastContactListPartyStatusList"/>
+                <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
                 
                 <!-- TODO: if preferredContactMech.contactMechTypeId != EMAIL_ADDRESS, return an error -->
                 <!-- TODO: if preferredContactMech is empty, should we try to find the ContactMech we want based on the Party? -->

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 03:17:32 2008
@@ -128,7 +128,7 @@
             <field-map field-name="roleTypeIdFrom" value="ACCOUNT_LEAD"/>
             <order-by field-name="-fromDate"/>
         </entity-and>
-        <first-from-list list="partyRelationships" entry-name="partyRelationship"/>
+        <first-from-list list="partyRelationships" entry="partyRelationship"/>
 
         <if-not-empty field="partyRelationship">
             <set-service-fields service-name="updatePartyRelationship" map-name="partyRelationship" to-map-name="deletePartyRelationship"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 03:17:32 2008
@@ -87,7 +87,7 @@
         <set field="curUserPcmFindMap.partyId" from-field="userLogin.partyId"/>
         <set field="curUserPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
         <find-by-and entity-name="PartyAndContactMech" map-name="curUserPcmFindMap" list-name="curUserPartyAndContactMechs"/>
-        <first-from-list entry-name="curUserPartyAndContactMech" list-name="curUserPartyAndContactMechs"/>
+        <first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
         <string-append field-name="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
         
         <!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo -->

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 03:17:32 2008
@@ -387,7 +387,7 @@
         <if-empty field="currentItems">
             <set value="1" field="newEntity.returnItemSeqId"/>
         <else>
-           <first-from-list entry-name="newestItem" list-name="currentItems"/>
+           <first-from-list entry="newestItem" list="currentItems"/>
            <calculate field-name="returnItemSeqId" map-name="newEntity" type="Integer">
                <calcop field-name="returnItemSeqId" map-name="newestItem" operator="add">
                    <number value="1"/>
@@ -668,7 +668,7 @@
                 <condition-expr field-name="roleTypeId" operator="equals" env-name="roleTypeId"/>
             </condition-list>
         </entity-condition>
-        <first-from-list entry-name="orderRole" list-name="orderRoles"/>
+        <first-from-list entry="orderRole" list="orderRoles"/>
         <!-- create the return header -->
         <set from-field="orderHeader.originFacilityId" field="createHeaderCtx.destinationFacilityId"/>
         <set value="Y" field="updateHeaderCtx.needsInventoryReceive"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 03:17:32 2008
@@ -79,7 +79,7 @@
         <field-to-result field-name="plainLongZero" result-name="totalOrders"/>
 
         <!-- because we specified the partyId and the roleTypeId, should only be one item in list returned -->
-        <first-from-list list="orderInfoList" entry-name="orderInfo"/>
+        <first-from-list list="orderInfoList" entry="orderInfo"/>
         <if-not-empty field="orderInfo">
             <field-to-result field-name="orderInfo.totalGrandAmount" result-name="totalGrandAmount"/>
             <field-to-result field-name="orderInfo.totalSubRemainingAmount" result-name="totalSubRemainingAmount"/>
@@ -771,7 +771,7 @@
         </else>
         </if-compare>
         <get-related value-name="orderItemShipGroup" relation-name="OrderItemShipGrpInvRes" list-name="orderItemShipGroupInvResList" order-by-list-name="orderByList"/>
-        <first-from-list entry-name="orderItemShipGroupInvRes" list-name="orderItemShipGroupInvResList"/>
+        <first-from-list entry="orderItemShipGroupInvRes" list="orderItemShipGroupInvResList"/>
         <field-to-result field-name="orderItemShipGroupInvRes.promisedDatetime" result-name="estimatedShipDate"/>
     </simple-method>
 
@@ -937,7 +937,7 @@
                         <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
                     </entity-and>
                     <if-not-empty field="pcmpList">
-                        <first-from-list list="pcmpList" entry-name="pcmp"/>
+                        <first-from-list list="pcmpList" entry="pcmp"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                         <clear-field field-name="serviceInMap"/>
@@ -969,7 +969,7 @@
                             <field-map field-name="partyId" from-field="userLogin.partyId"/>
                             <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
                         </entity-and>
-                        <first-from-list list="pcmpList" entry-name="pcmp"/>
+                        <first-from-list list="pcmpList" entry="pcmp"/>
                         <if-not-empty field="pcmp">
                             <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                             <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
@@ -1018,7 +1018,7 @@
                         <field-map field-name="partyId" from-field="partyId"/>
                         <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                     </entity-and>
-                    <first-from-list entry-name="pcmp" list-name="pcmpList"/>
+                    <first-from-list entry="pcmp" list="pcmpList"/>
                     <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                     <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                     <clear-field field-name="serviceInMap"/>
@@ -1081,7 +1081,7 @@
                         <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                     </entity-and>
                     <if-not-empty field="pcmpList">
-                        <first-from-list list="pcmpList" entry-name="pcmp"/>
+                        <first-from-list list="pcmpList" entry="pcmp"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                         <clear-field field-name="serviceInMap"/>
@@ -1120,7 +1120,7 @@
                 <field-map field-name="partyId" from-field="partyId"/>
                 <order-by field-name="-fromDate"/>
             </entity-and>
-            <first-from-list list="paymentMethodList" entry-name="paymentMethod"/>
+            <first-from-list list="paymentMethodList" entry="paymentMethod"/>
             <set field="creditCardContext.paymentMethodId" from-field="paymentMethod.paymentMethodId"/>
             <call-service service-name="updateCreditCard" in-map-name="creditCardContext">
                 <result-to-field result-name="paymentMethodId" field-name="parameters.paymentMethodId"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 03:17:32 2008
@@ -79,7 +79,7 @@
                     <order-by field-name="supplierPrefOrderId"/>
                 </entity-condition>
                 <filter-list-by-date list-name="supplierProducts" valid-date-name="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
-                <first-from-list list="supplierProducts" entry-name="supplierProduct"/>
+                <first-from-list list="supplierProducts" entry="supplierProduct"/>
                 <if-not-empty field="supplierProduct.partyId">
                     <make-value value-name="requirementSupplier" entity-name="RequirementRole"/>
                     <set field="requirementSupplier.requirementId" from-field="requirement.requirementId"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 03:17:32 2008
@@ -300,7 +300,7 @@
                 <condition-expr field-name="roleTypeId" value="PLACING_CUSTOMER" />
             </condition-list>
         </entity-condition>
-        <first-from-list list="orderRoleList" entry-name="orderRole" />
+        <first-from-list list="orderRoleList" entry="orderRole" />
 
         <entity-condition entity-name="ShoppingList" list-name="shoppingListList">
             <condition-list combine="and">
@@ -308,7 +308,7 @@
                 <condition-expr field-name="listName" value="Auto Suggestions" />
             </condition-list>
         </entity-condition>
-        <first-from-list list="shoppingListList" entry-name="shoppingList" />
+        <first-from-list list="shoppingListList" entry="shoppingList" />
         <if-empty field="shoppingList">
             <set field="createShoppingListInMap.partyId" from-field="orderRole.partyId" />
             <set field="createShoppingListInMap.listName" value="Auto Suggestions" />
@@ -350,7 +350,7 @@
                             <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
                         </condition-list>
                     </entity-condition>
-                    <first-from-list list="virtualProductAssocList" entry-name="virtualProductAssoc" />
+                    <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc" />
                     <if-not-empty field="virtualProductAssoc">
                         <entity-condition entity-name="ProductAssoc" list-name="compProductAssocList" filter-by-date="true">
                             <condition-list combine="and">

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:17:32 2008
@@ -39,7 +39,7 @@
                 <field-map field-name="partyId" from-field="parameters.partyIdFrom"/>
             </entity-and>
             <if-not-empty field="roles">
-                <first-from-list list="roles" entry-name="role"/>
+                <first-from-list list="roles" entry="role"/>
                 <set field="newStat.communicationEventId" from-field="parameters.parentCommEventId"/>
                 <set field="newStat.partyId" from-field="parameters.partyIdFrom"/>
                 <set field="newStat.roleTypeId" from-field="role.roleTypeId"/>
@@ -70,7 +70,7 @@
                     <field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/>
                     <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
                 </entity-and>
-                <first-from-list entry-name="partyContactMech" list-name="partyContactMechs"/>
+                <first-from-list entry="partyContactMech" list="partyContactMechs"/>
                 <set field="newEntity.partyIdTo" from-field="partyContactMech.partyId"/>
             </if-not-empty>
         </if-empty>
@@ -165,7 +165,7 @@
                     <field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/>
                     <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
                 </entity-and>
-                <first-from-list entry-name="partyContactMech" list-name="partyContactMechs"/>                
+                <first-from-list entry="partyContactMech" list="partyContactMechs"/>                
                 <set field="parameters.partyIdTo" from-field="partyContactMech.partyId"/>
                 <set field="event.partyIdTo" from-field="partyContactMech.partyId"/>
             </if-not-empty>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 03:17:32 2008
@@ -273,11 +273,11 @@
         <set field="lookupHash.emailAddress" from-field="parameters.emailAddress"/>
         <find-by-primary-key value-name="emailAddressVerification" entity-name="EmailAddressVerification" map-name="lookupHash"/>
         <set field="bodyParameters.verifyHash" from-field="emailAddressVerification.verifyHash"/>
-        <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
+        <first-from-list entry="storeEmail" list="productStoreEmailSettings"/>
         <entity-and list="webSites" entity-name="WebSite">
             <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
         </entity-and>
-        <first-from-list entry-name="webSite" list-name="webSites"/>
+        <first-from-list entry="webSite" list="webSites"/>
         <if-not-empty field="storeEmail.bodyScreenLocation">                        
             <set field="emailParams.sendTo" from-field="parameters.emailAddress"/>
             <set field="emailParams.subject" from-field="storeEmail.subject"/>
@@ -297,7 +297,7 @@
             <field-map field-name="verifyHash" from-field="parameters.verifyHash"/>
         </entity-and>
         
-        <first-from-list list="emailAddressVerifications" entry-name="emailAddressVerification"/>
+        <first-from-list list="emailAddressVerifications" entry="emailAddressVerification"/>
         <if-not-empty field="emailAddressVerification">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <if-compare-field field="emailAddressVerification.expireDate" to-field="nowTimestamp" operator="less">

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 03:17:32 2008
@@ -79,7 +79,7 @@
         <set-pk-fields value-name="partyContactMechMap" map-name="parameters"/>
         <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
         <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
-        <first-from-list entry-name="partyContactMech" list-name="validPartyContactMechs"/>
+        <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
         <if-empty field="partyContactMech">
             <add-error><fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/></add-error>
         </if-empty>
@@ -142,7 +142,7 @@
         <set-pk-fields value-name="partyContactMechMap" map-name="parameters"/>
         <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
         <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
-        <first-from-list entry-name="partyContactMech" list-name="validPartyContactMechs"/>
+        <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
         <if-empty field="partyContactMech">
             <add-error>
                 <fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>
@@ -341,7 +341,7 @@
                         <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
                     </entity-and>
                     <if-not-empty field="pcmpList">
-                        <first-from-list entry-name="pcmp" list-name="pcmpList"/>
+                        <first-from-list entry="pcmp" list="pcmpList"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                         <clear-field field-name="serviceInMap"/>
@@ -360,7 +360,7 @@
                         <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                     </entity-and>
                     <if-not-empty field="pcmpList">
-                        <first-from-list entry-name="pcmp" list-name="pcmpList"/>
+                        <first-from-list entry="pcmp" list="pcmpList"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                     </if-not-empty>
@@ -446,7 +446,7 @@
                             <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
                         </entity-and>
                         <if-not-empty field="pcmpList">
-                            <first-from-list list="pcmpList" entry-name="pcmp"/>
+                            <first-from-list list="pcmpList" entry="pcmp"/>
                             <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                             <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                             <clear-field field-name="serviceInMap"/>
@@ -478,7 +478,7 @@
                             <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                         </entity-and>
                         <if-not-empty field="pcmpList">
-                            <first-from-list list="pcmpList" entry-name="pcmp"/>
+                            <first-from-list list="pcmpList" entry="pcmp"/>
                             <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="serviceInMap"/>
                             <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                         </if-not-empty>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 03:17:32 2008
@@ -311,7 +311,7 @@
            <!-- locate the file extension to use based on mime-type -->
            <set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
            <find-by-and entity-name="FileExtension" map-name="extenLookup" list-name="extensions"/>
-           <first-from-list entry-name="extension" list-name="extensions"/>
+           <first-from-list entry="extension" list="extensions"/>
            <set-service-fields service-name="createDataResource" map-name="parameters" to-map-name="dataResource"/>
            <!-- create the data resource object -->
            <set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
@@ -401,7 +401,7 @@
                <!-- locate the file extension to use based on mime-type -->
                <set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
                <find-by-and entity-name="FileExtension" map-name="extenLookup" list-name="extensions"/>
-               <first-from-list entry-name="extension" list-name="extensions"/>
+               <first-from-list entry="extension" list="extensions"/>
                <set-service-fields service-name="createDataResource" map-name="parameters" to-map-name="dataResource"/>
                <!-- create the data resource object -->
                 <!-- create the data resource object -->
@@ -667,7 +667,7 @@
         </if-empty>
         <now-date-to-env env-name="fromDate"/>
         <filter-list-by-date list-name="emailAddressesAll" from-field-name="fromDate" to-list-name="emailAddresses"/>
-        <first-from-list entry-name="emailAddress" list-name="emailAddresses"/>
+        <first-from-list entry="emailAddress" list="emailAddresses"/>
         <field-to-result field-name="emailAddress.infoString" result-name="emailAddress"/>
     </simple-method>
     
@@ -717,7 +717,7 @@
             <else>
                 <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="telephoneAll1"/>
                 <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2"/>
-                <first-from-list entry-name="telephone" list-name="telephoneAll2"/>
+                <first-from-list entry="telephone" list="telephoneAll2"/>
                 <if-not-empty field="telephone.tnCountryCode">
                     <field-to-result map-name="telephone" field-name="tnCountryCode" result-name="countryCode"/>
                 </if-not-empty>
@@ -821,11 +821,11 @@
                 <condition-expr field-name="emailType" operator="equals" value="PARTY_REGIS_CONFIRM"/>
             </condition-list>
         </entity-condition>
-        <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
+        <first-from-list entry="storeEmail" list="productStoreEmailSettings"/>
         <entity-and list="webSites" entity-name="WebSite">
             <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
         </entity-and>
-        <first-from-list entry-name="webSite" list-name="webSites"/>
+        <first-from-list entry="webSite" list="webSites"/>
         <if-not-empty field="storeEmail.bodyScreenLocation">
             <entity-one entity-name="Person" value-name="person"/>
             <set field="bodyParameters.person" from-field="person"/>
@@ -852,11 +852,11 @@
                 <condition-expr field-name="emailType" operator="equals" value="UPD_PRSNL_INF_CNFRM"/>
             </condition-list>
         </entity-condition>
-        <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
+        <first-from-list entry="storeEmail" list="productStoreEmailSettings"/>
         <entity-and list="webSites" entity-name="WebSite">
             <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
         </entity-and>
-        <first-from-list entry-name="webSite" list-name="webSites"/>
+        <first-from-list entry="webSite" list="webSites"/>
         <if-not-empty field="storeEmail.bodyScreenLocation">
             <if-not-empty field="parameters.updatedUserLogin.partyId">
                 <set field="partyId" from-field="parameters.updatedUserLogin.partyId"/>
@@ -870,7 +870,7 @@
                     <condition-expr field-name="partyId" operator="equals"  env-name="partyId"/>
                 </condition-list>
             </entity-condition>
-            <first-from-list entry-name="partyContactDetailByPurpose" list-name="partyContactDetailByPurposes"/>
+            <first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
             <entity-one entity-name="PartyAndPerson" value-name="partyAndPerson"/>
             <set field="bodyParameters.partyAndPerson" from-field="partyAndPerson"/>
             <set field="contactMechId" from-field="partyContactDetailByPurpose.contactMechId"/>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Tue Dec 30 03:17:32 2008
@@ -286,7 +286,7 @@
         <set field="serviceCtx.partyId" value="DemoCustomer"/>
         <find-by-and entity-name="PaymentMethodAndCreditCard" map-name="serviceCtx" list-name="paymentMethodAndCreditCards"/>
         <filter-list-by-date list-name="paymentMethodAndCreditCards"/>
-        <first-from-list list="paymentMethodAndCreditCards" entry-name="paymentMethodAndCreditCard"/>
+        <first-from-list list="paymentMethodAndCreditCards" entry="paymentMethodAndCreditCard"/>
         <!-- first try with just updating without changing the credit card information -->
         <set-service-fields service-name="updateCreditCard" map-name="paymentMethodAndCreditCard" to-map-name="serviceCtx"/>
         

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Tue Dec 30 03:17:32 2008
@@ -82,22 +82,22 @@
         <set value="${parameters.costComponentTypePrefix}_ROUTE_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="routeCosts"/>
         <filter-list-by-date list-name="routeCosts"/>
-        <first-from-list list="routeCosts" entry-name="routeCost"/>
+        <first-from-list list="routeCosts" entry="routeCost"/>
         <!-- Labor costs -->
         <set value="${parameters.costComponentTypePrefix}_LABOR_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="laborCosts"/>
         <filter-list-by-date list-name="laborCosts"/>
-        <first-from-list list="laborCosts" entry-name="laborCost"/>
+        <first-from-list list="laborCosts" entry="laborCost"/>
         <!-- Materials costs -->
         <set value="${parameters.costComponentTypePrefix}_MAT_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="materialsCosts"/>
         <filter-list-by-date list-name="materialsCosts"/>
-        <first-from-list list="materialsCosts" entry-name="materialsCost"/>
+        <first-from-list list="materialsCosts" entry="materialsCost"/>
         <!-- Other costs -->
         <set value="${parameters.costComponentTypePrefix}_OTHER_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="otherCosts"/>
         <filter-list-by-date list-name="otherCosts"/>
-        <first-from-list list="otherCosts" entry-name="otherCost"/>
+        <first-from-list list="otherCosts" entry="otherCost"/>
         
         <set field="productCost" value="0" type="Double" />
         <calculate field-name="productCost" type="Double" decimal-scale="6">
@@ -114,7 +114,7 @@
             <set value="PRODUCT_VARIANT" field="assocAndMap.productAssocTypeId"/>
             <find-by-and entity-name="ProductAssoc" map-name="assocAndMap" list-name="virtualAssocs"/>
             <filter-list-by-date list-name="virtualAssocs"/>
-            <first-from-list list="virtualAssocs" entry-name="virtualAssoc"/>
+            <first-from-list list="virtualAssocs" entry="virtualAssoc"/>
             <if-not-empty field="virtualAssoc">
                 <set from-field="virtualAssoc.productId" field="inputMap.productId"/>
                 <set from-field="parameters.currencyUomId" field="inputMap.currencyUomId"/>
@@ -133,7 +133,7 @@
             <set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/>
             <find-by-and entity-name="SupplierProduct" map-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/>
             <filter-list-by-date list-name="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
-            <first-from-list list="priceCosts" entry-name="priceCost"/>
+            <first-from-list list="priceCosts" entry="priceCost"/>
             <if-not-empty field="priceCost.lastPrice">
                 <set from-field="priceCost.lastPrice" field="productCost"/>
             </if-not-empty>
@@ -146,7 +146,7 @@
                 <set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
                 <find-by-and entity-name="SupplierProduct" map-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/>
                 <filter-list-by-date list-name="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
-                <first-from-list list="priceCosts" entry-name="priceCost"/>
+                <first-from-list list="priceCosts" entry="priceCost"/>
                 <if-not-empty field="priceCost.lastPrice">
                     <!-- we try to convert the lastPrice to the desired currency -->
                     <clear-field field-name="inputMap"/>
@@ -167,7 +167,7 @@
             <set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
             <find-by-and entity-name="ProductPrice" map-name="costsAndMap" list-name="priceCosts"/>
             <filter-list-by-date list-name="priceCosts"/>
-            <first-from-list list="priceCosts" entry-name="priceCost"/>
+            <first-from-list list="priceCosts" entry="priceCost"/>
             <if-not-empty field="priceCost.price">
                 <set from-field="priceCost.price" field="productCost"/>
             </if-not-empty>
@@ -198,11 +198,11 @@
             <get-related value-name="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list-name="setupCosts"/>
             <filter-list-by-date list-name="setupCosts"/>
             <!--<filter-list-by-and list-name="costs" map-name="costsAndMap"/>-->
-            <first-from-list list="setupCosts" entry-name="setupCost"/>
+            <first-from-list list="setupCosts" entry="setupCost"/>
             <set value="USAGE_COST" field="costsAndMap.fixedAssetStdCostTypeId"/>
             <get-related value-name="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list-name="usageCosts"/>
             <filter-list-by-date list-name="usageCosts"/>
-            <first-from-list list="usageCosts" entry-name="usageCost"/>
+            <first-from-list list="usageCosts" entry="usageCost"/>
         </if-not-empty>
         <calculate field-name="taskCost" type="Double" decimal-scale="6">
             <calcop operator="add">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 03:17:32 2008
@@ -337,7 +337,7 @@
                 </condition-list>
                 <order-by field-name="-fromDate"/>
             </entity-condition>
-            <first-from-list list="productFeatureAppls" entry-name="productFeatureAppl"/>
+            <first-from-list list="productFeatureAppls" entry="productFeatureAppl"/>
             <set field="newEntity.fromDate" from-field="productFeatureAppl.fromDate"/>
         </if-empty>
         <create-value value-name="newEntity"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 03:17:32 2008
@@ -310,7 +310,7 @@
             <field-map field-name="serialNumber" from-field="parameters.serialNumber"/>
         </entity-and>
         <clear-field field-name="inventoryItem"/>
-        <first-from-list list="inventoryItems" entry-name="inventoryItem"/>
+        <first-from-list list="inventoryItems" entry="inventoryItem"/>
         <!-- If no inventory item found for the serial number, than create it -->
         <if-empty field="inventoryItem">
             <set field="receiveCtx.productId" from-field="parameters.productId"/>
@@ -327,7 +327,7 @@
         <!--Step 2 Check if its reserved for other order -->
         <set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
         <find-by-and map-name="inventoryReservationLookUp" list-name="invReservations" entity-name="OrderItemShipGrpInvRes"/>
-        <first-from-list entry-name="inventoryItemReservation" list-name="invReservations"/>
+        <first-from-list entry="inventoryItemReservation" list="invReservations"/>
         <if-not-empty field="inventoryItemReservation">
             <set-service-fields map-name="inventoryItemReservation" to-map-name="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
             <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 03:17:32 2008
@@ -261,7 +261,7 @@
             <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
             <order-by field-name="-statusDatetime"/>
         </entity-and>
-        <first-from-list entry-name="oldInventoryItemStatus" list-name="oldInventoryItemStatusList"/>
+        <first-from-list entry="oldInventoryItemStatus" list="oldInventoryItemStatusList"/>
         <if-not-empty field="oldInventoryItemStatus">
             <set field="oldInventoryItemStatus.statusEndDatetime" from-field="nowTimestamp"/>
             <store-value value-name="oldInventoryItemStatus"/>
@@ -417,7 +417,7 @@
                 <set field="getAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
                 <find-by-and entity-name="ProductAssoc" map-name="getAssoc" list-name="assocs"/>
                 <filter-list-by-date list-name="assocs" to-list-name="assocsDate"/>
-                <first-from-list entry-name="assoc" list-name="assocsDate"/>
+                <first-from-list entry="assoc" list="assocsDate"/>
                 <get-related-one value-name="assoc" relation-name="MainProduct" to-value-name="virtProduct"/>
                 <if-empty field="product.salesDiscWhenNotAvail">
                     <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/>
@@ -786,7 +786,7 @@
 
         <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
             <!-- if the new item is serialized, i.e. qoh is 1, we just need the first reservation -->
-            <first-from-list entry-name="inventoryReservation" list-name="allReservations"/>
+            <first-from-list entry="inventoryReservation" list="allReservations"/>
             <clear-field field-name="allReservations"/>
             <field-to-list field-name="inventoryReservation" list-name="allReservations"/>
         </if-compare>
@@ -1264,7 +1264,7 @@
                     <set field="orderRoleAndMap.orderId" from-field="orderHeader.orderId"/>
                     <set field="orderRoleAndMap.roleTypeId" value="END_USER_CUSTOMER"/>
                     <find-by-and entity-name="OrderRole" list-name="orderRoles" map-name="orderRoleAndMap"/>
-                    <first-from-list list="orderRoles" entry-name="orderRole"/>
+                    <first-from-list list="orderRoles" entry="orderRole"/>
                     <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
                         <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
                     </entity-one>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 03:17:32 2008
@@ -88,7 +88,7 @@
                     <string-to-list string="Error in stock move, could not find a pick/primary location for facility [${parameters.facilityId}] and product [${productId}]" list-name="warningMessageList"/>
                 <else>
                     <!-- should generally only be one pick/primary location, just choose the first... -->
-                    <first-from-list entry-name="productFacilityLocationView" list-name="productFacilityLocationViewList"/>
+                    <first-from-list entry="productFacilityLocationView" list="productFacilityLocationViewList"/>
                     <get-related-one value-name="productFacilityLocationView" relation-name="FacilityLocation" to-value-name="moveInfo.facilityLocationTo"/>
                     <get-related-one value-name="productFacilityLocationView" relation-name="ProductFacilityLocation" to-value-name="moveInfo.targetProductFacilityLocation"/>
 
@@ -301,7 +301,7 @@
                                     <then>  
                                         <set from-field="productSave" field="moveInfo.product"/>
                                         <set from-field="targetFacilityLocationSave" field="moveInfo.facilityLocationTo"/>
-                                        <first-from-list entry-name="InventoryItemAndLocation" list-name="perLocationInventoryItemAndLocList"/>
+                                        <first-from-list entry="InventoryItemAndLocation" list="perLocationInventoryItemAndLocList"/>
                                         <get-related-one value-name="InventoryItemAndLocation" relation-name="FacilityLocation" to-value-name="moveInfo.facilityLocationFrom"/>
                                         <get-related-one value-name="productFacilityLocationQuantityTest" relation-name="ProductFacilityLocation" to-value-name="moveInfo.targetProductFacilityLocation"/>
                                         <set from-field="productFacilityLocationQuantityTest.availableToPromiseTotal" field="moveInfo.availableToPromiseTotalTo"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Tue Dec 30 03:17:32 2008
@@ -102,7 +102,7 @@
                 <field-map field-name="productStoreGroupId" value="_NA_"/>
             </entity-and>
             <!-- should just be one -->
-            <first-from-list entry-name="productPrice" list-name="productPriceList"/>
+            <first-from-list entry="productPrice" list="productPriceList"/>
             <set field="productPrice.price" from-field="parameters.price"/>
             <store-value value-name="productPrice"/>
         </if-not-empty>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml Tue Dec 30 03:17:32 2008
@@ -58,7 +58,7 @@
         <entity-one entity-name="Product" value-name="product"/>
         <get-related relation-name="FixedAssetProduct" value-name="product" list-name="productFixedAssets"/>
         <if-not-empty field="productFixedAssets">
-            <first-from-list list="productFixedAssets" entry-name="productFixedAsset"/>
+            <first-from-list list="productFixedAssets" entry="productFixedAsset"/>
               <field-to-result field-name="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/>
         </if-not-empty>
         <field-to-result field-name="parameters.productId" result-name="productId"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Dec 30 03:17:32 2008
@@ -61,7 +61,7 @@
         <set-pk-fields value-name="facilityContactMechMap" map-name="parameters"/>
         <find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
         <filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
-        <first-from-list entry-name="facilityContactMech" list-name="validFacilityContactMechs"/>
+        <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
         <if-empty field="facilityContactMech">
             <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified facility"/></add-error>
         </if-empty>
@@ -129,7 +129,7 @@
         <find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
         <filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
 
-        <first-from-list entry-name="facilityContactMech" list-name="validFacilityContactMechs"/>
+        <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
         <if-empty field="facilityContactMech">
             <add-error>
                 <fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 03:17:32 2008
@@ -459,7 +459,7 @@
                 
                 <!-- didn't find anything? Take the first facility from list -->
                 <if-empty field="storeFound">
-                    <first-from-list list="productStoreFacilities" entry-name="storeFound"/>
+                    <first-from-list list="productStoreFacilities" entry="storeFound"/>
                 </if-empty>                
                 <set from-field="storeFound.facilityId" field="facilityId" default-value=""/>
                 <set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="reserveProductInventoryByFacility"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Tue Dec 30 03:17:32 2008
@@ -38,7 +38,7 @@
                     <field-map field-name="productId" from-field="parameters.productId"/>
                     <order-by field-name="-fromDate"/>
                 </entity-and>
-                <first-from-list entry-name="resource" list-name="resourceList"/>
+                <first-from-list entry="resource" list="resourceList"/>
                 <if-not-empty field="resource">
                     <set-nonpk-fields value-name="newEntity" map-name="resource"/>
                 </if-not-empty>
@@ -67,7 +67,7 @@
             <set field="found" value="false" type="Boolean"/>
             <else>
                 <set field="found" value="true" type="Boolean"/>
-                <first-from-list entry-name="subscription" list-name="pfResultList"/>
+                <first-from-list entry="subscription" list="pfResultList"/>
                 <field-to-result field-name="subscription.subscriptionId" result-name="subscriptionId"/>
             </else>
         </if-empty>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 03:17:32 2008
@@ -185,7 +185,7 @@
         <make-value entity-name="OrderShipment" value-name="orderShipmentLookupPk"/>
         <set-pk-fields value-name="orderShipmentLookupPk" map-name="parameters"/>
         <find-by-and entity-name="OrderShipment" map-name="orderShipmentLookupPk" list-name="orderShipments"/>
-        <first-from-list entry-name="orderShipment" list-name="orderShipments"/>
+        <first-from-list entry="orderShipment" list="orderShipments"/>
         <!-- qtyForShipmentItem is the quantity we will add to the ShipmentItem -->
         <!-- OrderShipment.quantity stores the OrderItem.quantity planned in the shipment -->
         <calculate field-name="qtyForShipmentItem">
@@ -283,7 +283,7 @@
                 </condition-list>
                 <order-by field-name="shipmentItemSeqId"/>
             </entity-condition>
-            <first-from-list entry-name="shipmentItem" list-name="shipmentItems"/>
+            <first-from-list entry="shipmentItem" list="shipmentItems"/>
         </if-not-empty>
 
         <if-empty field="shipmentItem">
@@ -513,7 +513,7 @@
           <field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
           <field-map field-name="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/>
         </entity-and>
-        <first-from-list list="returnItemShipments" entry-name="returnItemShipment"/>
+        <first-from-list list="returnItemShipments" entry="returnItemShipment"/>
         <calculate field-name="quantityNotIssued">
           <calcop operator="subtract" field-name="returnItemShipment.quantity">
               <calcop operator="get" field-name="parameters.totalIssuedQty"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 03:17:32 2008
@@ -438,7 +438,7 @@
         <if-empty field="shipment.partyIdFrom">
             <set value="SHIP_FROM_VENDOR" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
-            <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
+            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
@@ -448,7 +448,7 @@
         <if-empty field="shipment.partyIdFrom">
             <set value="VENDOR" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
-            <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
+            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
@@ -459,7 +459,7 @@
         <if-empty field="shipment.partyIdTo">
             <set value="SHIP_TO_CUSTOMER" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
-            <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
+            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
@@ -469,7 +469,7 @@
         <if-empty field="shipment.partyIdTo">
             <set value="CUSTOMER" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list-name="orderRoles" map-name="limitRoleMap" to-list-name="limitOrderRoles"/>
-            <first-from-list entry-name="limitOrderRole" list-name="limitOrderRoles"/>
+            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
@@ -484,7 +484,7 @@
             <!-- first try from orderContactMechs -->
             <set value="SHIPPING_LOCATION" field="destinationContactMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list-name="orderContactMechs" map-name="destinationContactMap" to-list-name="destinationOrderContactMechs"/>
-            <first-from-list entry-name="destinationOrderContactMech" list-name="destinationOrderContactMechs"/>
+            <first-from-list entry="destinationOrderContactMech" list="destinationOrderContactMechs"/>
             <if-not-empty field="destinationOrderContactMech">
                 <set from-field="destinationOrderContactMech.contactMechId" field="shipment.destinationContactMechId"/>
                <else>
@@ -497,7 +497,7 @@
             <if-empty field="shipment.originContactMechId">
                 <set value="SHIP_ORIG_LOCATION" field="originContactMap.contactMechPurposeTypeId"/>
                 <filter-list-by-and list-name="orderContactMechs" map-name="originContactMap" to-list-name="originOrderContactMechs"/>
-                <first-from-list entry-name="originOrderContactMech" list-name="originOrderContactMechs"/>
+                <first-from-list entry="originOrderContactMech" list="originOrderContactMechs"/>
                 <if-not-empty field="originOrderContactMech">
                     <set from-field="originOrderContactMech.contactMechId" field="shipment.originContactMechId"/>
                     <else>
@@ -511,7 +511,7 @@
         <if-empty field="shipment.destinationTelecomNumberId">
             <set value="PHONE_SHIPPING" field="destTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list-name="orderContactMechs" map-name="destTelecomOrderContactMechMap" to-list-name="destTelecomOrderContactMechs"/>
-            <first-from-list entry-name="destTelecomOrderContactMech" list-name="destTelecomOrderContactMechs"/>
+            <first-from-list entry="destTelecomOrderContactMech" list="destTelecomOrderContactMechs"/>
             <if-not-empty field="destTelecomOrderContactMech">
                 <set from-field="destTelecomOrderContactMech.contactMechId" field="shipment.destinationTelecomNumberId"/>
                 <else>
@@ -519,7 +519,7 @@
                     <entity-and entity-name="PartyAndTelecomNumber" list-name="phoneNumbers" filter-by-date="true">
                         <field-map field-name="partyId" from-field="shipment.partyIdTo"/>
                     </entity-and>
-                    <first-from-list entry-name="phoneNumber" list-name="phoneNumbers"/>
+                    <first-from-list entry="phoneNumber" list="phoneNumbers"/>
                     <if-not-empty field="phoneNumber">
                         <set from-field="phoneNumber.contactMechId" field="shipment.destinationTelecomNumberId"/>
                         <else>
@@ -533,7 +533,7 @@
         <if-empty field="shipment.originTelecomNumberId">
             <set value="PHONE_SHIP_ORIG" field="originTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list-name="orderContactMechs" map-name="originTelecomOrderContactMechMap" to-list-name="originTelecomOrderContactMechs"/>
-            <first-from-list entry-name="originTelecomOrderContactMech" list-name="originTelecomOrderContactMechs"/>
+            <first-from-list entry="originTelecomOrderContactMech" list="originTelecomOrderContactMechs"/>
             <if-not-empty field="originTelecomOrderContactMech">
                 <set from-field="originTelecomOrderContactMech.contactMechId" field="shipment.originTelecomNumberId"/>
                 <else>
@@ -547,7 +547,7 @@
             <if-compare field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT">
                 <set from-field="shipment.destinationContactMechId" field="facilityLookup.contactMechId"/>
                 <find-by-and entity-name="FacilityContactMech" map-name="facilityLookup" list-name="facilities"/>
-                <first-from-list list="facilities" entry-name="destinationFacility"/>
+                <first-from-list list="facilities" entry="destinationFacility"/>
                 <set from-field="destinationFacility.facilityId" field="shipment.destinationFacilityId"/>
             </if-compare>
         </if-empty>
@@ -693,7 +693,7 @@
             <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
         </entity-and>
         
-        <first-from-list entry-name="curUserPartyAndContactMech" list-name="curUserPartyAndContactMechs"/>
+        <first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
         <string-append field-name="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
 
         <!-- find email addresses of partyIdFrom, set as sendTo -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Dec 30 03:17:32 2008
@@ -176,7 +176,7 @@
             <condition-expr field-name="inventoryItemId" env-name="inventoryItemId"/>
             <order-by field-name="datetimeReceived"/>
         </entity-condition>
-        <first-from-list list="shipmentReceipts" entry-name="shipmentReceipt"/>
+        <first-from-list list="shipmentReceipts" entry="shipmentReceipt"/>
         <assert>
             <not><if-empty field="inventoryItem"></if-empty></not>
             <not><if-empty field="inventoryItemDetails"></if-empty></not>