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 13:07:17 UTC
svn commit: r730111 [3/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accountin...
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -106,7 +106,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderShipment" value-name="lookedUpValue"/>
+ <entity-one entity-name="OrderShipment" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -117,7 +117,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderShipment" value-name="lookedUpValue"/>
+ <entity-one entity-name="OrderShipment" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -140,7 +140,7 @@
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<!-- Include the facilityId corresponding to this order by looking up the ProductStore -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="true"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/>
<get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-name="productStore" use-cache="true"/>
<if-not-empty field="productStore.inventoryFacilityId">
<set from-field="productStore.inventoryFacilityId" field="inputMap.facilityId"/>
@@ -159,7 +159,7 @@
<simple-method method-name="getProductFacilityAndQuantities" short-description="finds ProductFacility and QOH, ATP inventory for an inventoryItem">
<!-- Get the ProductFacility for the minimum stock level -->
- <entity-one entity-name="ProductFacility" value-name="productFacility">
+ <entity-one entity-name="ProductFacility" value-field="productFacility">
<field-map from-field="inventoryItem.productId" field-name="productId"/>
<field-map from-field="inventoryItem.facilityId" field-name="facilityId"/>
</entity-one>
@@ -176,9 +176,9 @@
<simple-method method-name="getProductRequirementMethod" short-description="finds the requirement method for the product">
<if-not-empty field="parameters.orderId">
- <entity-one entity-name="OrderHeader" auto-field-map="true" value-name="order"/>
+ <entity-one entity-name="OrderHeader" auto-field-map="true" value-field="order"/>
</if-not-empty>
- <entity-one entity-name="Product" auto-field-map="true" value-name="product"/>
+ <entity-one entity-name="Product" auto-field-map="true" value-field="product"/>
<set from-field="product.requirementMethodEnumId" field="requirementMethodId"/>
<if-empty field="requirementMethodId">
<if>
@@ -191,7 +191,7 @@
</and>
</condition>
<then>
- <entity-one entity-name="ProductStore" value-name="productStore">
+ <entity-one entity-name="ProductStore" value-field="productStore">
<field-map from-field="order.productStoreId" field-name="productStoreId"/>
</entity-one>
<set from-field="productStore.requirementMethodEnumId" field="requirementMethodId"/>
@@ -224,12 +224,12 @@
<!-- If the service is triggered by the updateItemIssuance service, get the ItemIssuance by the passed itemIssuanceId -->
<if-not-empty field="parameters.itemIssuanceId">
- <entity-one entity-name="ItemIssuance" auto-field-map="true" value-name="itemIssuance"/>
- <entity-one entity-name="InventoryItem" value-name="inventoryItem">
+ <entity-one entity-name="ItemIssuance" auto-field-map="true" value-field="itemIssuance"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem">
<field-map from-field="itemIssuance.inventoryItemId" field-name="inventoryItemId"/>
</entity-one>
<else>
- <entity-one entity-name="InventoryItem" auto-field-map="true" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" auto-field-map="true" value-field="inventoryItem"/>
</else>
</if-not-empty>
@@ -276,7 +276,7 @@
<check-errors/>
<!-- assumes that inventoryItemId is one of the parameters and get the inventory item of the reservation -->
- <entity-one entity-name="InventoryItem" value-name="inventoryItem" auto-field-map="true"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="true"/>
<!-- find the requirement method for this product -->
<set from-field="inventoryItem.productId" field="parameters.productId"/>
@@ -323,7 +323,7 @@
<check-errors/>
<!-- assumes that inventoryItemId is one of the parameters and get the inventory item of the reservation -->
- <entity-one entity-name="InventoryItem" value-name="inventoryItem" auto-field-map="true"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="true"/>
<!-- find the requirement method for this product -->
<set from-field="inventoryItem.productId" field="parameters.productId"/>
@@ -471,7 +471,7 @@
<simple-method method-name="getNextOrderId" short-description="Get Next orderId">
<!-- try to find PartyAcctgPreference for parameters.partyId, see if we need any special order number sequencing -->
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference"/>
+ <entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference"/>
<log level="info" message="In getNextOrderId partyId is [${parameters.partyId}], partyAcctgPreference: ${partyAcctgPreference}"/>
<if>
@@ -509,7 +509,7 @@
</if>
<if-not-empty field="parameters.productStoreId">
- <entity-one entity-name="ProductStore" value-name="productStore"/>
+ <entity-one entity-name="ProductStore" value-field="productStore"/>
</if-not-empty>
<!-- use orderIdTemp along with the orderIdPrefix to create the real ID -->
@@ -543,7 +543,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader">
<add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
@@ -557,7 +557,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunAutoCreateOrderAdjustments"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderHeader" value-name="order" auto-field-map="true"/>
+ <entity-one entity-name="OrderHeader" value-field="order" auto-field-map="true"/>
<!-- all existing promo order items are cancelled -->
<get-related value-name="order" relation-name="OrderItem" list-name="orderItems"/>
<iterate list="orderItems" entry="orderItem">
@@ -763,7 +763,7 @@
</simple-method>
<simple-method method-name="getOrderItemShipGroupEstimatedShipDate" short-description="Compute and return the OrderItemShipGroup estimated ship date based on the associated items.">
- <entity-one entity-name="OrderItemShipGroup" value-name="orderItemShipGroup"/>
+ <entity-one entity-name="OrderItemShipGroup" value-field="orderItemShipGroup"/>
<if-compare field="orderItemShipGroup.maySplit" operator="equals" value="Y">
<set field="orderByList[]" value="+promisedDatetime"/>
<else>
@@ -790,7 +790,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveOrderContactMech"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderContactMech" value-name="lookedUpValue"/>
+ <entity-one entity-name="OrderContactMech" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -799,7 +799,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderNote"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderHeaderNote" value-name="orderHeaderNote"/>
+ <entity-one entity-name="OrderHeaderNote" value-field="orderHeaderNote"/>
<set-nonpk-fields value-field="orderHeaderNote" map="parameters"/>
<store-value value-name="orderHeaderNote"/>
</simple-method>
@@ -823,7 +823,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderTerm" value-name="lookedUpValue"/>
+ <entity-one entity-name="OrderTerm" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -833,7 +833,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="OrderTerm" value-name="lookedUpValue"/>
+ <entity-one entity-name="OrderTerm" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -845,7 +845,7 @@
<set field="inputMap.paymentMethodId" from-field="parameters.paymentMethodId"/>
<set field="inputMap.maxAmount" from-field="parameters.maxAmount"/>
<set field="inputMap.orderId" from-field="parameters.orderId"/>
- <entity-one entity-name="PaymentMethod" value-name="paymentMethod">
+ <entity-one entity-name="PaymentMethod" value-field="paymentMethod">
<field-map field-name="paymentMethodId" from-field="parameters.paymentMethodId"/>
</entity-one>
<set field="inputMap.paymentMethodTypeId" from-field="paymentMethod.paymentMethodTypeId"/>
@@ -857,7 +857,7 @@
</simple-method>
<simple-method method-name="getOrderStatus" short-description="Gets an order status" login-required="false">
- <entity-one entity-name="OrderHeader" value-name="order"/>
+ <entity-one entity-name="OrderHeader" value-field="order"/>
<if-empty field="order">
<add-error><fail-message message="Order not found [{parameters.orderId}]"/></add-error>
<check-errors/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 04:07:14 2008
@@ -27,7 +27,7 @@
<simple-method method-name="getNextQuoteId" short-description="Get Next quoteId">
<!-- try to find PartyAcctgPreference for parameters.partyId, see if we need any special quote number sequencing -->
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference"/>
+ <entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference"/>
<log level="info" message="In getNextQuoteId partyId is [${parameters.partyId}], partyAcctgPreference: ${partyAcctgPreference}"/>
<if>
@@ -92,7 +92,7 @@
</if-empty>
<!-- create a non existing ID; if we have a productStoreId do it for the payToPartyId of that ProductStore according to PartyAcctgPreferences, otherwise get from standard sequence -->
- <entity-one entity-name="ProductStore" value-name="productStore"/>
+ <entity-one entity-name="ProductStore" value-field="productStore"/>
<if-not-empty field="productStore.payToPartyId">
<set field="getNextQuoteIdContext.partyId" from-field="productStore.payToPartyId"/>
<call-service service-name="getNextQuoteId" in-map-name="getNextQuoteIdContext">
@@ -127,7 +127,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateQuote"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
+ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<check-errors/>
<if-empty field="parameters.statusId">
<set field="parameters.statusId" from-field="quote.statusId"/>
@@ -156,7 +156,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCopyQuote"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
+ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<check-errors/>
<set-service-fields service-name="createQuote" to-map-name="createQuoteInMap" map-name="quote"/>
<clear-field field="createQuoteInMap.statusId"/>
@@ -225,7 +225,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCheckUpdateQuoteStatus"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
+ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<check-errors/>
<set field="quote.statusId" value="QUO_ORDERED"/>
<store-value value-name="quote"/>
@@ -259,7 +259,7 @@
<fail-message message="Security Error: to run removeQuoteRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteRole" value-name="quoteRole" auto-field-map="true"/>
+ <entity-one entity-name="QuoteRole" value-field="quoteRole" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="quoteRole"/>
<check-errors/>
@@ -267,7 +267,7 @@
<!-- create a new QuoteItem -->
<simple-method method-name="createQuoteItem" short-description="Create a QuoteItem">
- <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
+ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<if>
<condition>
<and>
@@ -299,7 +299,7 @@
<!-- if there is no price and a productItem is supplied fill the price from the product record -->
<if-empty field="parameters.quoteUnitPrice">
<if-not-empty field="parameters.productId">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<if>
<condition>
<and>
@@ -348,7 +348,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateQuoteItem"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteItem" value-name="quoteItem" auto-field-map="true"/>
+ <entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteItem"/>
<store-value value-name="quoteItem"/>
@@ -361,7 +361,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuoteItem"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteItem" value-name="quoteItem" auto-field-map="true"/>
+ <entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<remove-related value-name="quoteItem" relation-name="QuoteAdjustment"/>
<check-errors/>
<remove-value value-name="quoteItem"/>
@@ -373,7 +373,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCopyQuoteItem"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteItem" value-name="quoteItem" auto-field-map="true"/>
+ <entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<check-errors/>
<set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="quoteItem"/>
@@ -426,7 +426,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateQuoteAttribute"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteAttribute" value-name="quoteAttribute" auto-field-map="true"/>
+ <entity-one entity-name="QuoteAttribute" value-field="quoteAttribute" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteAttribute"/>
<store-value value-name="quoteAttribute"/>
@@ -439,7 +439,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuoteAttribute"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteAttribute" value-name="quoteAttribute" auto-field-map="true"/>
+ <entity-one entity-name="QuoteAttribute" value-field="quoteAttribute" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="quoteAttribute"/>
<check-errors/>
@@ -465,7 +465,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateQuoteCoefficient"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteCoefficient" value-name="quoteCoefficient" auto-field-map="true"/>
+ <entity-one entity-name="QuoteCoefficient" value-field="quoteCoefficient" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteCoefficient"/>
<store-value value-name="quoteCoefficient"/>
@@ -478,7 +478,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuoteCoefficient"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteCoefficient" value-name="quoteCoefficient" auto-field-map="true"/>
+ <entity-one entity-name="QuoteCoefficient" value-field="quoteCoefficient" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="quoteCoefficient"/>
<check-errors/>
@@ -490,8 +490,8 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateQuoteAndQuoteItemForRequest"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="CustRequest" value-name="custRequest" auto-field-map="true"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem" auto-field-map="true"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest" auto-field-map="true"/>
+ <entity-one entity-name="CustRequestItem" value-field="custRequestItem" auto-field-map="true"/>
<if-empty field="custRequest">
<add-error>
@@ -544,7 +544,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunAutoUpdateQuotePrice"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteItem" value-name="quoteItem" auto-field-map="true"/>
+ <entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<check-errors/>
<if-not-empty field="parameters.manualQuoteUnitPrice">
<set from-field="parameters.manualQuoteUnitPrice" field="quoteItem.quoteUnitPrice"/>
@@ -571,7 +571,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunAutoCreateQuoteAdjustments"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
+ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<!-- all existing promo quote items are removed -->
<get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
@@ -673,7 +673,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuoteAdjustment"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteAdjustment" value-name="quoteAdjustment" auto-field-map="true"/>
+ <entity-one entity-name="QuoteAdjustment" value-field="quoteAdjustment" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="quoteAdjustment"/>
<check-errors/>
@@ -683,7 +683,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateQuoteAdjustment"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuoteAdjustment" value-name="quoteAdjustment" auto-field-map="true"/>
+ <entity-one entity-name="QuoteAdjustment" value-field="quoteAdjustment" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteAdjustment"/>
<store-value value-name="quoteAdjustment"/>
@@ -714,7 +714,7 @@
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
<result-to-field result-name="quoteId" field-name="quoteId"/>
</call-service>
- <entity-one entity-name="Quote" value-name="quote" auto-field-map="true"/>
+ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<!-- create, for every cart item, a quote item -->
<call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
@@ -794,7 +794,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateQuoteFromCustRequest"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="CustRequest" value-name="custRequest" auto-field-map="true"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest" auto-field-map="true"/>
<!-- error if request type not equals to RF_QUOTE or RF_PUR_QUOTE -->
<if>
<condition>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 04:07:14 2008
@@ -127,7 +127,7 @@
</if>
</simple-method>
<simple-method method-name="updateCustRequest" short-description="Update Customer Request">
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<field-to-result field-name="custRequest.statusId" result-name="oldStatusId"/>
<if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals">
<if-compare field="parameters.statusId" value="CRQ_CANCELLED" operator="equals">
@@ -135,7 +135,7 @@
<get-related value-name="custRequest" relation-name="CustRequestWorkEffort" list-name="workEfforts"/>
<if-not-empty field="workEfforts">
<iterate entry="workEffort" list="workEfforts">
- <entity-one entity-name="WorkEffort" value-name="lowInfo">
+ <entity-one entity-name="WorkEffort" value-field="lowInfo">
<field-map field-name="workEffortId" from-field="workEffort.workEffortId"/>
</entity-one>
<call-simple-method method-name="getHours" xml-resource="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml"/>
@@ -147,7 +147,7 @@
<set field="updTask.workEffortId" from-field="workEffort.workEffortId"/>
<set field="updTask.currentStatusId" value="PTS_CANCELLED"/>
<if-has-permission permission="MYPAGE_CUSTOMER">
- <entity-one entity-name="UserLogin" value-name="userLogin" auto-field-map="false">
+ <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="updTask.userLogin" from-field="userLogin"/>
@@ -237,12 +237,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateCustRequestParty" short-description="Update an existing CustRequestParty">
- <entity-one entity-name="CustRequestParty" value-name="lookedUpValue"/>
+ <entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteCustRequestParty" short-description="Delete Customer CustRequestParty">
- <entity-one entity-name="CustRequestParty" value-name="lookedUpValue"/>
+ <entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/>
<now-timestamp-to-env env-name="thruDate"/>
<set field="lookedUpValue.thruDate" from-field="thruDate"/>
<store-value value-name="lookedUpValue"/>
@@ -258,8 +258,8 @@
<field-to-result field-name="newEntity.noteId" result-name="noteId"/>
</simple-method>
<simple-method method-name="updateCustRequestNote" short-description="Update CustRequest Note">
- <entity-one entity-name="CustRequestNote" value-name="lookedUpValue"/>
- <entity-one entity-name="NoteData" value-name="lookedUpValueForNoteData"/>
+ <entity-one entity-name="CustRequestNote" value-field="lookedUpValue"/>
+ <entity-one entity-name="NoteData" value-field="lookedUpValueForNoteData"/>
<set-nonpk-fields value-field="lookedUpValueForNoteData" map="parameters"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
@@ -302,7 +302,7 @@
<result-to-field result-name="custRequestId" field-name="custRequestId"/>
</call-service>
<check-errors/>
- <entity-one entity-name="CustRequest" value-name="custRequest" auto-field-map="true"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest" auto-field-map="true"/>
<!-- create, for every cart item, a request item -->
<call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
@@ -334,7 +334,7 @@
</simple-method>
<simple-method method-name="createCustRequestFromShoppingList" short-description="Create a CustRequest from a Shopping List">
- <entity-one entity-name="ShoppingList" value-name="shoppingList" auto-field-map="true"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList" auto-field-map="true"/>
<call-service service-name="loadCartFromShoppingList" in-map-name="parameters">
<result-to-field result-name="shoppingCart" field-name="cart"/>
</call-service>
@@ -353,7 +353,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCopyCustRequestItem"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem" auto-field-map="true"/>
+ <entity-one entity-name="CustRequestItem" value-field="custRequestItem" auto-field-map="true"/>
<check-errors/>
<set-service-fields service-name="createCustRequestItem" to-map-name="createCustRequestItemInMap" map-name="custRequestItem"/>
@@ -400,10 +400,10 @@
</simple-method>
<simple-method method-name="setCustRequestStatus" short-description="change the customer request Status">
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<field-to-result field-name="custRequest.statusId" result-name="oldStatusId"/>
<if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals">
- <entity-one entity-name="StatusValidChange" value-name="statusChange">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange">
<field-map field-name="statusId" from-field="custRequest.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
@@ -420,7 +420,7 @@
</simple-method>
<simple-method method-name="createCustRequestFromCommEvent" short-description="Create a Customer request from a commEvent(email)">
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
<if-empty field="communicationEvent">
<add-error><fail-message message="Event Id: ${parameters.communicationEventId} not found"/></add-error>
<return response-code="error"/>
@@ -484,7 +484,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="deleteCustRequestContent" short-description="Remove a Customer Request Content">
- <entity-one entity-name="CustRequestContent" value-name="lookedUpValue"/>
+ <entity-one entity-name="CustRequestContent" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue.thruDate">
<now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -46,7 +46,7 @@
</simple-method>
<simple-method method-name="deleteRequirement" short-description="Delete a requirement">
- <entity-one entity-name="Requirement" value-name="requirement" auto-field-map="true"/>
+ <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/>
<check-errors/>
<remove-related value-name="requirement" relation-name="RequirementCustRequest"/>
<remove-value value-name="requirement"/>
@@ -66,7 +66,7 @@
</simple-method>
<simple-method method-name="autoAssignRequirementToSupplier" short-description="If the requirement is a product requirement (purchasing) try to assign it to the primary supplier">
- <entity-one entity-name="Requirement" value-name="requirement" auto-field-map="true"/>
+ <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/>
<check-errors/>
<if-compare field="requirement.requirementTypeId" operator="equals" value="PRODUCT_REQUIREMENT">
<if-not-empty field="requirement.productId">
@@ -123,7 +123,7 @@
<fail-message message="Security Error: to run updateRequirementRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="RequirementRole" value-name="requirementRole" auto-field-map="true"/>
+ <entity-one entity-name="RequirementRole" value-field="requirementRole" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="requirementRole"/>
<store-value value-name="requirementRole"/>
@@ -136,7 +136,7 @@
<fail-message message="Security Error: to run removeRequirementRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="RequirementRole" value-name="requirementRole" auto-field-map="true"/>
+ <entity-one entity-name="RequirementRole" value-field="requirementRole" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="requirementRole"/>
<check-errors/>
@@ -147,7 +147,7 @@
<fail-message message="Security Error: to run createTransferFromRequirement you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="Requirement" value-name="requirement" auto-field-map="true"/>
+ <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/>
<check-errors/>
<set field="inputMap.productId" from-field="requirement.productId"/>
<set field="inputMap.facilityId" from-field="parameters.fromFacilityId"/>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -70,7 +70,7 @@
</simple-method>
<simple-method method-name="updateShoppingList" short-description="Update a ShoppingList">
- <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
<set field="parentMethodName" value="updateShoppingList"/>
<set field="permissionAction" value="UPDATE"/>
@@ -101,7 +101,7 @@
</simple-method>
<simple-method method-name="removeShoppingList" short-description="Remove a ShoppingList">
- <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
<set field="parentMethodName" value="removeShoppingList"/>
<set field="permissionAction" value="DELETE"/>
@@ -117,8 +117,8 @@
<call-simple-method method-name="checkShoppingListItemSecurity"/>
<check-errors/>
- <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
+ <entity-one entity-name="Product" value-field="product"/>
<if-empty field="product">
<add-error> <fail-property property="ProductErrorProductNotFound" resource="ProductUiLabels"/> </add-error>
<check-errors/>
@@ -144,8 +144,8 @@
<call-simple-method method-name="checkShoppingListItemSecurity"/>
<check-errors/>
- <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
- <entity-one entity-name="ShoppingListItem" value-name="shoppingListItem"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
+ <entity-one entity-name="ShoppingListItem" value-field="shoppingListItem"/>
<if-compare field="parameters.quantity" operator="equals" value="0" type="Double">
<!-- if we're setting quantity to 0.0 then remove the item -->
@@ -170,8 +170,8 @@
<call-simple-method method-name="checkShoppingListItemSecurity"/>
<check-errors/>
- <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
- <entity-one entity-name="ShoppingListItem" value-name="shoppingListItem"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
+ <entity-one entity-name="ShoppingListItem" value-field="shoppingListItem"/>
<remove-value value-name="shoppingListItem"/>
<if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals">
@@ -217,7 +217,7 @@
<set field="totalPrice" type="Double" value="0.0"/>
<iterate entry="shoppingListItem" list="shoppingListItems">
- <entity-one entity-name="Product" value-name="product" use-cache="true" auto-field-map="false">
+ <entity-one entity-name="Product" value-field="product" use-cache="true" auto-field-map="false">
<field-map field-name="productId" from-field="shoppingListItem.productId"/>
</entity-one>
@@ -271,7 +271,7 @@
</if>
</simple-method>
<simple-method method-name="checkShoppingListItemSecurity" short-description="Checks security on a ShoppingListItem">
- <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
<if>
<condition>
<and>
@@ -286,10 +286,10 @@
</simple-method>
<simple-method method-name="addSuggestionsToShoppingList" short-description="Add suggestions to a shopping list">
<!-- first check the ProductStore.enableAutoSuggestionList indicator -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader.productStoreId"><return/></if-empty>
- <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
+ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<if-compare field="productStore.enableAutoSuggestionList" operator="not-equals" value="Y"><return/></if-compare>
@@ -340,7 +340,7 @@
<set field="shoppingListParameters.quantity" value="1" type="Double" />
<call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" />
</iterate>
- <entity-one entity-name="Product" value-name="product" auto-field-map="false" >
+ <entity-one entity-name="Product" value-field="product" auto-field-map="false" >
<field-map field-name="productId" from-field="orderItem.productId" />
</entity-one>
<if-compare field="product.isVariant" operator="equals" value="Y">
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -130,7 +130,7 @@
<simple-method method-name="updateCommunicationEvent"
short-description="Update a CommunicationEvent">
- <entity-one entity-name="CommunicationEvent" value-name="event" />
+ <entity-one entity-name="CommunicationEvent" value-field="event" />
<set field="oldStatusId" from-field="event.statusId" />
<set-nonpk-fields map="parameters" value-field="event" />
<if-compare-field operator="not-equals" field="event.statusId"
@@ -142,7 +142,7 @@
<if-not-empty field="parameters.partyIdFrom">
<if-compare operator="not-equals" value="parameters.partIdFrom" field="event.partyIdFrom">
<!-- check if role exist then delete old role -->
- <entity-one entity-name="CommunicationEventRole" value-name="roleFrom">
+ <entity-one entity-name="CommunicationEventRole" value-field="roleFrom">
<field-map field-name="communicationEventId" from-field="event.communicationEventId" />
<field-map field-name="partyId" from-field="parameters.partyIdFrom" />
<field-map field-name="roleTypeId" value="ORIGINATOR" />
@@ -174,7 +174,7 @@
<if-compare operator="not-equals" value="parameters.partIdTo"
field="event.partyIdTo">
<!-- check if role exist then delete old role -->
- <entity-one entity-name="CommunicationEventRole" value-name="roleTo">
+ <entity-one entity-name="CommunicationEventRole" value-field="roleTo">
<field-map field-name="communicationEventId" from-field="event.communicationEventId" />
<field-map field-name="partyId" from-field="event.partyIdTo" />
<field-map field-name="roleTypeId" value="ADDRESSEE" />
@@ -195,7 +195,7 @@
</simple-method>
<simple-method method-name="deleteCommunicationEvent" short-description="Delete a CommunicationEvent">
- <entity-one entity-name="CommunicationEvent" value-name="event"/>
+ <entity-one entity-name="CommunicationEvent" value-field="event"/>
<!-- remove related links to content -->
<get-related value-name="event" relation-name="CommEventContentAssoc" list-name="contentAssocs"/>
<if-not-empty field="contentAssocs">
@@ -232,7 +232,7 @@
</simple-method>
<simple-method method-name="deleteCommunicationEventWorkEffort" short-description="delete commEvent and workEffort">
- <entity-one entity-name="CommunicationEvent" value-name="event"/>
+ <entity-one entity-name="CommunicationEvent" value-field="event"/>
<!-- remove related workeffort when this is the only communicationevent connected to it -->
<get-related value-name="event" relation-name="CommunicationEventWorkEff" list-name="workEffortComs"/>
<if-not-empty field="workEffortComs">
@@ -263,15 +263,15 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="removeCommunicationEventPurpose" short-description="Remove a CommunicationEventPurpose">
- <entity-one entity-name="CommunicationEventPurpose" value-name="eventPurpose"/>
+ <entity-one entity-name="CommunicationEventPurpose" value-field="eventPurpose"/>
<remove-value value-name="eventPurpose"/>
</simple-method>
<simple-method method-name="createCommunicationEventRole"
short-description="Create a CommunicationEventRole">
<!-- check if role already exist, then ignore -->
- <entity-one entity-name="CommunicationEventRole" value-name="communicationEventRole" />
+ <entity-one entity-name="CommunicationEventRole" value-field="communicationEventRole" />
<if-empty field="communicationEventRole">
- <entity-one entity-name="UserLogin" value-name="sysUserLogin">
+ <entity-one entity-name="UserLogin" value-field="sysUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set-service-fields service-name="createPartyRole" map-name="parameters" to-map-name="partyRole"/>
@@ -288,14 +288,14 @@
</if-empty>
</simple-method>
<simple-method method-name="updateCommunicationEventRole" short-description="Create a CommunicationEventRole">
- <entity-one value-name="eventRole" entity-name="CommunicationEventRole" />
+ <entity-one value-field="eventRole" entity-name="CommunicationEventRole" />
<if-not-empty field="eventRole">
<set-nonpk-fields map="parameters" value-field="eventRole" />
<store-value value-name="eventRole" />
</if-not-empty>
</simple-method>
<simple-method method-name="removeCommunicationEventRole" short-description="Remove a CommunicationEventRole">
- <entity-one entity-name="CommunicationEventRole" value-name="eventRole"/>
+ <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
<if-not-empty field="eventRole">
<remove-value value-name="eventRole"/>
<if-compare field="parameters.deleteCommEventIfLast" operator="equals" value="Y">
@@ -314,7 +314,7 @@
<if-empty field="parameters.communicationEventId">
<set from-field="parameters.messageId" field="parameters.communicationEventId"/>
</if-empty>
- <entity-one entity-name="CommunicationEvent" value-name="event"/>
+ <entity-one entity-name="CommunicationEvent" value-field="event"/>
<if>
<condition>
@@ -364,7 +364,7 @@
<simple-method method-name="allocateMsgToParty" short-description="Allocate an emailaddress to an existing/new party, update the communication event accordingly">
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
<if-empty field="communicationEvent">
<add-error><fail-message message="Communication Event ID: ${parameters.commnicationEventId} not found"/></add-error>
</if-empty>
@@ -396,7 +396,7 @@
<!-- allocate email to the party -->
<if-not-empty field="parameters.emailAddress">
- <entity-one entity-name="Party" value-name="party" />
+ <entity-one entity-name="Party" value-field="party" />
<if-empty field="party">
<add-error>
<fail-message message="Party ID: ${parameters.partyId} not found" />
@@ -419,7 +419,7 @@
<call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
<field-to-request field-name="parameters.communicationEventId" request-name="communicationEventId"/>
- <entity-one entity-name="PartyNameView" value-name="nameView"/>
+ <entity-one entity-name="PartyNameView" value-field="nameView"/>
<set field="_event_message_" value="Email addres: ${parameters.emailAddress} allocated to party: ${nameView.groupName}${nameView.firstName} ${nameView.middleName} ${nameView.lastName}[${parameters.partyId}]"/>
</simple-method>
@@ -430,10 +430,10 @@
</simple-method>
<simple-method method-name="setCommunicationEventStatus" short-description="Set The Communication Event Status">
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
<field-to-result field-name="communicationEvent.statusId" result-name="oldStatusId"/>
<if-compare-field field="communicationEvent.statusId" to-field="parameters.statusId" operator="not-equals">
- <entity-one entity-name="StatusValidChange" value-name="statusChange">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange">
<field-map field-name="statusId" from-field="communicationEvent.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
@@ -457,10 +457,10 @@
</if-compare-field>
</simple-method>
<simple-method method-name="setCommunicationEventRoleStatus" short-description="Set The Communication Event Status for a specific role">
- <entity-one entity-name="CommunicationEventRole" value-name="communicationEventRole"/>
+ <entity-one entity-name="CommunicationEventRole" value-field="communicationEventRole"/>
<field-to-result field-name="communicationEventRole.statusId" result-name="oldStatusId"/>
<if-compare-field field="communicationEventRole.statusId" to-field="parameters.statusId" operator="not-equals">
- <entity-one entity-name="StatusValidChange" value-name="statusChange">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange">
<field-map field-name="statusId" from-field="communicationEventRole.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -255,12 +255,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateContactMechAttribute" short-description="updateContactMechAttribute">
- <entity-one entity-name="ContactMechAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="ContactMechAttribute" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContactMechAttribute" short-description="removeContactMechAttribute">
- <entity-one entity-name="ContactMechAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="ContactMechAttribute" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -32,7 +32,7 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
<iterate entry="partyAndContactMech" list="partyAndContactMechs">
- <entity-one entity-name="ContactMechType" value-name="contactMechType">
+ <entity-one entity-name="ContactMechType" value-field="contactMechType">
<field-map field-name="contactMechTypeId" from-field="partyAndContactMech.contactMechTypeId"/>
</entity-one>
<if>
@@ -377,7 +377,7 @@
</simple-method>
<simple-method method-name="updatePostalAddressAndPurposes" short-description="Update postal address, purposes and set them defaults" login-required="false">
- <entity-one entity-name="PartyProfileDefault" value-name="partyProfileDefault">
+ <entity-one entity-name="PartyProfileDefault" value-field="partyProfileDefault">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
</entity-one>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 04:07:14 2008
@@ -27,7 +27,7 @@
<sequenced-id-to-env sequence-name="PartyInvitation" env-name="newEntity.partyInvitationId"/>
<field-to-result field-name="newEntity.partyInvitationId" result-name="partyInvitationId"/>
<if-not-empty field="parameters.partyId">
- <entity-one entity-name="Person" value-name="person" auto-field-map="false">
+ <entity-one entity-name="Person" value-field="person" auto-field-map="false">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-one>
<set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/>
@@ -38,9 +38,9 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updatePartyInvitation" short-description="Update a PartyInvitation">
- <entity-one entity-name="PartyInvitation" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyInvitation" value-field="lookedUpValue"/>
<if-not-empty field="parameters.partyId">
- <entity-one entity-name="Person" value-name="person" auto-field-map="false">
+ <entity-one entity-name="Person" value-field="person" auto-field-map="false">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-one>
<set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/>
@@ -49,7 +49,7 @@
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyInvitation" short-description="Remove a PartyInvitation">
- <entity-one entity-name="PartyInvitation" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyInvitation" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createPartyInvitationGroupAssoc" short-description="Create a PartyInvitationGroupAssoc">
@@ -58,7 +58,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="deletePartyInvitationGroupAssoc" short-description="Remove a PartyInvitationGroupAssoc">
- <entity-one entity-name="PartyInvitationGroupAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyInvitationGroupAssoc" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createPartyInvitationRoleAssoc" short-description="Create a PartyInvitationRoleAssoc">
@@ -67,7 +67,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="deletePartyInvitationRoleAssoc" short-description="Remove a PartyInvitationRoleAssoc">
- <entity-one entity-name="PartyInvitationRoleAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyInvitationRoleAssoc" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="acceptPartyInvitation" short-description="Accept Party Invitation">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml Tue Dec 30 04:07:14 2008
@@ -142,7 +142,7 @@
<field-to-result field-name="hasPermission"/>
</if-has-permission>
<if-compare field="hasPermission" operator="not-equals" value="true">
- <entity-one entity-name="PartyInvitation" value-name="partyInvitation"/>
+ <entity-one entity-name="PartyInvitation" value-field="partyInvitation"/>
<if-empty field="partyInvitation.partyId">
<if-empty field="partyInvitation.emailAddress">
<add-error>
@@ -188,7 +188,7 @@
<field-to-result field-name="hasPermission"/>
</if-has-permission>
<if-compare field="hasPermission" operator="not-equals" value="true">
- <entity-one entity-name="PartyInvitation" value-name="partyInvitation"/>
+ <entity-one entity-name="PartyInvitation" value-field="partyInvitation"/>
<if-not-empty field="partyInvitation.partyIdFrom">
<if-compare-field field="partyInvitation.partyIdFrom" to-field="userLogin.partyId" operator="equals">
<set field="hasPermission" type="Boolean" value="true"/>
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=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createPartyRole" short-description="Create Party Role">
- <entity-one entity-name="PartyRole" value-name="partyRole"/>
+ <entity-one entity-name="PartyRole" value-field="partyRole"/>
<if-empty field="partyRole">
<make-value entity-name="PartyRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -30,7 +30,7 @@
</if-empty>
</simple-method>
<simple-method method-name="deletePartyRole" short-description="Delete a PartyRole">
- <entity-one entity-name="PartyRole" value-name="partyRole"/>
+ <entity-one entity-name="PartyRole" value-field="partyRole"/>
<remove-value value-name="partyRole"/>
</simple-method>
@@ -48,7 +48,7 @@
<if>
<condition><not><if-empty field="parameters.groupName"/></not></condition>
<then>
- <entity-one entity-name="PartyGroup" value-name="partyGroup"/>
+ <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
<if>
<condition><if-compare-field field="partyGroup.groupName" to-field="parameters.groupName" operator="not-equals"/></condition>
<then>
@@ -68,7 +68,7 @@
</or>
</condition>
<then>
- <entity-one entity-name="Person" value-name="person"/>
+ <entity-one entity-name="Person" value-field="person"/>
<if>
<condition>
<or>
@@ -94,8 +94,8 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
<order-by field-name="-changeDate"/>
</entity-and>
- <entity-one entity-name="Person" value-name="person"/>
- <entity-one entity-name="PartyGroup" value-name="partyGroup"/>
+ <entity-one entity-name="Person" value-field="person"/>
+ <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
<if-empty field="parameters.compareDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="parameters.compareDate" from-field="nowTimestamp"/>
@@ -179,7 +179,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="deletePostalAddressBoundary" short-description="Delete a Postal Address Boundary">
- <entity-one entity-name="PostalAddressBoundary" value-name="postalAddressBoundary"/>
+ <entity-one entity-name="PostalAddressBoundary" value-field="postalAddressBoundary"/>
<remove-value value-name="postalAddressBoundary"/>
</simple-method>
<simple-method method-name="getPostalAddressBoundary" short-description="Get Postal Address Boundary">
@@ -202,12 +202,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updatePartyClassification" short-description="update a PartyClassification">
- <entity-one entity-name="PartyClassification" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyClassification" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyClassification" short-description="delete a PartyClassification">
- <entity-one entity-name="PartyClassification" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyClassification" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- PartyClassificationGroup methods -->
@@ -221,12 +221,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updatePartyClassificationGroup" short-description="update a PartyClassificationGroup">
- <entity-one entity-name="PartyClassificationGroup" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyClassificationGroup" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyClassificationGroup" short-description="delete a PartyClassificationGroup">
- <entity-one entity-name="PartyClassificationGroup" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyClassificationGroup" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -238,12 +238,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateVendor" short-description="updateVendor">
- <entity-one entity-name="Vendor" value-name="lookedUpValue"/>
+ <entity-one entity-name="Vendor" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteVendor" short-description="deleteVendor">
- <entity-one entity-name="Vendor" value-name="lookedUpValue"/>
+ <entity-one entity-name="Vendor" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -255,12 +255,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updatePartyAttribute" short-description="updatePartyAttribute">
- <entity-one entity-name="PartyAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removePartyAttribute" short-description="removePartyAttribute">
- <entity-one entity-name="PartyAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -271,7 +271,7 @@
</if-empty>
<!-- lookup existing value -->
- <entity-one entity-name="PartyProfileDefault" value-name="partyProfileDefault"/>
+ <entity-one entity-name="PartyProfileDefault" value-field="partyProfileDefault"/>
<if-empty field="partyProfileDefault">
<make-value value-field="partyProfileDefault" entity-name="PartyProfileDefault"/>
<set-pk-fields value-field="partyProfileDefault" map="parameters"/>
@@ -784,7 +784,7 @@
<if-empty field="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
<if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
- <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyRelationship" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -792,7 +792,7 @@
<if-empty field="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
<if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
- <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyRelationship" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -808,7 +808,7 @@
</simple-method>
<simple-method method-name="updatePartyCarrierAccount" short-description="Update a PartyCarrierAccount">
- <entity-one entity-name="PartyCarrierAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyCarrierAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -827,7 +827,7 @@
</entity-and>
<first-from-list entry="webSite" list="webSites"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
- <entity-one entity-name="Person" value-name="person"/>
+ <entity-one entity-name="Person" value-field="person"/>
<set field="bodyParameters.person" from-field="person"/>
<set field="emailParams.bodyParameters" from-field="bodyParameters"/>
@@ -871,10 +871,10 @@
</condition-list>
</entity-condition>
<first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
- <entity-one entity-name="PartyAndPerson" value-name="partyAndPerson"/>
+ <entity-one entity-name="PartyAndPerson" value-field="partyAndPerson"/>
<set field="bodyParameters.partyAndPerson" from-field="partyAndPerson"/>
<set field="contactMechId" from-field="partyContactDetailByPurpose.contactMechId"/>
- <entity-one entity-name="ContactMech" value-name="contactMech"/>
+ <entity-one entity-name="ContactMech" value-field="contactMech"/>
<set field="emailParams.sendTo" from-field="contactMech.infoString"/>
<set field="emailParams.subject" from-field="storeEmail.subject"/>
<set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/>
@@ -976,7 +976,7 @@
<log level="info" message="Email Contact updated emailContactMechId is ${contactMechId}"></log>
</else>
</if-empty>
- <entity-one entity-name="ContactMech" value-name="contactMech"/>
+ <entity-one entity-name="ContactMech" value-field="contactMech"/>
<field-to-result field-name="contactMech.infoString" result-name="emailAddress"/>
<field-to-result field-name="contactMechId"/>
</simple-method>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -94,7 +94,7 @@
<set field="serviceCtx.partyId" from-field="partyId"/>
<set field="serviceCtx.emailAddress" from-field="partyAndContactMech.infoString"/>
<set field="serviceCtx.contactMechId" from-field="partyAndContactMech.contactMechId"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -103,7 +103,7 @@
<result-to-field result-name="contactMechId"/>
</call-service>
<log level="info" message="====== contactMechId [${contactMechId}] ======"/>
- <entity-one entity-name="ContactMech" value-name="contactMech"/>
+ <entity-one entity-name="ContactMech" value-field="contactMech"/>
<assert>
<not><if-empty field="contactMech"/></not>
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
@@ -118,7 +118,7 @@
<result-to-field result-name="contactMechId" field-name="newContactMechId"/>
</call-service>
<log level="info" message="====== New contactMechId [${newContactMechId}] for email address is created for party [${partyId}] ======"/>
- <entity-one entity-name="ContactMech" value-name="contactMech">
+ <entity-one entity-name="ContactMech" value-field="contactMech">
<field-map field-name="contactMechId" from-field="newContactMechId"/>
</entity-one>
<assert>
@@ -151,7 +151,7 @@
<set-service-fields service-name="updatePartyTelecomNumber" map-name="telecomNumber" to-map-name="serviceCtx"/>
<set field="serviceCtx.partyId" from-field="partyId"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -160,7 +160,7 @@
<result-to-field result-name="contactMechId"/>
</call-service>
<log level="info" message="====== contactMechId [${contactMechId}] ======"/>
- <entity-one entity-name="ContactMech" value-name="contactMech"/>
+ <entity-one entity-name="ContactMech" value-field="contactMech"/>
<assert>
<not><if-empty field="contactMech"/></not>
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
@@ -183,7 +183,7 @@
<result-to-field result-name="contactMechId" field-name="newContactMechId"/>
</call-service>
<log level="info" message="====== New contactMechId [${newContactMechId}] for TelecomNumber is created for party [${partyId}] ======"/>
- <entity-one entity-name="ContactMech" value-name="contactMech">
+ <entity-one entity-name="ContactMech" value-field="contactMech">
<field-map field-name="contactMechId" from-field="newContactMechId"/>
</entity-one>
<assert>
@@ -220,7 +220,7 @@
<set-service-fields service-name="updatePartyPostalAddress" map-name="postalAddress" to-map-name="serviceCtx"/>
<set field="serviceCtx.partyId" from-field="partyId"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -229,7 +229,7 @@
<result-to-field result-name="contactMechId"/>
</call-service>
<log level="info" message="====== contactMechId [${contactMechId}] ======"/>
- <entity-one entity-name="ContactMech" value-name="contactMech"/>
+ <entity-one entity-name="ContactMech" value-field="contactMech"/>
<assert>
<not><if-empty field="contactMech"/></not>
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
@@ -254,7 +254,7 @@
<result-to-field result-name="contactMechId" field-name="newContactMechId"/>
</call-service>
<log level="info" message="====== New contactMechId [${newContactMechId}] for PostalAddress is created for party [${partyId}] ======"/>
- <entity-one entity-name="ContactMech" value-name="contactMech">
+ <entity-one entity-name="ContactMech" value-field="contactMech">
<field-map field-name="contactMechId" from-field="newContactMechId"/>
</entity-one>
<assert>
@@ -290,7 +290,7 @@
<!-- first try with just updating without changing the credit card information -->
<set-service-fields service-name="updateCreditCard" map-name="paymentMethodAndCreditCard" to-map-name="serviceCtx"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -301,7 +301,7 @@
</call-service>
<log level="info" message="====== paymentMethodId [${paymentMethodId}] ======"/>
<clear-field field="paymentMethodAndCreditCard"/>
- <entity-one entity-name="PaymentMethodAndCreditCard" value-name="paymentMethodAndCreditCard"/>
+ <entity-one entity-name="PaymentMethodAndCreditCard" value-field="paymentMethodAndCreditCard"/>
<assert>
<not><if-empty field="paymentMethodAndCreditCard"/></not>
<if-compare-field field="paymentMethodId" to-field="oldPaymentMethodId" operator="equals"/>
@@ -322,7 +322,7 @@
<result-to-field result-name="oldPaymentMethodId"/>
</call-service>
<log level="info" message="====== New paymentMethodId [${paymentMethodId}] created for party [${serviceCtx.partyId}] ======"/>
- <entity-one entity-name="PaymentMethodAndCreditCard" value-name="paymentMethodAndCreditCard"/>
+ <entity-one entity-name="PaymentMethodAndCreditCard" value-field="paymentMethodAndCreditCard"/>
<assert>
<not><if-empty field="paymentMethodAndCreditCard"/></not>
<if-compare-field field="paymentMethodId" to-field="oldPaymentMethodId" operator="not-equals"/>
@@ -356,7 +356,7 @@
<set field="serviceCtx.newPassword" value="ofbiz-demo"/>
<set field="serviceCtx.newPasswordVerify" value="ofbiz-demo"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -365,7 +365,7 @@
<result-to-field result-name="updatedUserLogin"/>
</call-service>
- <entity-one entity-name="PartyAndUserLogin" value-name="partyAndUserLogin">
+ <entity-one entity-name="PartyAndUserLogin" value-field="partyAndUserLogin">
<field-map field-name="userLoginId" from-field="partyUserLogin.userLoginId"/>
<field-map field-name="partyId" from-field="partyId"/>
</entity-one>
@@ -386,7 +386,7 @@
<log level="info" message="====================Add a new role to a party test case=========================================="/>
<set field="addRoleMap.partyId" value="DemoCustomer"/>
<set field="addRoleMap.roleTypeId" value="SUPPLIER"/>
- <entity-one entity-name="UserLogin" value-name="addRoleMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="addRoleMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createPartyRole" in-map-name="addRoleMap"/>
@@ -398,14 +398,14 @@
<set field="createNewCommEventMap.statusId" value="COM_COMPLETE"/>
<set field="createNewCommEventMap.partyIdFrom" value="DemoCustomer"/>
<set field="createNewCommEventMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
- <entity-one entity-name="UserLogin" value-name="createNewCommEventMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="createNewCommEventMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createCommunicationEvent" in-map-name="createNewCommEventMap">
<result-to-field result-name="communicationEventId" field-name="communicationEventId" map-name="commEventMap"/>
</call-service>
<call-simple-method method-name="testUpdateCommEvent"/>
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent">
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent">
<field-map field-name="communicationEventId" from-field="commEventMap.communicationEventId"/>
</entity-one>
<assert>
@@ -425,7 +425,7 @@
<set field="updateCommEventMap.statusId" value="COM_ENTERED"/>
<set field="updateCommEventMap.partyIdFrom" value="admin"/>
<set field="updateCommEventMap.contactMechTypeId" value="ELECTRONIC_ADDRESS"/>
- <entity-one entity-name="UserLogin" value-name="updateCommEventMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="updateCommEventMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="updateCommunicationEvent" in-map-name="updateCommEventMap"/>
@@ -437,14 +437,14 @@
<set field="createNewRequestMap.statusId" value="CRQ_SUBMITTED"/>
<set field="createNewRequestMap.priority" value="1L" type="Long"/>
<set field="createNewRequestMap.fromPartyId" value="DemoCustomer"/>
- <entity-one entity-name="UserLogin" value-name="createNewRequestMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="createNewRequestMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createCustRequest" in-map-name="createNewRequestMap">
<result-to-field result-name="custRequestId" field-name="custRequestId" map-name="requestMap"/>
</call-service>
<call-simple-method method-name="testUpdateRequest"/>
- <entity-one entity-name="CustRequest" value-name="custRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequest">
<field-map field-name="custRequestId" from-field="requestMap.custRequestId"/>
</entity-one>
<assert>
@@ -464,7 +464,7 @@
<set field="updateRequestMap.statusId" value="CRQ_COMPLETED"/>
<set field="updateRequestMap.priority" value="2L" type="Long"/>
<set field="updateRequestMap.fromPartyId" value="admin"/>
- <entity-one entity-name="UserLogin" value-name="updateRequestMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="updateRequestMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="updateCustRequest" in-map-name="updateRequestMap"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Tue Dec 30 04:07:14 2008
@@ -30,7 +30,7 @@
<set field="facilityParty.partyId" from-field="oldFacilityRole.partyId"/>
<set field="facilityParty.roleTypeId" from-field="oldFacilityRole.roleTypeId"/>
<set field="facilityParty.fromDate" from-field="fromDate"/>
- <entity-one entity-name="PartyRole" value-name="partyRole" auto-field-map="false">
+ <entity-one entity-name="PartyRole" value-field="partyRole" auto-field-map="false">
<field-map field-name="partyId" from-field="facilityParty.partyId"/>
<field-map field-name="roleTypeId" from-field="facilityParty.roleTypeId"/>
</entity-one>
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -37,18 +37,18 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProdCatalog" short-description="Update an ProdCatalog">
- <entity-one entity-name="ProdCatalog" value-name="prodCatalog"/>
+ <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
<set-nonpk-fields map="parameters" value-field="prodCatalog"/>
<store-value value-name="prodCatalog"/>
</simple-method>
<simple-method method-name="deleteProdCatalog" short-description="Delete an ProdCatalog">
- <entity-one entity-name="ProdCatalog" value-name="prodCatalog"/>
+ <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
<remove-value value-name="prodCatalog"/>
</simple-method>
<simple-method method-name="addProductCategoryToProdCatalog" short-description="Add Category To ProdCatalog">
<!-- Check that the ProductCategory exists -->
- <entity-one entity-name="ProductCategory" value-name="productCategory"/>
+ <entity-one entity-name="ProductCategory" value-field="productCategory"/>
<if-empty field="productCategory">
<add-error><fail-property resource="ProductUiLabels" property="ProductCategoryNotFoundForCategoryID"/></add-error>
</if-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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -81,7 +81,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductCategory" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductCategory" value-field="lookedUpValue"/>
<!-- save this value before overwriting it so we can compare it later -->
<!-- <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-map-name="saveIdMap"/> -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -200,7 +200,7 @@
-->
<!-- If the associated category was the primary category for the product, clear that field -->
- <entity-one entity-name="Product" value-name="product" auto-field-map="true"/>
+ <entity-one entity-name="Product" value-field="product" auto-field-map="true"/>
<if-compare-field field="product.primaryProductCategoryId" to-field="parameters.productCategoryId" operator="equals">
<clear-field field="product.primaryProductCategoryId"/>
<store-value value-name="product"/>
@@ -545,7 +545,7 @@
<!-- set isVirtual based on hasSelectableFeatures -->
<if-compare field="hasSelectableFeatures" operator="equals" value="Y">
- <entity-one entity-name="Product" value-name="newProduct"/>
+ <entity-one entity-name="Product" value-field="newProduct"/>
<set field="newProduct.isVirtual" value="Y"/>
<store-value value-name="newProduct"/>
</if-compare>
@@ -560,7 +560,7 @@
<check-errors/>
<!-- look up the old product category and clone it -->
- <entity-one entity-name="ProductCategory" value-name="oldCategory">
+ <entity-one entity-name="ProductCategory" value-field="oldCategory">
<field-map field-name="productCategoryId" from-field="parameters.oldProductCategoryId"/>
</entity-one>
<clone-value value-name="oldCategory" new-value-name="newCategory"/>
@@ -686,13 +686,13 @@
</simple-method>
<simple-method method-name="updateProductCategoryLink" short-description="update a ProductCategoryLink">
- <entity-one entity-name="ProductCategoryLink" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductCategoryLink" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductCategoryLink" short-description="delete a ProductCategoryLink">
- <entity-one entity-name="ProductCategoryLink" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductCategoryLink" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -804,7 +804,7 @@
</entity-condition>
<iterate entry="prodCatalogCategory" list="prodCatalogCategoryList">
<!-- Do not do a permission check unless the ProdCatalog requires it -->
- <entity-one entity-name="ProdCatalog" value-name="prodCatalog" auto-field-map="false">
+ <entity-one entity-name="ProdCatalog" value-field="prodCatalog" auto-field-map="false">
<field-map field-name="prodCatalogId" from-field="prodCatalogCategory.prodCatalogId"/>
</entity-one>
<if>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml Tue Dec 30 04:07:14 2008
@@ -35,7 +35,7 @@
<fail-property resource="PartyUiLabels" property="ProductRemoveCommunicationEventProductPermissionError"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="CommunicationEventProduct" value-name="eventProduct"/>
+ <entity-one entity-name="CommunicationEventProduct" value-field="eventProduct"/>
<remove-value value-name="eventProduct"/>
</simple-method>
</simple-methods>