You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/31 10:32:52 UTC
svn commit: r730357 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/payment/
applications/content/script/org/ofbiz/content/content/
applications/ecommerce/script/org/ofbiz/ecommerce/customer/
applications/manufacturing/script/org...
Author: jleroux
Date: Wed Dec 31 01:32:50 2008
New Revision: 730357
URL: http://svn.apache.org/viewvc?rev=730357&view=rev
Log:
<field-to-list(.*)field-name => <field-to-list$1field
<field-to-list(.*)list-name => <field-to-list$1list
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.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/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Wed Dec 31 01:32:50 2008
@@ -33,7 +33,7 @@
<result-to-field map-name="captureResult" result-name="responseMessage" />
</call-service>
<if-compare operator="equals" field="captureResult.responseMessage" value="error">
- <field-to-list map-name="orderHeaderAndPaymentPref" field-name="orderId" list-name="badOrders" />
+ <field-to-list map-name="orderHeaderAndPaymentPref" field="orderId" list="badOrders" />
</if-compare>
</iterate>
<if-not-empty field="badOrders">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Wed Dec 31 01:32:50 2008
@@ -31,7 +31,7 @@
<log level="always" message="currentContent: ${currentContent}"/>
- <field-to-list field-name="contentPurposeTypeId" list-name="contentPurposeList" map-name="parameters"/>
+ <field-to-list field="contentPurposeTypeId" list="contentPurposeList" map-name="parameters"/>
<string-to-list list-name="targetOperationList" string="CONTENT_CREATE"/>
<set field="context.currentContent" from-field="currentContent"/>
<set field="context.contentPurposeList" from-field="contentPurposeList"/>
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=730357&r1=730356&r2=730357&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 Wed Dec 31 01:32:50 2008
@@ -559,13 +559,13 @@
<simple-method method-name="findAssocContent" short-description="Find associated content">
<set from-field="parameters.contentId" field="queryMap.contentId"/>
<set field="mapKeys" from-field="parameters.mapKeys" />
- <field-to-list field-name="mapKey" list-name="mapKeys"/>
+ <field-to-list field="mapKey" list="mapKeys"/>
<iterate entry="mapKey" list="mapKeys">
<set from-field="mapKey" field="queryMap.mapKey"/>
<find-by-and list="resultMap" entity-name="ContentAssoc" map="queryMap"/>
<filter-list-by-date list-name="resultMap" to-list-name="validContent"/>
<iterate entry="contentAssoc" list="validContent">
- <field-to-list field-name="contentAssoc" list-name="result"/>
+ <field-to-list field="contentAssoc" list="result"/>
</iterate>
</iterate>
<if>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Wed Dec 31 01:32:50 2008
@@ -1073,7 +1073,7 @@
<if-not-empty field="carrierShipmentMethod.productStoreShipMethId">
<set field="shippingOptionMap.productStoreShipMethId" from-field="carrierShipmentMethod.productStoreShipMethId"/>
</if-not-empty>
- <field-to-list field-name="shippingOptionMap" list-name="shippingOptions"/>
+ <field-to-list field="shippingOptionMap" list="shippingOptions"/>
<clear-field field="shippingOptionMap"/>
</iterate>
<set field="parameters.shippingOptions" from-field="shippingOptions"/>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Wed Dec 31 01:32:50 2008
@@ -66,7 +66,7 @@
<find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/>
<if-not-empty field="existingUserLogin">
<set field="tempErrorMessage" value="Username in use, please choose another." />
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-not-empty>
</if-not-empty>
@@ -234,13 +234,13 @@
<if-compare value="USA" operator="equals" field="parameters.shipToCountryGeoId">
<if-empty field="parameters.shipToStateProvinceGeoId">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
<if-compare value="CAN" operator="equals" field="parameters.shipToCountryGeoId">
<if-empty field="parameters.shipToStateProvinceGeoId">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
</if-compare>
@@ -268,13 +268,13 @@
<if-compare value="USA" operator="equals" field="parameters.billToCountryGeoId">
<if-empty field="parameters.billToStateProvinceGeoId">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
<if-compare value="CAN" operator="equals" field="parameters.billToCountryGeoId">
<if-empty field="parameters.billToStateProvinceGeoId">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
</if-compare>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Wed Dec 31 01:32:50 2008
@@ -102,7 +102,7 @@
</if-compare>
</else>
</if-compare>
- <field-to-list field-name="orderByString" list-name="orderByList"/>
+ <field-to-list field="orderByString" list="orderByList"/>
<set from-field="productId" field="lookupFieldMap.productId"/>
<set from-field="workEffort.facilityId" field="lookupFieldMap.facilityId"/>
<!-- if locationSeqId is passed, then only the inventory items in the location are considered -->
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Wed Dec 31 01:32:50 2008
@@ -65,7 +65,7 @@
<find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/>
<if-not-empty field="existingUserLogin">
<set field="tempErrorMessage" value="Username in use, please choose another." />
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-not-empty>
</if-not-empty>
@@ -123,13 +123,13 @@
<if-compare value="USA" operator="equals" field="parameters.CUSTOMER_COUNTRY">
<if-empty field="parameters.CUSTOMER_STATE">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
<if-compare value="CAN" operator="equals" field="parameters.CUSTOMER_COUNTRY">
<if-empty field="parameters.CUSTOMER_STATE">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
</else>
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=730357&r1=730356&r2=730357&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 Wed Dec 31 01:32:50 2008
@@ -188,7 +188,7 @@
<find-by-and entity-name="PostalAddressBoundary" map="postalAddressBoundaryLookupMap" list="postalAddressBoundaries"/>
<iterate list="postalAddressBoundaries" entry="postalAddressBoundary">
<get-related-one value-name="postalAddressBoundary" to-value-field="geo" relation-name="Geo"/>
- <field-to-list field-name="geo" list="geos"/>
+ <field-to-list field="geo" list="geos"/>
</iterate>
<field-to-result field="geos"/>
</simple-method>
@@ -451,7 +451,7 @@
<find-by-and entity-name="PartyRelationship" map="lookupMap" list="partyRelationships"/>
<iterate list="partyRelationships" entry="partyRelationship">
<get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-field="party"/>
- <field-to-list field-name="party" list="parties"/>
+ <field-to-list field="party" list="parties"/>
</iterate>
<if-not-empty field="parties">
<field-to-result field="parties"/>
@@ -509,14 +509,14 @@
<!-- only create these if they don't already exist, more efficient and avoids potential problems in recursed calls -->
<if-empty field="_inline_roleTypeIdFromList">
- <field-to-list field-name="roleTypeIdFrom" list-name="_inline_roleTypeIdFromList"/>
+ <field-to-list field="roleTypeIdFrom" list="_inline_roleTypeIdFromList"/>
<if-compare field="roleTypeIdFromInclueAllChildTypes" operator="equals" value="Y">
<set value="_inline_roleTypeIdFromList" field="roleTypeIdListName"/>
<call-simple-method method-name="getChildRoleTypesInline"/>
</if-compare>
</if-empty>
<if-empty field="_inline_roleTypeIdToList">
- <field-to-list field-name="roleTypeIdTo" list-name="_inline_roleTypeIdToList"/>
+ <field-to-list field="roleTypeIdTo" list="_inline_roleTypeIdToList"/>
<if-compare field="roleTypeIdToInclueAllChildTypes" operator="equals" value="Y">
<set value="_inline_roleTypeIdToList" field="roleTypeIdListName"/>
<call-simple-method method-name="getChildRoleTypesInline"/>
@@ -532,7 +532,7 @@
<if>
<condition><not><if-compare-field field="_inline_relatedPartyIdAlreadySearchedList" to-field="relatedPartyId" operator="contains"/></not></condition>
<then>
- <field-to-list field-name="relatedPartyId" list-name="_inline_relatedPartyIdAlreadySearchedList"/>
+ <field-to-list field="relatedPartyId" list="_inline_relatedPartyIdAlreadySearchedList"/>
<clear-field field="_inline_PartyRelationshipList"/>
<entity-condition entity-name="PartyRelationship" list="_inline_PartyRelationshipList" use-cache="${useCache}">
@@ -561,7 +561,7 @@
</and>
</condition>
<then>
- <field-to-list field-name="_inline_PartyRelationship.partyIdTo" list-name="_inline_NewRelatedPartyIdList"/>
+ <field-to-list field="_inline_PartyRelationship.partyIdTo" list="_inline_NewRelatedPartyIdList"/>
</then>
</if>
</iterate>
@@ -594,7 +594,7 @@
</and>
</condition>
<then>
- <field-to-list field-name="_inline_PartyRelationship.partyIdFrom" list-name="_inline_NewRelatedPartyIdList"/>
+ <field-to-list field="_inline_PartyRelationship.partyIdFrom" list="_inline_NewRelatedPartyIdList"/>
</then>
</if>
</iterate>
@@ -614,7 +614,7 @@
</simple-method>
<simple-method method-name="getChildRoleTypes" short-description="Get Child RoleTypes">
- <field-to-list field-name="roleTypeId" list-name="childRoleTypeIdList"/>
+ <field-to-list field="roleTypeId" list="childRoleTypeIdList"/>
<set value="childRoleTypeIdList" field="roleTypeIdListName"/>
<call-simple-method method-name="getChildRoleTypesInline"/>
<field-to-result field="childRoleTypeIdList"/>
@@ -626,7 +626,7 @@
<if>
<condition><not><if-compare-field field="_inline_roleTypeIdAlreadySearchedList" to-field="roleTypeId" operator="contains"/></not></condition>
<then>
- <field-to-list field-name="roleTypeId" list-name="_inline_roleTypeIdAlreadySearchedList"/>
+ <field-to-list field="roleTypeId" list="_inline_roleTypeIdAlreadySearchedList"/>
<clear-field field="_inline_RoleTypeList"/>
<entity-condition entity-name="RoleType" list="_inline_RoleTypeList" use-cache="true">
@@ -641,7 +641,7 @@
</and>
</condition>
<then>
- <field-to-list field-name="newRoleType.roleTypeId" list-name="_inline_NewRoleTypeIdList"/>
+ <field-to-list field="newRoleType.roleTypeId" list="_inline_NewRoleTypeIdList"/>
</then>
</if>
</iterate>
@@ -675,16 +675,16 @@
<set field="findMap.partyId" from-field="parameters.partyId"/>
<if-empty field="parameters.contactMechPurposeTypeId">
<!-- search in this order if not provided-->
- <set field="type" value="PRIMARY_PHONE"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_MOBILE"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_WORK"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_QUICK"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_HOME"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_BILLING"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_SHIPPING"/><field-to-list field-name="type" list-name="types"/>
- <set field="type" value="PHONE_SHIP_ORIG"/><field-to-list field-name="type" list-name="types"/>
+ <set field="type" value="PRIMARY_PHONE"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_MOBILE"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_WORK"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_QUICK"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_HOME"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_BILLING"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_SHIPPING"/><field-to-list field="type" list="types"/>
+ <set field="type" value="PHONE_SHIP_ORIG"/><field-to-list field="type" list="types"/>
<else>
- <set field="type" from-field="parameters.contactMechPurposeTypeId"/><field-to-list field-name="type" list-name="types"/>
+ <set field="type" from-field="parameters.contactMechPurposeTypeId"/><field-to-list field="type" list="types"/>
</else>
</if-empty>
<set field="findMap.contactMechTypeId" value="TELECOM_NUMBER"/>
@@ -900,7 +900,7 @@
</call-class-method>
<iterate list="geoList" entry="countryGeo">
<set field="countryName" value="${countryGeo.geoName}: ${countryGeo.geoId}"/>
- <field-to-list list-name="countryList" field-name="countryName"/>
+ <field-to-list list="countryList" field="countryName"/>
</iterate>
<field-to-result field="countryList"/>
</simple-method>
@@ -913,11 +913,11 @@
</call-class-method>
<iterate list="geoList" entry="stateGeo">
<set field="stateName" value="${stateGeo.geoName}: ${stateGeo.geoId}"/>
- <field-to-list list-name="stateList" field-name="stateName"/>
+ <field-to-list list="stateList" field="stateName"/>
</iterate>
<if-empty field="stateList">
<set field="noOption" value="No States/Provinces exist: _NA_"/>
- <field-to-list list-name="stateList" field-name="noOption"/>
+ <field-to-list list="stateList" field="noOption"/>
</if-empty>
<field-to-result field="stateList"/>
</simple-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Wed Dec 31 01:32:50 2008
@@ -97,7 +97,7 @@
<find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/>
<if-not-empty field="existingUserLogin">
<set field="tempErrorMessage" value="Username in use, please choose another." />
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-not-empty>
</if-not-empty>
@@ -162,13 +162,13 @@
<if-compare value="USA" operator="equals" field="parameters.USER_COUNTRY">
<if-empty field="parameters.USER_STATE">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
<if-compare value="CAN" operator="equals" field="parameters.USER_COUNTRY">
<if-empty field="parameters.USER_STATE">
<property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
- <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ <field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
</else>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Wed Dec 31 01:32:50 2008
@@ -116,7 +116,7 @@
</if-not-empty>
<!-- set field="productCategoryContext.productCategoryId" from-field="defaultTopCategoryId"/>
<find-by-primary-key entity-name="ProductCategory" map="productCategoryContext" value-field="productCategory"/>
- <field-to-list list-name="categories" field-name="productCategory"/>
+ <field-to-list list="categories" field="productCategory"/>
-->
<set field="relatedCategoryContext.parentProductCategoryId" from-field="defaultTopCategoryId"/>
<call-service service-name="getRelatedCategories" in-map-name="relatedCategoryContext">
@@ -129,7 +129,7 @@
</simple-method>
<simple-method method-name="getRelatedCategories" short-description="get All Related categories" login-required="false">
<set value="sequenceNum" field="orderByString"/>
- <field-to-list list-name="orderByStringList" field-name="orderByString"/>
+ <field-to-list list="orderByStringList" field="orderByString"/>
<set field="productCategoryRollUpContext.parentProductCategoryId" from-field="parameters.parentProductCategoryId" />
<!--set field="categories" from-field="parameters.categories" / -->
<find-by-and entity-name="ProductCategoryRollup" list-name="rollups" map="productCategoryRollUpContext" order-by-list="orderByStringList"/>
@@ -139,7 +139,7 @@
<if-not-empty field="rollups">
<iterate list="rollups" entry="parent">
<get-related-one relation-name="CurrentProductCategory" value-name="parent" to-value-field="currentProductCategory"/>
- <field-to-list list="subCategories" field-name="currentProductCategory"/>
+ <field-to-list list="subCategories" field="currentProductCategory"/>
</iterate>
<if-not-empty field="subCategories">
<set field="relatedCategoryContext.categories" from-field="subCategories"/>
@@ -155,7 +155,7 @@
<field field="relCategory" type="java.lang.Object"/>
</call-object-method>
<if-compare value="false" field="addInCategories" operator="equals" type="Boolean">
- <field-to-list list-name="categories" field-name="relCategory"/>
+ <field-to-list list="categories" field="relCategory"/>
</if-compare>
</iterate>
<else>
@@ -173,7 +173,7 @@
<else>
<set field="productCategoryContext.productCategoryId" from-field="parameters.parentProductCategoryId"/>
<find-by-primary-key entity-name="ProductCategory" value-field="productCategory" map="productCategoryContext"/>
- <field-to-list list-name="categories" field-name="productCategory"/>
+ <field-to-list list="categories" field="productCategory"/>
<field-to-result field="categories" result-name="categories"/>
</else>
</if-not-empty>
@@ -220,25 +220,25 @@
<if-not-empty field="filesImageMap.categoryImageUrlMap.categoryImageUrl">
<if-compare value="Y" field="filesImageMap.categoryImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"/>
+ <field-to-list list="fileExists" field="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.linkOneImageUrlMap.linkOneImageUrl">
<if-compare value="Y" field="filesImageMap.linkOneImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"/>
+ <field-to-list list="fileExists" field="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.linkTwoImageUrlMap.linkTwoImageUrl">
<if-compare value="Y" field="filesImageMap.linkTwoImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"/>
+ <field-to-list list="fileExists" field="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
@@ -253,33 +253,33 @@
<if-not-empty field="filesImageMap">
<if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl">
<if-compare value="Y" field="filesImageMap.smallImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
+ <field-to-list list="fileExists" field="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.mediumImageUrlMap.mediumImageUrl">
<if-compare value="Y" field="filesImageMap.mediumImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
+ <field-to-list list="fileExists" field="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.largeImageUrlMap.largeImageUrl">
<if-compare value="Y" field="filesImageMap.largeImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
+ <field-to-list list="fileExists" field="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.detailImageUrlMap.detailImageUrl">
<if-compare value="Y" field="filesImageMap.detailImageUrl.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
+ <field-to-list list="fileExists" field="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
+ <field-to-list list="fileNotExists" field="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
</else>
</if-compare>
</if-not-empty>
@@ -303,36 +303,36 @@
<if-not-empty field="filesImageMap">
<if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl">
<if-compare value="Y" field="filesImageMap.smallImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
+ <field-to-list list="fileExists" field="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.mediumImageUrlMap.mediumImageUrl">
<if-compare value="Y" field="filesImageMap.mediumImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
+ <field-to-list list="fileExists" field="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.largeImageUrlMap.largeImageUrl">
<if-compare value="Y" field="filesImageMap.largeImageUrlMap.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
+ <field-to-list list="fileExists" field="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
+ <field-to-list list="fileNotExists" field="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/>
</else>
</if-compare>
</if-not-empty>
<if-not-empty field="filesImageMap.detailImageUrlMap.detailImageUrl">
<if-compare value="Y" field="filesImageMap.detailImageUrl.isExists" operator="equals">
- <field-to-list list-name="fileExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
+ <field-to-list list="fileExists" field="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
<else>
- <field-to-list list-name="fileNotExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
+ <field-to-list list="fileNotExists" field="detailImageUrl" map-name="filesImageMap.detailImageUrl"/>
</else>
</if-compare>
</if-not-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Wed Dec 31 01:32:50 2008
@@ -373,7 +373,7 @@
<iterate entry="productCategoryMember" list="productCategoryMembers">
<clone-value value-name="productCategoryMember" new-value-name="newProductCategoryMember"/>
<set field="newProductCategoryMember.productCategoryId" from-field="parameters.productCategoryIdTo"/>
- <field-to-list field-name="newProductCategoryMember" list-name="pcmsToStore"/>
+ <field-to-list field="newProductCategoryMember" list="pcmsToStore"/>
</iterate>
<store-list list="pcmsToStore"/>
@@ -425,7 +425,7 @@
<iterate entry="categoryEntity" list="categoryEntities">
<clone-value value-name="categoryEntity" new-value-name="newCategoryEntity"/>
<set field="newCategoryEntity.productCategoryId" from-field="productCategoryIdTo"/>
- <field-to-list field-name="newCategoryEntity" list-name="entitiesToStore"/>
+ <field-to-list field="newCategoryEntity" list="entitiesToStore"/>
</iterate>
<store-list list="entitiesToStore"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Wed Dec 31 01:32:50 2008
@@ -108,7 +108,7 @@
</if-compare>
</else>
</if-compare>
- <field-to-list field-name="orderByString" list-name="orderByList"/>
+ <field-to-list field="orderByString" list="orderByList"/>
<set field="lookupFieldMap.productId" from-field="orderItem.productId" />
<set field="lookupFieldMap.facilityId" from-field="orderHeader.originFacilityId" />
<find-by-and entity-name="InventoryItem" map="lookupFieldMap" list-name="inventoryItemList" order-by-list="orderByList"/>
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=730357&r1=730356&r2=730357&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 Wed Dec 31 01:32:50 2008
@@ -769,10 +769,10 @@
</and>
</condition>
<then>
- <field-to-list field-name="item" list-name="privilegedReservations"/>
+ <field-to-list field="item" list="privilegedReservations"/>
</then>
<else>
- <field-to-list field-name="item" list-name="reservations"/>
+ <field-to-list field="item" list="reservations"/>
</else>
</if>
<set field="reserveQtyAccum" value="${reserveQtyAccum + item.quantity}" type="BigDecimal"/>
@@ -788,7 +788,7 @@
<!-- if the new item is serialized, i.e. qoh is 1, we just need the first reservation -->
<first-from-list entry="inventoryReservation" list="allReservations"/>
<clear-field field="allReservations"/>
- <field-to-list field-name="inventoryReservation" list-name="allReservations"/>
+ <field-to-list field="inventoryReservation" list="allReservations"/>
</if-compare>
<!-- FIRST, cancel all the reservations -->
@@ -884,10 +884,10 @@
</and>
</condition>
<then>
- <field-to-list field-name="oneRelatedRes" list-name="privilegedReservations"/>
+ <field-to-list field="oneRelatedRes" list="privilegedReservations"/>
</then>
<else>
- <field-to-list field-name="oneRelatedRes" list-name="reservations"/>
+ <field-to-list field="oneRelatedRes" list="reservations"/>
</else>
</if>
</if-empty>
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=730357&r1=730356&r2=730357&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 Wed Dec 31 01:32:50 2008
@@ -54,7 +54,7 @@
-->
<!-- start by making a Map where the locationSeqId is the key and the value is a List of orderItemShipGrpInvResAndItemLocation -->
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
- <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByLocMap.${orderItemShipGrpInvResAndItemLocation.locationSeqId}"/>
+ <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByLocMap.${orderItemShipGrpInvResAndItemLocation.locationSeqId}"/>
</iterate>
<!-- now get all info for each origin location -->
@@ -62,7 +62,7 @@
<!-- now for more fun, split up by productId; this should generally not happen, but we'll make sure here -->
<clear-field field="oiirailByProdMap"/>
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="perLocationOiirailList">
- <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByProdMap[orderItemShipGrpInvResAndItemLocation.productId]"/>
+ <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByProdMap[orderItemShipGrpInvResAndItemLocation.productId]"/>
</iterate>
<clear-field field="perProductOiirailList"/>
@@ -178,7 +178,7 @@
</if-compare-field>
<!-- add the moveInfo to the master list -->
- <field-to-list field-name="moveInfo" list-name="moveByOisgirInfoList"/>
+ <field-to-list field="moveInfo" list="moveByOisgirInfoList"/>
<clear-field field="moveInfo"/>
</else>
</if-empty>
@@ -270,7 +270,7 @@
<!-- start by making a Map where the locationSeqId is the key and the value is a List of InventoryItemAndLocation -->
<clear-field field="InventoryItemAndLocationByLocMap"/>
<iterate entry="InventoryItemAndLocation" list="inventoryItemAndLocationList">
- <field-to-list field-name="InventoryItemAndLocation" list-name="InventoryItemAndLocationByLocMap.${InventoryItemAndLocation.locationSeqId}"/>
+ <field-to-list field="InventoryItemAndLocation" list="InventoryItemAndLocationByLocMap.${InventoryItemAndLocation.locationSeqId}"/>
</iterate>
<clear-field field="locationSeqId"/>
<clear-field field="perLocationInventoryItemAndLocList"/>
@@ -328,7 +328,7 @@
</if-compare-field>
<!-- add the moveInfo to the master list -->
- <field-to-list field-name="moveInfo" list-name="moveByPflInfoList"/>
+ <field-to-list field="moveInfo" list="moveByPflInfoList"/>
<clear-field field="moveInfo"/>
</then>
</if>
@@ -441,7 +441,7 @@
<clear-field field="oiirailByInvItemMap"/>
<log level="info" message="In processOisgirMoveByStatusInline orderItemShipGrpInvResAndItemLocationList=${orderItemShipGrpInvResAndItemLocationList}"/>
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
- <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/>
+ <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/>
</iterate>
<iterate-map key="inventoryItemId" value="orderItemShipGrpInvResAndItemLocationList" map="oiirailByInvItemMap">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Wed Dec 31 01:32:50 2008
@@ -210,7 +210,7 @@
<set from-field="orderItemShipGrpInvRes" field="orderItemShipGrpInvResInfo.orderItemShipGrpInvRes"/>
<set from-field="inventoryItem" field="orderItemShipGrpInvResInfo.inventoryItem"/>
<set from-field="facilityLocation" field="orderItemShipGrpInvResInfo.facilityLocation"/>
- <field-to-list field-name="orderItemShipGrpInvResInfo" list-name="orderItemShipGrpInvResInfoList"/>
+ <field-to-list field="orderItemShipGrpInvResInfo" list="orderItemShipGrpInvResInfoList"/>
<clear-field field="orderItemShipGrpInvResInfo"/>
</else>
</if>
@@ -261,14 +261,14 @@
<get-related-one value-name="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.shipmentMethodType"/>
</if-empty>
<if-compare field="needsStockMove" operator="equals" value="Y">
- <field-to-list field-name="orderHeaderInfo" list-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
+ <field-to-list field="orderHeaderInfo" list="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
<if-compare field="orderHeader.isRushOrder" operator="equals" value="Y">
- <field-to-list field-name="orderHeaderInfo" list-name="rushOrderInfo.orderNeedsStockMoveInfoList"/>
+ <field-to-list field="orderHeaderInfo" list="rushOrderInfo.orderNeedsStockMoveInfoList"/>
</if-compare>
<else>
- <field-to-list field-name="orderHeaderInfo" list-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderReadyToPickInfoList"/>
+ <field-to-list field="orderHeaderInfo" list="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderReadyToPickInfoList"/>
<if-compare field="orderHeader.isRushOrder" operator="equals" value="Y">
- <field-to-list field-name="orderHeaderInfo" list-name="rushOrderInfo.orderReadyToPickInfoList"/>
+ <field-to-list field="orderHeaderInfo" list="rushOrderInfo.orderReadyToPickInfoList"/>
</if-compare>
</else>
</if-compare>
@@ -304,7 +304,7 @@
<iterate entry="shipmentMethodType" list="shipmentMethodTypeList">
<if-not-empty field="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}">
- <field-to-list field-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}" list-name="pickMoveByShipmentMethodInfoList"/>
+ <field-to-list field="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}" list="pickMoveByShipmentMethodInfoList"/>
</if-not-empty>
</iterate>
@@ -328,7 +328,7 @@
</or>
</condition>
<then>
- <field-to-list field-name="pickMoveByShipmentMethodInfo" list-name="limitedPickMoveByShipmentMethodInfoList"/>
+ <field-to-list field="pickMoveByShipmentMethodInfo" list="limitedPickMoveByShipmentMethodInfoList"/>
</then>
</if>
@@ -823,7 +823,7 @@
<iterate entry="picklist" list="picklistList">
<call-simple-method method-name="getPicklistSingleInfoInline"/>
- <field-to-list field-name="picklistInfo" list-name="picklistInfoList"/>
+ <field-to-list field="picklistInfo" list="picklistInfoList"/>
</iterate>
<field-to-result field="picklistInfoList"/>
@@ -1031,7 +1031,7 @@
<get-related-one value-name="picklistRole" relation-name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
<get-related-one value-field="picklistRole" relation-name="RoleType" to-value-field="picklistRoleInfo.roleType" use-cache="true"/>
<set from-field="picklistRole" field="picklistRoleInfo.picklistRole"/>
- <field-to-list field-name="picklistRoleInfo" list-name="picklistRoleInfoList"/>
+ <field-to-list field="picklistRoleInfo" list="picklistRoleInfoList"/>
</iterate>
<clear-field field="picklistStatusHistoryInfoList"/>
@@ -1041,7 +1041,7 @@
<get-related-one value-name="picklistStatusHistory" relation-name="StatusItem" to-value-field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
<get-related-one value-field="picklistStatusHistory" relation-name="ToStatusItem" to-value-field="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
<set from-field="picklistStatusHistory" field="picklistStatusHistoryInfo.picklistStatusHistory"/>
- <field-to-list field-name="picklistStatusHistoryInfo" list-name="picklistStatusHistoryInfoList"/>
+ <field-to-list field="picklistStatusHistoryInfo" list="picklistStatusHistoryInfoList"/>
</iterate>
<clear-field field="picklistBinOrderList"/>
@@ -1065,12 +1065,12 @@
<get-related value-field="picklistItem" relation-name="ItemIssuance" list="picklistItemInfo.itemIssuanceList"/>
<set from-field="picklistItem" field="picklistItemInfo.picklistItem"/>
<set from-field="picklistBin" field="picklistItemInfo.picklistBin"/>
- <field-to-list field-name="picklistItemInfo" list-name="picklistItemInfoList"/>
+ <field-to-list field="picklistItemInfo" list="picklistItemInfoList"/>
</iterate>
<set from-field="picklistItemInfoList" field="picklistBinInfo.picklistItemInfoList"/>
<set from-field="picklistBin" field="picklistBinInfo.picklistBin"/>
- <field-to-list field-name="picklistBinInfo" list-name="picklistBinInfoList"/>
+ <field-to-list field="picklistBinInfo" list="picklistBinInfoList"/>
</iterate>
<clear-field field="picklistInfo"/>
@@ -1187,7 +1187,7 @@
<get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
<get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
- <field-to-list field-name="inventoryItemInfo" list-name="inventoryItemInfoList"/>
+ <field-to-list field="inventoryItemInfo" list="inventoryItemInfoList"/>
<!-- before destroying inventoryItemInfo, add info to the productInfoMap -->
<set from-field="inventoryItemInfo.product" field="productInfoMap.${inventoryItemInfo.product.productId}.product"/>
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=730357&r1=730356&r2=730357&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 Wed Dec 31 01:32:50 2008
@@ -1331,7 +1331,7 @@
<iterate list="orderItemAndShipGrpInvResAndItemList" entry="orderItemAndShipGrpInvResAndItem">
<if>
<condition><not><if-compare-field field="orderItemShipGrpInvResFacilityIds" to-field="orderItemAndShipGrpInvResAndItem.facilityId" operator="contains"/></not></condition>
- <then><field-to-list field-name="orderItemAndShipGrpInvResAndItem.facilityId" list-name="orderItemShipGrpInvResFacilityIds"/></then>
+ <then><field-to-list field="orderItemAndShipGrpInvResAndItem.facilityId" list="orderItemShipGrpInvResFacilityIds"/></then>
</if>
</iterate>
@@ -1435,7 +1435,7 @@
<!-- group orderItems (actually OrderItemAndShipGroupAssocs) by shipGroupSeqId in a Map with List values
This Map is actually used only for sales orders' shipments right now. -->
<iterate list="orderItemAndShipGroupAssocList" entry="orderItemAndShipGroupAssoc">
- <field-to-list field-name="orderItemAndShipGroupAssoc" list-name="orderItemListByShGrpMap.${orderItemAndShipGroupAssoc.shipGroupSeqId}"/>
+ <field-to-list field="orderItemAndShipGroupAssoc" list="orderItemListByShGrpMap.${orderItemAndShipGroupAssoc.shipGroupSeqId}"/>
</iterate>
</simple-method>
@@ -1550,7 +1550,7 @@
<set from-field="shipment.shipmentId" field="shipmentShipGroupFacility.shipmentId"/>
<set from-field="facility.facilityId" field="shipmentShipGroupFacility.facilityId"/>
<set from-field="orderItemShipGroup.shipGroupSeqId" field="shipmentShipGroupFacility.shipGroupSeqId"/>
- <field-to-list field-name="shipmentShipGroupFacility" list-name="shipmentShipGroupFacilityList"/>
+ <field-to-list field="shipmentShipGroupFacility" list="shipmentShipGroupFacilityList"/>
<string-to-list string="Created shipment with ID [${shipmentShipGroupFacility.shipmentId}] for ship group ID [${shipmentShipGroupFacility.shipGroupSeqId}] for facility ID [${shipmentShipGroupFacility.facilityId}]" list-name="successMessageList"/>
<clear-field field="shipmentShipGroupFacility"/>
</else>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Dec 31 01:32:50 2008
@@ -528,7 +528,7 @@
<make-value value-field="newPartyRole" entity-name="PartyRole"/>
<set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/>
<set value="CAL_OWNER" field="newPartyRole.roleTypeId"/>
- <field-to-list field-name="newPartyRole" list-name="newPartyRoleList"/>
+ <field-to-list field="newPartyRole" list="newPartyRoleList"/>
<store-list list="newPartyRoleList"/>
<make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Wed Dec 31 01:32:50 2008
@@ -31,12 +31,12 @@
<iterate entry="party" list="parties">
<set from-field="party.firstName" field="resultEntry.label"/>
<set from-field="party.partyId" field="resultEntry.value"/>
- <field-to-list field-name="resultEntry" list-name="lookupResult"/>
+ <field-to-list field="resultEntry" list="lookupResult"/>
</iterate>
<if-empty field="parties">
<set value="No match" field="resultEntry.label"/>
<set value="" field="resultEntry.value"/>
- <field-to-list field-name="resultEntry" list-name="lookupResult"/>
+ <field-to-list field="resultEntry" list="lookupResult"/>
</if-empty>
<field-to-result field="lookupResult"/>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Wed Dec 31 01:32:50 2008
@@ -82,7 +82,7 @@
<call-simple-method method-name="getMerchantPrivateItemData"/>
<!-- tax table for item-->
<call-simple-method method-name="getItemTaxTable"/>
- <field-to-list field-name="thisItem" list-name="items"/>
+ <field-to-list field="thisItem" list="items"/>
<clear-field field="thisItem"/>
</iterate>
</simple-method>
@@ -131,12 +131,12 @@
<iterate entry="" list="">
- <field-to-list field-name="" list-name="shippingMethods"/>
+ <field-to-list field="" list="shippingMethods"/>
</iterate>
</simple-method>
<simple-method method-name="getDefaultTaxRules" short-description="">
- <field-to-list field-name="" list-name="defaultRules"/>
+ <field-to-list field="" list="defaultRules"/>
</simple-method>
<simple-method method-name="isMerchantCalculated"
short-description="">
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730357&r1=730356&r2=730357&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Dec 31 01:32:50 2008
@@ -732,7 +732,7 @@
</then>
</if>
- <field-to-list field-name="highInfo" list-name="phaseList"/>
+ <field-to-list field="highInfo" list="phaseList"/>
</iterate>
</if-not-empty>
@@ -760,7 +760,7 @@
<call-simple-method method-name="getHours"/>
<set field="highInfo.workEffortId" from-field="lowInfo.workEffortId"/>
<set field="highInfo.workEffortName" from-field="lowInfo.workEffortName"/>
- <field-to-list field-name="highInfo" list-name="taskList"/>
+ <field-to-list field="highInfo" list="taskList"/>
<clear-field field="highInfo"/>
</iterate>
</if-not-empty>
@@ -804,7 +804,7 @@
</and>
</condition>
<then>
- <field-to-list field-name="projectParty" list-name="projectParties"/>
+ <field-to-list field="projectParty" list="projectParties"/>
<clear-field field="projectParty"/>
<clear-field field="highInfo"/>
</then>
@@ -832,7 +832,7 @@
</iterate>
<if-not-empty field="projectParty">
- <field-to-list field-name="projectParty" list-name="projectParties"/>
+ <field-to-list field="projectParty" list="projectParties"/>
</if-not-empty>
<if-not-empty field="projectParties">
<field-to-result field="projectParties"/>
@@ -868,7 +868,7 @@
</and>
</condition>
<then>
- <field-to-list field-name="taskParty" list-name="taskParties"/>
+ <field-to-list field="taskParty" list="taskParties"/>
<clear-field field="taskParty"/>
</then>
</if>
@@ -897,7 +897,7 @@
</iterate>
<if-not-empty field="taskParty">
- <field-to-list field-name="taskParty" list-name="taskParties"/>
+ <field-to-list field="taskParty" list="taskParties"/>
</if-not-empty>
<if-not-empty field="taskParties">
<field-to-result field="taskParties"/>