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/30 12:12:34 UTC
svn commit: r730093 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/manufacturing/sc...
Author: jleroux
Date: Tue Dec 30 03:12:33 2008
New Revision: 730093
URL: http://svn.apache.org/viewvc?rev=730093&view=rev
Log:
<first-from-list list-name => <first-from-list list
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.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/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.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/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/rental/RentalServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.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/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -86,7 +86,7 @@
</entity-and>
<if-not-empty field="parentPartyRelationships">
- <first-from-list list-name="parentPartyRelationships" entry-name="parentPartyRelationship"/>
+ <first-from-list list="parentPartyRelationships" entry-name="parentPartyRelationship"/>
<set field="currentOrganizationPartyId" from-field="parentPartyRelationship.partyIdFrom"/>
<else>
<clear-field field-name="currentOrganizationPartyId"/>
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=730093&r1=730092&r2=730093&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:12:33 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-name="fixedAssetDepMethods" entry-name="fixedAssetDepMethod"/>
+ <first-from-list list="fixedAssetDepMethods" entry-name="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=730093&r1=730092&r2=730093&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:12:33 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-name="invoiceTerms" entry-name="invoiceTerm"/>
+ <first-from-list list="invoiceTerms" entry-name="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/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=730093&r1=730092&r2=730093&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:12:33 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-name="routings" entry-name="routingGS"/>
+ <first-from-list list="routings" entry-name="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-name="virtualProductAssocList" entry-name="virtualProductAssoc"/>
+ <first-from-list list="virtualProductAssocList" entry-name="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-name="routings" entry-name="routingGS"/>
+ <first-from-list list="routings" entry-name="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-name="routings" entry-name="routingGS"/>
+ <first-from-list list="routings" entry-name="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-name="virtualProductAssocList" entry-name="virtualProductAssoc"/>
+ <first-from-list list="virtualProductAssocList" entry-name="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-name="routings" entry-name="routingGS"/>
+ <first-from-list list="routings" entry-name="routingGS"/>
</if-not-empty>
</if-empty>
</else>
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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -128,7 +128,7 @@
<field-map field-name="roleTypeIdFrom" value="ACCOUNT_LEAD"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <first-from-list list-name="partyRelationships" entry-name="partyRelationship"/>
+ <first-from-list list="partyRelationships" entry-name="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/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730093&r1=730092&r2=730093&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:12:33 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-name="orderInfoList" entry-name="orderInfo"/>
+ <first-from-list list="orderInfoList" entry-name="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"/>
@@ -937,7 +937,7 @@
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
</entity-and>
<if-not-empty field="pcmpList">
- <first-from-list list-name="pcmpList" entry-name="pcmp"/>
+ <first-from-list list="pcmpList" entry-name="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-name="pcmpList" entry-name="pcmp"/>
+ <first-from-list list="pcmpList" entry-name="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"/>
@@ -1081,7 +1081,7 @@
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
<if-not-empty field="pcmpList">
- <first-from-list list-name="pcmpList" entry-name="pcmp"/>
+ <first-from-list list="pcmpList" entry-name="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-name="paymentMethodList" entry-name="paymentMethod"/>
+ <first-from-list list="paymentMethodList" entry-name="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=730093&r1=730092&r2=730093&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:12:33 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-name="supplierProducts" entry-name="supplierProduct"/>
+ <first-from-list list="supplierProducts" entry-name="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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -300,7 +300,7 @@
<condition-expr field-name="roleTypeId" value="PLACING_CUSTOMER" />
</condition-list>
</entity-condition>
- <first-from-list list-name="orderRoleList" entry-name="orderRole" />
+ <first-from-list list="orderRoleList" entry-name="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-name="shoppingListList" entry-name="shoppingList" />
+ <first-from-list list="shoppingListList" entry-name="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-name="virtualProductAssocList" entry-name="virtualProductAssoc" />
+ <first-from-list list="virtualProductAssocList" entry-name="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=730093&r1=730092&r2=730093&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:12:33 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-name="roles" entry-name="role"/>
+ <first-from-list list="roles" entry-name="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"/>
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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -297,7 +297,7 @@
<field-map field-name="verifyHash" from-field="parameters.verifyHash"/>
</entity-and>
- <first-from-list list-name="emailAddressVerifications" entry-name="emailAddressVerification"/>
+ <first-from-list list="emailAddressVerifications" entry-name="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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -446,7 +446,7 @@
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
</entity-and>
<if-not-empty field="pcmpList">
- <first-from-list list-name="pcmpList" entry-name="pcmp"/>
+ <first-from-list list="pcmpList" entry-name="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-name="pcmpList" entry-name="pcmp"/>
+ <first-from-list list="pcmpList" entry-name="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/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730093&r1=730092&r2=730093&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:12:33 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-name="paymentMethodAndCreditCards" entry-name="paymentMethodAndCreditCard"/>
+ <first-from-list list="paymentMethodAndCreditCards" entry-name="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=730093&r1=730092&r2=730093&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:12:33 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-name="routeCosts" entry-name="routeCost"/>
+ <first-from-list list="routeCosts" entry-name="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-name="laborCosts" entry-name="laborCost"/>
+ <first-from-list list="laborCosts" entry-name="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-name="materialsCosts" entry-name="materialsCost"/>
+ <first-from-list list="materialsCosts" entry-name="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-name="otherCosts" entry-name="otherCost"/>
+ <first-from-list list="otherCosts" entry-name="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-name="virtualAssocs" entry-name="virtualAssoc"/>
+ <first-from-list list="virtualAssocs" entry-name="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-name="priceCosts" entry-name="priceCost"/>
+ <first-from-list list="priceCosts" entry-name="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-name="priceCosts" entry-name="priceCost"/>
+ <first-from-list list="priceCosts" entry-name="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-name="priceCosts" entry-name="priceCost"/>
+ <first-from-list list="priceCosts" entry-name="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-name="setupCosts" entry-name="setupCost"/>
+ <first-from-list list="setupCosts" entry-name="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-name="usageCosts" entry-name="usageCost"/>
+ <first-from-list list="usageCosts" entry-name="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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -337,7 +337,7 @@
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
- <first-from-list list-name="productFeatureAppls" entry-name="productFeatureAppl"/>
+ <first-from-list list="productFeatureAppls" entry-name="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=730093&r1=730092&r2=730093&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:12:33 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-name="inventoryItems" entry-name="inventoryItem"/>
+ <first-from-list list="inventoryItems" entry-name="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"/>
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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -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-name="orderRoles" entry-name="orderRole"/>
+ <first-from-list list="orderRoles" entry-name="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/rental/RentalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml?rev=730093&r1=730092&r2=730093&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:12:33 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-name="productFixedAssets" entry-name="productFixedAsset"/>
+ <first-from-list list="productFixedAssets" entry-name="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/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730093&r1=730092&r2=730093&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:12:33 2008
@@ -459,7 +459,7 @@
<!-- didn't find anything? Take the first facility from list -->
<if-empty field="storeFound">
- <first-from-list list-name="productStoreFacilities" entry-name="storeFound"/>
+ <first-from-list list="productStoreFacilities" entry-name="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/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730093&r1=730092&r2=730093&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:12:33 2008
@@ -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-name="returnItemShipments" entry-name="returnItemShipment"/>
+ <first-from-list list="returnItemShipments" entry-name="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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -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-name="facilities" entry-name="destinationFacility"/>
+ <first-from-list list="facilities" entry-name="destinationFacility"/>
<set from-field="destinationFacility.facilityId" field="shipment.destinationFacilityId"/>
</if-compare>
</if-empty>
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=730093&r1=730092&r2=730093&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:12:33 2008
@@ -176,7 +176,7 @@
<condition-expr field-name="inventoryItemId" env-name="inventoryItemId"/>
<order-by field-name="datetimeReceived"/>
</entity-condition>
- <first-from-list list-name="shipmentReceipts" entry-name="shipmentReceipt"/>
+ <first-from-list list="shipmentReceipts" entry-name="shipmentReceipt"/>
<assert>
<not><if-empty field="inventoryItem"></if-empty></not>
<not><if-empty field="inventoryItemDetails"></if-empty></not>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=730093&r1=730092&r2=730093&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Dec 30 03:12:33 2008
@@ -93,7 +93,7 @@
<!-- sort by descending fromDate to get newest (biggest) first -->
<order-by field-name="-fromDate"/>
</entity-condition>
- <first-from-list list-name="uomConversions" entry-name="uomConversion"/>
+ <first-from-list list="uomConversions" entry-name="uomConversion"/>
<!-- if no conversion found with specified purpose, try w/o purpose -->
<if-empty field="uomConversion">
@@ -110,7 +110,7 @@
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
- <first-from-list list-name="uomConversions" entry-name="uomConversion"/>
+ <first-from-list list="uomConversions" entry-name="uomConversion"/>
</if-not-empty>
</if-empty>
</if-empty>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=730093&r1=730092&r2=730093&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Tue Dec 30 03:12:33 2008
@@ -154,19 +154,19 @@
<entity-and list="custRequests" entity-name="WorkEffortCustRequestView">
<field-map field-name="workEffortId" from-field="taskId"/>
</entity-and>
- <first-from-list list-name="custRequests" entry-name="custRequest"/>
+ <first-from-list list="custRequests" entry-name="custRequest"/>
<entity-and entity-name="PartyRelationship" list-name="accounts">
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
<field-map field-name="roleTypeIdTo" value="CONTACT"/>
<field-map field-name="partyIdTo" from-field="custRequest.fromPartyId"/>
</entity-and>
- <first-from-list list-name="accounts" entry-name="accountCustReq"/>
+ <first-from-list list="accounts" entry-name="accountCustReq"/>
<entity-and entity-name="PartyRelationship" list-name="accounts">
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
<field-map field-name="roleTypeIdTo" value="CONTACT"/>
<field-map field-name="partyIdTo" from-field="parameters.userLogin.partyId"/>
</entity-and>
- <first-from-list list-name="accounts" entry-name="accountLogin"/>
+ <first-from-list list="accounts" entry-name="accountLogin"/>
<if>
<condition>
<or>