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 18:12:17 UTC
svn commit: r730183 [3/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accoun...
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -72,8 +72,8 @@
</entity-condition>
<!-- first set the required OUT fields to zero -->
- <calculate field-name="plainDoubleZero" type="Double"><number value="0.0"/></calculate>
- <calculate field-name="plainLongZero" type="Long"><number value="0"/></calculate>
+ <calculate field="plainDoubleZero" type="Double"><number value="0.0"/></calculate>
+ <calculate field="plainLongZero" type="Long"><number value="0"/></calculate>
<field-to-result field="plainDoubleZero" result-name="totalGrandAmount"/>
<field-to-result field="plainDoubleZero" result-name="totalSubRemainingAmount"/>
<field-to-result field="plainLongZero" result-name="totalOrders"/>
@@ -141,13 +141,13 @@
<!-- Include the facilityId corresponding to this order by looking up the ProductStore -->
<entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/>
- <get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-field="productStore" use-cache="true"/>
+ <get-related-one value-field="orderHeader" relation-name="ProductStore" to-value-field="productStore" use-cache="true"/>
<if-not-empty field="productStore.inventoryFacilityId">
<set from-field="productStore.inventoryFacilityId" field="inputMap.facilityId"/>
</if-not-empty>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field-name="parameters.requirementId" result-name="requirementId"/>
+ <result-to-field field="parameters.requirementId" result-name="requirementId"/>
</call-service>
<!-- create the OrderRequirementCommitment to record the Requirement created for an order item -->
@@ -168,8 +168,8 @@
<set from-field="inventoryItem.productId" field="inputMap.productId"/>
<set from-field="inventoryItem.facilityId" field="inputMap.facilityId"/>
<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
- <result-to-field field-name="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
- <result-to-field field-name="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+ <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
+ <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
</call-service>
<clear-field field="inputMap"/>
</simple-method>
@@ -243,9 +243,9 @@
<if-not-empty field="productFacility.minimumStock">
<!-- No requirements are created if we are already under stock -->
<if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="Double">
- <calculate field-name="newQuantityOnHand">
- <calcop field-name="quantityOnHandTotal" operator="subtract">
- <calcop operator="get" field-name="parameters.quantity"/>
+ <calculate field="newQuantityOnHand">
+ <calcop field="quantityOnHandTotal" operator="subtract">
+ <calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
<!-- If this new issuance will cause the quantityOnHandTotal to go below the minimumStock, create a new requirement -->
@@ -260,7 +260,7 @@
</if-not-empty>
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field-name="parameters.requirementId" result-name="requirementId"/>
+ <result-to-field field="parameters.requirementId" result-name="requirementId"/>
</call-service>
<field-to-result field="parameters.requirementId" result-name="requirementId"/>
</if-compare-field>
@@ -290,9 +290,9 @@
<!-- No requirements are created if we are not under stock -->
<!-- this service is supposed to be called after inventory is reserved, so inventory should have been updated already -->
<if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double">
- <calculate field-name="oldAvailableToPromise">
- <calcop field-name="availableToPromiseTotal" operator="add">
- <calcop operator="get" field-name="parameters.quantity"/>
+ <calculate field="oldAvailableToPromise">
+ <calcop field="availableToPromiseTotal" operator="add">
+ <calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
<!-- If before this reservation the availableToPromiseTotal was over minimumStock, create a new requirement -->
@@ -307,7 +307,7 @@
</if-not-empty>
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field-name="parameters.requirementId" result-name="requirementId"/>
+ <result-to-field field="parameters.requirementId" result-name="requirementId"/>
</call-service>
<field-to-result field="parameters.requirementId" result-name="requirementId"/>
</if-compare-field>
@@ -337,9 +337,9 @@
<!-- are we below minimum stock? this service is supposed to be called after inventory is reserved, so inventory should have been updated already -->
<if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double">
<!-- what is the right quantity? It is the lesser of the actual quantity and the quantity required to bring us back up to minimum stock -->
- <calculate field-name="quantityShortfall">
- <calcop field-name="productFacility.minimumStock" operator="subtract">
- <calcop operator="get" field-name="availableToPromiseTotal"/>
+ <calculate field="quantityShortfall">
+ <calcop field="productFacility.minimumStock" operator="subtract">
+ <calcop operator="get" field="availableToPromiseTotal"/>
</calcop>
</calculate>
<if-compare-field field="quantityShortfall" operator="less" to-field="parameters.quantity" type="Double">
@@ -366,17 +366,17 @@
</condition-list>
</entity-condition>
<iterate entry="requirement" list="requirements">
- <calculate field-name="existingRequirementTotal" type="Double">
- <calcop operator="add" field-name="existingRequirementTotal">
- <calcop operator="get" field-name="requirement.quantity"/>
+ <calculate field="existingRequirementTotal" type="Double">
+ <calcop operator="add" field="existingRequirementTotal">
+ <calcop operator="get" field="requirement.quantity"/>
</calcop>
</calculate>
</iterate>
<!-- Subtract the total quantity of existing requirements from the required quantity to determine if a new requirement needs to be created -->
- <calculate field-name="newRequirementTotal" type="Double">
- <calcop operator="subtract" field-name="inputMap.quantity">
- <calcop operator="get" field-name="existingRequirementTotal"/>
+ <calculate field="newRequirementTotal" type="Double">
+ <calcop operator="subtract" field="inputMap.quantity">
+ <calcop operator="get" field="existingRequirementTotal"/>
</calcop>
</calculate>
@@ -425,8 +425,8 @@
<set from-field="productFacility.productId" field="inputMap.productId"/>
<set from-field="productFacility.facilityId" field="inputMap.facilityId"/>
<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
- <result-to-field field-name="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
- <result-to-field field-name="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+ <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
+ <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
</call-service>
<if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK">
@@ -447,9 +447,9 @@
</else>
</if-not-empty>
- <calculate field-name="quantityShortfall">
- <calcop field-name="productFacility.minimumStock" operator="subtract">
- <calcop operator="get" field-name="currentQuantity"/>
+ <calculate field="quantityShortfall">
+ <calcop field="productFacility.minimumStock" operator="subtract">
+ <calcop operator="get" field="currentQuantity"/>
</calcop>
</calculate>
<if-compare-field field="inputMap.quantity" to-field="quantityShortfall" operator="less" type="Double">
@@ -459,7 +459,7 @@
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<set from-field="parameters.facilityId" field="inputMap.facilityId"/>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field-name="requirementId" result-name="requirementId"/>
+ <result-to-field field="requirementId" result-name="requirementId"/>
</call-service>
<log level="info" message="Requirement creted with id [${requirementId}] for product with id [${productFacility.productId}]."/>
</if-compare-field>
@@ -482,12 +482,12 @@
<!-- <log level="info" message="In getNextOrderId sequence enum ODRSQ_ENF_SEQ"/> -->
<!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom -->
<if-not-empty field="partyAcctgPreference.lastOrderNumber">
- <calculate field-name="partyAcctgPreference.lastOrderNumber" type="Long">
- <calcop operator="add" field-name="partyAcctgPreference.lastOrderNumber"/>
+ <calculate field="partyAcctgPreference.lastOrderNumber" type="Long">
+ <calcop operator="add" field="partyAcctgPreference.lastOrderNumber"/>
<number value="1"/>
</calculate>
<else>
- <calculate field-name="partyAcctgPreference.lastOrderNumber" type="Long"><number value="1"/></calculate>
+ <calculate field="partyAcctgPreference.lastOrderNumber" type="Long"><number value="1"/></calculate>
</else>
</if-not-empty>
<store-value value-name="partyAcctgPreference"/>
@@ -559,7 +559,7 @@
<check-errors/>
<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"/>
+ <get-related value-field="order" relation-name="OrderItem" list="orderItems"/>
<iterate list="orderItems" entry="orderItem">
<if>
<condition>
@@ -577,7 +577,7 @@
</if>
</iterate>
- <get-related value-name="order" relation-name="OrderAdjustment" list-name="orderAdjustments"/>
+ <get-related value-field="order" relation-name="OrderAdjustment" list="orderAdjustments"/>
<!-- Accumulate the total existing promotional adjustment -->
<set field="existingOrderAdjustmentTotal" value="0" type="BigDecimal"/>
@@ -587,10 +587,10 @@
<not><if-empty field="orderAdjustment.productPromoId"/></not>
</condition>
<then>
- <calculate field-name="existingOrderAdjustmentTotal" decimal-scale="3">
+ <calculate field="existingOrderAdjustmentTotal" decimal-scale="3">
<calcop operator="add">
- <calcop operator="get" field-name="orderAdjustment.amount"/>
- <calcop operator="get" field-name="existingOrderAdjustmentTotal"/>
+ <calcop operator="get" field="orderAdjustment.amount"/>
+ <calcop operator="get" field="existingOrderAdjustmentTotal"/>
</calcop>
</calculate>
</then>
@@ -602,7 +602,7 @@
<set value="true" field="loadCartFromOrderInMap.skipInventoryChecks" type="Boolean"/>
<set value="true" field="loadCartFromOrderInMap.skipProductChecks" type="Boolean"/>
<call-service service-name="loadCartFromOrder" in-map-name="loadCartFromOrderInMap">
- <result-to-field result-name="shoppingCart" field-name="cart"/>
+ <result-to-field result-name="shoppingCart" field="cart"/>
</call-service>
<call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/>
<iterate list="items" entry="item">
@@ -643,10 +643,10 @@
<not><if-empty field="orderAdjustment.productPromoId"/></not>
</condition>
<then>
- <calculate field-name="newOrderAdjustmentTotal" decimal-scale="3">
+ <calculate field="newOrderAdjustmentTotal" decimal-scale="3">
<calcop operator="add">
- <calcop operator="get" field-name="adjustment.amount"/>
- <calcop operator="get" field-name="newOrderAdjustmentTotal"/>
+ <calcop operator="get" field="adjustment.amount"/>
+ <calcop operator="get" field="newOrderAdjustmentTotal"/>
</calcop>
</calculate>
</then>
@@ -654,9 +654,9 @@
</iterate>
<!-- Determine the difference between existing and new promotion adjustment totals, if any -->
- <calculate field-name="orderAdjustmentTotalDifference" decimal-scale="3" type="BigDecimal">
- <calcop operator="subtract" field-name="newOrderAdjustmentTotal">
- <calcop operator="get" field-name="existingOrderAdjustmentTotal"/>
+ <calculate field="orderAdjustmentTotalDifference" decimal-scale="3" type="BigDecimal">
+ <calcop operator="subtract" field="newOrderAdjustmentTotal">
+ <calcop operator="get" field="existingOrderAdjustmentTotal"/>
</calcop>
</calculate>
@@ -770,7 +770,7 @@
<set field="orderByList[]" value="-promisedDatetime"/>
</else>
</if-compare>
- <get-related value-name="orderItemShipGroup" relation-name="OrderItemShipGrpInvRes" list-name="orderItemShipGroupInvResList" order-by-list-name="orderByList"/>
+ <get-related value-field="orderItemShipGroup" relation-name="OrderItemShipGrpInvRes" list-name="orderItemShipGroupInvResList" order-by-list="orderByList"/>
<first-from-list entry="orderItemShipGroupInvRes" list="orderItemShipGroupInvResList"/>
<field-to-result field="orderItemShipGroupInvRes.promisedDatetime" result-name="estimatedShipDate"/>
</simple-method>
@@ -851,7 +851,7 @@
<set field="inputMap.paymentMethodTypeId" from-field="paymentMethod.paymentMethodTypeId"/>
<!--In this method we calls createOrderPaymentPreference and returns orderPaymentPreferenceId field to authOrderPaymentPreference -->
<call-service service-name="createOrderPaymentPreference" in-map-name="inputMap" include-user-login="true">
- <result-to-field field-name="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
+ <result-to-field field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
</call-service>
<field-to-result field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
</simple-method>
@@ -908,7 +908,7 @@
<if-empty field="shipToAddressCtx.contactMechId">
<set field="shipToAddressCtx.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyPostalAddress" in-map-name="shipToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToContactMechId"/>
</call-service>
<log level="info" message="Shipping address created with contactMechId ${shipToAddressCtx.shipToContactMechId}"/>
<else>
@@ -919,7 +919,7 @@
<set-nonpk-fields map="shipToAddressCtx" value-field="newValue"/>
<if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
<call-service service-name="createPartyPostalAddress" in-map-name="shipToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToContactMechId"/>
</call-service>
</if-compare-field>
<entity-and entity-name="PartyContactMechPurpose" list="pcmpShipList" filter-by-date="true">
@@ -976,14 +976,14 @@
</if-not-empty>
<set field="shipToAddressCtx.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyPostalAddress" in-map-name="shipToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToContactMechId"/>
</call-service>
<log level="info" message="Shipping address updated with contactMechId ${shipToAddressCtx.shipToContactMechId}"/>
</if-compare-field>
<else>
<set field="shipToAddressCtx.userLogin" from-field="parameters.userLogin"/>
<call-service service-name="updatePartyPostalAddress" in-map-name="shipToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToContactMechId"/>
</call-service>
<log level="info" message="Shipping address updated with contactMechId ${shipToAddressCtx.shipToContactMechId}"/>
</else>
@@ -1042,24 +1042,24 @@
<if-empty field="parameters.billToContactMechId">
<set field="billToAddressCtx.contactMechPurposeTypeId" value="BILLING_LOCATION"/>
<call-service service-name="createPartyPostalAddress" in-map-name="billToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.billToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/>
</call-service>
<log level="info" message="Billing address created with contactmechId ${parameters.billToContactMechId}"/>
<else>
<if-compare-field field="parameters.shipToContactMechId" operator="equals" to-field="parameters.billToContactMechId">
<call-service service-name="createPartyPostalAddress" in-map-name="billToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.billToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/>
</call-service>
<log level="info" message="Billing address updated with contactMechId ${parameters.billToContactMechId}"/>
<else>
<if-compare field="keepAddressBook" operator="equals" value="N">
<call-service service-name="updatePartyPostalAddress" in-map-name="billToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.billToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/>
</call-service>
</if-compare>
<if-compare field="keepAddressBook" operator="equals" value="Y">
<call-service service-name="createPartyPostalAddress" in-map-name="billToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.billToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/>
</call-service>
</if-compare>
<log level="info" message="Billing Postal Address created billToContactMechId is ${parameters.billToContactMechId}"/>
@@ -1112,7 +1112,7 @@
<if-empty field="parameters.paymentMethodId">
<!-- call create Credit Card -->
<call-service service-name="createCreditCard" in-map-name="creditCardContext">
- <result-to-field result-name="paymentMethodId" field-name="parameters.paymentMethodId"/>
+ <result-to-field result-name="paymentMethodId" field="parameters.paymentMethodId"/>
</call-service>
<else>
<!-- call update Credit Card -->
@@ -1123,7 +1123,7 @@
<first-from-list list="paymentMethodList" entry="paymentMethod"/>
<set field="creditCardContext.paymentMethodId" from-field="paymentMethod.paymentMethodId"/>
<call-service service-name="updateCreditCard" in-map-name="creditCardContext">
- <result-to-field result-name="paymentMethodId" field-name="parameters.paymentMethodId"/>
+ <result-to-field result-name="paymentMethodId" field="parameters.paymentMethodId"/>
</call-service>
</else>
</if-empty>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -38,12 +38,12 @@
<!-- <log level="info" message="In getNextQuoteId sequence enum QTESQ_ENF_SEQ"/> -->
<!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom -->
<if-not-empty field="partyAcctgPreference.lastQuoteNumber">
- <calculate field-name="partyAcctgPreference.lastQuoteNumber" type="Long">
- <calcop operator="add" field-name="partyAcctgPreference.lastQuoteNumber"/>
+ <calculate field="partyAcctgPreference.lastQuoteNumber" type="Long">
+ <calcop operator="add" field="partyAcctgPreference.lastQuoteNumber"/>
<number value="1"/>
</calculate>
<else>
- <calculate field-name="partyAcctgPreference.lastQuoteNumber" type="Long"><number value="1"/></calculate>
+ <calculate field="partyAcctgPreference.lastQuoteNumber" type="Long"><number value="1"/></calculate>
</else>
</if-not-empty>
<store-value value-name="partyAcctgPreference"/>
@@ -96,7 +96,7 @@
<if-not-empty field="productStore.payToPartyId">
<set field="getNextQuoteIdContext.partyId" from-field="productStore.payToPartyId"/>
<call-service service-name="getNextQuoteId" in-map-name="getNextQuoteIdContext">
- <result-to-field result-name="quoteId" field-name="newEntity.quoteId"/>
+ <result-to-field result-name="quoteId" field="newEntity.quoteId"/>
</call-service>
<else>
<sequenced-id-to-env sequence-name="Quote" env-name="newEntity.quoteId"/>
@@ -161,10 +161,10 @@
<set-service-fields service-name="createQuote" to-map="createQuoteInMap" map="quote"/>
<clear-field field="createQuoteInMap.statusId"/>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
- <result-to-field result-name="quoteId" field-name="quoteIdTo"/>
+ <result-to-field result-name="quoteId" field="quoteIdTo"/>
</call-service>
<if-compare field="parameters.copyQuoteItems" value="Y" operator="equals">
- <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
+ <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<clear-field field="createQuoteItemInMap"/>
<set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
@@ -175,7 +175,7 @@
</if-compare>
<if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals">
- <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
+ <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<if-empty field="quoteAdjustment.quoteItemSeqId">
<clear-field field="createQuoteAdjustmentInMap"/>
@@ -187,7 +187,7 @@
</if-compare>
<if-compare field="parameters.copyQuoteRoles" value="Y" operator="equals">
- <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/>
+ <get-related value-field="quote" relation-name="QuoteRole" list="quoteRoles"/>
<iterate list="quoteRoles" entry="quoteRole">
<if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
<clear-field field="createQuoteRoleInMap"/>
@@ -199,7 +199,7 @@
</if-compare>
<if-compare field="parameters.copyQuoteAttributes" value="Y" operator="equals">
- <get-related value-name="quote" relation-name="QuoteAttribute" list-name="quoteAttributes"/>
+ <get-related value-field="quote" relation-name="QuoteAttribute" list="quoteAttributes"/>
<iterate list="quoteAttributes" entry="quoteAttribute">
<clear-field field="createQuoteAttributeInMap"/>
<set-service-fields service-name="createQuoteAttribute" to-map="createQuoteAttributeInMap" map="quoteAttribute"/>
@@ -209,7 +209,7 @@
</if-compare>
<if-compare field="parameters.copyQuoteCoefficients" value="Y" operator="equals">
- <get-related value-name="quote" relation-name="QuoteCoefficient" list-name="quoteCoefficients"/>
+ <get-related value-field="quote" relation-name="QuoteCoefficient" list="quoteCoefficients"/>
<iterate list="quoteCoefficients" entry="quoteCoefficient">
<clear-field field="createQuoteCoefficientInMap"/>
<set-service-fields service-name="createQuoteCoefficient" to-map="createQuoteCoefficientInMap" map="quoteCoefficient"/>
@@ -330,7 +330,7 @@
<set from-field="parameters.selectedAmount" field="calculateProductPriceMap.amount"/>
</if-not-empty>
<call-service service-name="calculateProductPrice" in-map-name="calculateProductPriceMap">
- <result-to-field result-name="price" field-name="newEntity.quoteUnitPrice"/>
+ <result-to-field result-name="price" field="newEntity.quoteUnitPrice"/>
</call-service>
</else>
</if>
@@ -386,14 +386,14 @@
</if-empty>
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap">
- <result-to-field result-name="quoteId" field-name="quoteIdTo"/>
- <result-to-field result-name="quoteItemSeqId" field-name="quoteItemSeqId"/>
+ <result-to-field result-name="quoteId" field="quoteIdTo"/>
+ <result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/>
</call-service>
<check-errors/>
<if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals">
- <get-related value-name="quoteItem" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
+ <get-related value-field="quoteItem" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<clear-field field="createQuoteAdjustmentInMap"/>
<set-service-fields service-name="createQuoteAdjustment" to-map="createQuoteAdjustmentInMap" map="quoteAdjustment"/>
@@ -554,17 +554,17 @@
<set from-field="parameters.defaultQuoteUnitPrice" field="quoteItem.quoteUnitPrice"/>
</if-not-empty>
<!--
- <calculate field-name="quoteItem.quoteUnitPrice" type="Double">
+ <calculate field="quoteItem.quoteUnitPrice" type="Double">
<calcop operator="multiply">
- <calcop operator="get" field-name="parameters.averageCost"/>
- <calcop operator="get" field-name="parameters.costToPriceMult"/>
+ <calcop operator="get" field="parameters.averageCost"/>
+ <calcop operator="get" field="parameters.costToPriceMult"/>
</calcop>
</calculate>
-->
</if-empty>
<store-value value-name="quoteItem"/>
<check-errors/>
- <field-to-request field-name="quoteItem.quoteId" request-name="quoteId"/>
+ <field-to-request field="quoteItem.quoteId" request-name="quoteId"/>
</simple-method>
<simple-method method-name="autoCreateQuoteAdjustments" short-description="Auto create QuoteAdjustments">
<check-permission permission="ORDERMGR" action="_CREATE">
@@ -573,7 +573,7 @@
<check-errors/>
<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"/>
+ <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<if-compare field="quoteItem.isPromo" value="Y" operator="equals">
<clear-field field="removeQuoteItemInMap"/>
@@ -583,7 +583,7 @@
</if-compare>
</iterate>
<!-- all existing auto quote adjustments are removed -->
- <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
+ <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<!-- make sure this is not a manual adjustments -->
<if-not-empty field="quoteAdjustment.productPromoId">
@@ -596,7 +596,7 @@
<set-service-fields service-name="loadCartFromQuote" to-map="loadCartFromQuoteInMap" map="parameters"/>
<set value="false" field="loadCartFromQuoteInMap.applyQuoteAdjustments"/>
<call-service service-name="loadCartFromQuote" in-map-name="loadCartFromQuoteInMap">
- <result-to-field result-name="shoppingCart" field-name="cart"/>
+ <result-to-field result-name="shoppingCart" field="cart"/>
</call-service>
<call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/>
@@ -611,7 +611,7 @@
<call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="createQuoteItemInMap.quantity"/>
<set value="Y" field="createQuoteItemInMap.isPromo"/>
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap">
- <result-to-field result-name="quoteItemSeqId" field-name="quoteItemSeqId"/>
+ <result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/>
</call-service>
<!-- and the quoteItemSeqId is assigned to the shopping cart item (as orderItemSeqId) -->
<call-object-method obj-field-name="item" method-name="setOrderItemSeqId">
@@ -621,7 +621,7 @@
</if-empty>
</iterate>
<!-- set the quoteUnitPrice from the item basePrice -->
- <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
+ <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<if>
<condition>
@@ -712,7 +712,7 @@
<set value="PRODUCT_QUOTE" field="createQuoteInMap.quoteTypeId"/>
<set value="QUO_CREATED" field="createQuoteInMap.statusId"/>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
- <result-to-field result-name="quoteId" field-name="quoteId"/>
+ <result-to-field result-name="quoteId" field="quoteId"/>
</call-service>
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
@@ -749,7 +749,7 @@
<call-object-method obj-field-name="item" method-name="getReservPersons" ret-field-name="createQuoteItemInMap.reservPersons"/>
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap">
- <result-to-field result-name="quoteItemSeqId" field-name="quoteItemSeqId"/>
+ <result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/>
</call-service>
<!-- and the quoteItemSeqId is assigned to the shopping cart item (as orderItemSeqId) -->
<call-object-method obj-field-name="item" method-name="setOrderItemSeqId">
@@ -778,12 +778,12 @@
<simple-method method-name="createQuoteFromShoppingList" short-description="Create a Quote from a Shopping List">
<call-service service-name="loadCartFromShoppingList" in-map-name="parameters">
- <result-to-field result-name="shoppingCart" field-name="cart"/>
+ <result-to-field result-name="shoppingCart" field="cart"/>
</call-service>
<set from-field="cart" field="createQuoteFromCartInMap.cart"/>
<set from-field="parameters.applyStorePromotions" field="createQuoteFromCartInMap.applyStorePromotions"/>
<call-service service-name="createQuoteFromCart" in-map-name="createQuoteFromCartInMap">
- <result-to-field result-name="quoteId" field-name="quoteId"/>
+ <result-to-field result-name="quoteId" field="quoteId"/>
</call-service>
<field-to-result field="quoteId" result-name="quoteId"/>
@@ -828,11 +828,11 @@
</if-empty>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
- <result-to-field result-name="quoteId" field-name="quoteId"/>
+ <result-to-field result-name="quoteId" field="quoteId"/>
</call-service>
<check-errors/>
- <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems"/>
+ <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems"/>
<iterate list="custRequestItems" entry="custRequestItem">
<clear-field field="createQuoteItemInMap"/>
<set field="createQuoteItemInMap.quoteId" from-field="quoteId"/>
@@ -848,7 +848,7 @@
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap"/>
</iterate>
<!-- roles -->
- <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="custRequestParties"/>
+ <get-related value-field="custRequest" relation-name="CustRequestParty" list="custRequestParties"/>
<iterate list="custRequestParties" entry="custRequestParty">
<clear-field field="createQuoteRoleInMap"/>
<!-- The REQ_TAKER role is automatically added by the createQuote service -->
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml Tue Dec 30 09:12:15 2008
@@ -62,7 +62,7 @@
<set field="inMap.uploadedFile" from-field="formInput.imageData"/>
<set field="inMap._uploadedFile_contentType" from-field="formInput.uploadMimeType"/>
<call-service service-name="createContentFromUploadedFile" in-map-name="inMap">
- <result-to-field result-name="contentId" field-name="context.contentId"/>
+ <result-to-field result-name="contentId" field="context.contentId"/>
</call-service>
</then>
<else>
@@ -94,7 +94,7 @@
<!-- Create CustRequestContent -->
<call-service service-name="createCustRequestContent" in-map-name="custRequestContext">
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
</simple-method>
</simple-methods>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -132,7 +132,7 @@
<if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals">
<if-compare field="parameters.statusId" value="CRQ_CANCELLED" operator="equals">
<!-- check for related workefforts ...and when no time recorded cancel these too -->
- <get-related value-name="custRequest" relation-name="CustRequestWorkEffort" list-name="workEfforts"/>
+ <get-related value-field="custRequest" relation-name="CustRequestWorkEffort" list="workEfforts"/>
<if-not-empty field="workEfforts">
<iterate entry="workEffort" list="workEfforts">
<entity-one entity-name="WorkEffort" value-field="lowInfo">
@@ -299,7 +299,7 @@
<call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field-name="createCustRequestInMap.productStoreId"/>
<call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field-name="createCustRequestInMap.salesChannelEnumId"/>
<call-service service-name="createCustRequest" in-map-name="createCustRequestInMap">
- <result-to-field result-name="custRequestId" field-name="custRequestId"/>
+ <result-to-field result-name="custRequestId" field="custRequestId"/>
</call-service>
<check-errors/>
<entity-one entity-name="CustRequest" value-field="custRequest" auto-field-map="true"/>
@@ -325,7 +325,7 @@
<call-object-method obj-field-name="item" method-name="getReservLength" ret-field-name="createCustRequestItemInMap.reservLength"/>
<call-object-method obj-field-name="item" method-name="getReservPersons" ret-field-name="createCustRequestItemInMap.reservPersons"/>
<call-service service-name="createCustRequestItem" in-map-name="createCustRequestItemInMap">
- <result-to-field result-name="custRequestItemSeqId" field-name="custRequestItemSeqId"/>
+ <result-to-field result-name="custRequestItemSeqId" field="custRequestItemSeqId"/>
</call-service>
</if-compare>
</iterate>
@@ -336,12 +336,12 @@
<simple-method method-name="createCustRequestFromShoppingList" short-description="Create a CustRequest from a Shopping List">
<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"/>
+ <result-to-field result-name="shoppingCart" field="cart"/>
</call-service>
<set from-field="cart" field="createCustRequestFromCartInMap.cart"/>
<set field="createCustRequestFromCartInMap.custRequestName" from-field="shoppingList.listName"/>
<call-service service-name="createCustRequestFromCart" in-map-name="createCustRequestFromCartInMap">
- <result-to-field result-name="custRequestId" field-name="custRequestId"/>
+ <result-to-field result-name="custRequestId" field="custRequestId"/>
</call-service>
<check-errors/>
<field-to-result field="custRequestId" result-name="custRequestId"/>
@@ -366,14 +366,14 @@
</if-empty>
<call-service service-name="createCustRequestItem" in-map-name="createCustRequestItemInMap">
- <result-to-field result-name="custRequestId" field-name="custRequestIdTo"/>
- <result-to-field result-name="custRequestItemSeqId" field-name="custRequestItemSeqId"/>
+ <result-to-field result-name="custRequestId" field="custRequestIdTo"/>
+ <result-to-field result-name="custRequestItemSeqId" field="custRequestItemSeqId"/>
</call-service>
<check-errors/>
<if-compare field="parameters.copyLinkedQuotes" value="Y" operator="equals">
- <get-related value-name="custRequestItem" relation-name="QuoteItem" list-name="quoteItems"/>
+ <get-related value-field="custRequestItem" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<clear-field field="createQuoteItemInMap"/>
<set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
@@ -437,7 +437,7 @@
</if-empty>
<set field="custRequest.statusId" value="CRQ_ACCEPTED"/>
<call-service service-name="createCustRequest" in-map-name="custRequest">
- <result-to-field result-name="custRequestId" field-name="parameters.custRequestId"/>
+ <result-to-field result-name="custRequestId" field="parameters.custRequestId"/>
</call-service>
<set-service-fields service-name="createCustRequestCommEvent" map="parameters" to-map="custRequestCommEvent"/>
<call-service service-name="createCustRequestCommEvent" in-map="custRequestCommEvent"/>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -155,7 +155,7 @@
<set field="inputMap.quantity" from-field="requirement.quantity"/>
<set field="inputMap.sendDate" from-field="requirement.requiredByDate"/>
<call-service service-name="createInventoryTransfersForProduct" in-map-name="inputMap">
- <result-to-field field-name="quantityNotTransferred" result-name="quantityNotTransferred"/>
+ <result-to-field field="quantityNotTransferred" result-name="quantityNotTransferred"/>
</call-service>
<check-errors/>
<if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="Double">
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -225,13 +225,13 @@
<set field="calcPriceInMap.product" from-field="product"/>
<set field="calcPriceInMap.quantity" from-field="shoppingListItem.quantity"/>
<call-service service-name="calculateProductPrice" in-map-name="calcPriceInMap">
- <result-to-field result-name="price" field-name="calcPriceOutMap.price"/>
+ <result-to-field result-name="price" field="calcPriceOutMap.price"/>
</call-service>
- <calculate field-name="totalPrice">
- <calcop field-name="totalPrice" operator="add"/>
+ <calculate field="totalPrice">
+ <calcop field="totalPrice" operator="add"/>
<calcop operator="multiply">
- <calcop operator="get" field-name="calcPriceOutMap.price"/>
- <calcop operator="get" field-name="shoppingListItem.quantity"/>
+ <calcop operator="get" field="calcPriceOutMap.price"/>
+ <calcop operator="get" field="shoppingListItem.quantity"/>
</calcop>
</calculate>
<clear-field field="calcPriceInMap"/>
@@ -245,11 +245,11 @@
<map-to-map map-name="calcPriceInBaseMap" to-map-name="calcChildPriceInMap"/>
<set from-field="childshoppingList.shoppingListId" field="calcChildPriceInMap.shoppingListId"/>
<call-service service-name="calculateShoppingListDeepTotalPrice" in-map-name="calcChildPriceInMap">
- <result-to-field result-name="totalPrice" field-name="totalPrice" map-name="calcPriceOutMap"/>
+ <result-to-field result-name="totalPrice" field="calcPriceOutMap.totalPrice"/>
</call-service>
- <calculate field-name="totalPrice">
- <calcop field-name="totalPrice" operator="get"/>
- <calcop field-name="calcPriceOutMap.totalPrice" operator="get"/>
+ <calculate field="totalPrice">
+ <calcop field="totalPrice" operator="get"/>
+ <calcop field="calcPriceOutMap.totalPrice" operator="get"/>
</calculate>
<clear-field field="calcChildPriceInMap"/>
</iterate>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -62,7 +62,7 @@
<log level="info" message="Creating a PartyContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.partyId" from-field="parameters.partyId"/>
<field-to-result field="contactMechId" map-name="newValue"/>
- <field-to-request field-name="contactMechId" map-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp-to-env env-name="newValue.fromDate"/>
<create-value value-field="newValue"/>
@@ -109,7 +109,7 @@
<create-value value-field="newPartyContactMech"/>
<if-compare-field to-field="newPartyContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
- <get-related value-name="partyContactMech" relation-name="PartyContactMechPurpose" list-name="partyContactMechPurposes"/>
+ <get-related value-field="partyContactMech" relation-name="PartyContactMechPurpose" list="partyContactMechPurposes"/>
<iterate entry="partyContactMechPurposeOld" list="partyContactMechPurposes">
<clone-value value-name="partyContactMechPurposeOld" new-value-name="partyContactMechPurpose"/>
<now-timestamp-to-env env-name="partyContactMechPurposeOld.thruDate"/>
@@ -129,7 +129,7 @@
<log level="info" message="Setting id to result: ${newPartyContactMech.contactMechId}"/>
<field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/>
- <field-to-request field-name="newPartyContactMech.contactMechId" request-name="contactMechId"/>
+ <field-to-request field="newPartyContactMech.contactMechId" request-name="contactMechId"/>
</simple-method>
<simple-method method-name="deletePartyContactMech" short-description="Delete a PartyContactMech">
@@ -172,7 +172,7 @@
<call-service service-name="createPartyContactMech" in-map-name="createPartyContactMechMap" break-on-error="true">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
</call-service>
- <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
<field-to-result field="contactMechId" map-name="newPartyContactMech"/>
</simple-method>
@@ -185,7 +185,7 @@
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
<call-service in-map="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
- <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field-name="contactMechId" />
+ <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field="contactMechId" />
</call-service>
<set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/>
@@ -195,7 +195,7 @@
<call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechMap">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
</call-service>
- <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
<field-to-result field="contactMechId" map-name="newPartyContactMech"/>
</simple-method>
@@ -219,7 +219,7 @@
<call-service service-name="createPartyContactMech" in-map-name="createPartyContactMechMap" break-on-error="true">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
</call-service>
- <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
<field-to-result field="contactMechId" map-name="newPartyContactMech"/>
</simple-method>
@@ -232,7 +232,7 @@
<set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
<call-service service-name="updateTelecomNumber" in-map="updateTelecomNumberMap">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
- <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field-name="contactMechId" />
+ <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field="contactMechId" />
</call-service>
<set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/>
@@ -244,7 +244,7 @@
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
</call-service>
<log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/>
- <field-to-request field-name="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
<field-to-result field="contactMechId" map-name="newPartyContactMech"/>
</simple-method>
@@ -322,7 +322,7 @@
<simple-method method-name="createPostalAddressAndPurposes" short-description="Create postal address, purposes and set them defaults" login-required="false">
<call-service service-name="createPartyPostalAddress" in-map-name="parameters">
- <result-to-field result-name="contactMechId" field-name="parameters.contactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.contactMechId"/>
<result-to-result result-name="contactMechId"/>
</call-service>
<if>
@@ -391,14 +391,14 @@
<then>
<if-compare-field field="partyProfileDefault.defaultBillAddr" operator="not-equals" to-field="partyProfileDefault.defaultShipAddr">
<call-service service-name="updatePartyPostalAddress" in-map-name="parameters">
- <result-to-field result-name="contactMechId" field-name="parameters.contactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.contactMechId"/>
<result-to-result result-name="contactMechId"/>
</call-service>
<else>
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
<call-service service-name="updatePostalAddress" in-map="updatePostalAddressMap">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
- <result-to-field result-name="contactMechId" field-name="parameters.newContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.newContactMechId"/>
<result-to-result result-name="contactMechId"/>
</call-service>
@@ -416,7 +416,7 @@
</then>
<else>
<call-service service-name="updatePartyPostalAddress" in-map-name="parameters">
- <result-to-field result-name="contactMechId" field-name="parameters.contactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.contactMechId"/>
<result-to-result result-name="contactMechId"/>
</call-service>
</else>
@@ -503,7 +503,7 @@
<set-service-fields service-name="updatePartyTelecomNumber" map="parameters" to-map="updatePartyTelecomNumberCtx"/>
<set field="updatePartyTelecomNumberCtx.contactMechId" from-field="parameters.phoneContactMechId"/>
<call-service service-name="updatePartyTelecomNumber" in-map-name="updatePartyTelecomNumberCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.contactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.contactMechId"/>
</call-service>
</if-not-empty>
</simple-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Tue Dec 30 09:12:15 2008
@@ -260,7 +260,7 @@
<!-- the above copy is okay since we checked already that they are the same -->
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
<result-to-field result-name="partyId" map-name="tempMap"/>
- <result-to-field field-name="createdUserLogin" result-name="newUserLogin"/>
+ <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
</call-service>
<set-current-user-login value-name="createdUserLogin"/>
@@ -345,7 +345,7 @@
<call-service service-name="createPartyContactMechPurpose" in-map-name="emailPurposeContext"/>
<!-- set the partyId in the request -->
- <field-to-request field-name="partyId" map-name="tempMap" request-name="partyId"/>
+ <field-to-request field="partyId" map-name="tempMap" request-name="partyId"/>
</simple-method>
</simple-methods>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -151,7 +151,7 @@
<else>
<set field="findPartyCtx.address" from-field="partyInvitation.emailAddress"/>
<call-service service-name="findPartyFromEmailAddress" in-map-name="findPartyCtx">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
</call-service>
<if-not-empty field="partyId">
<if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals">
@@ -204,7 +204,7 @@
<else>
<set field="findPartyCtx.address" from-field="partyInvitation.emailAddress"/>
<call-service service-name="findPartyFromEmailAddress" in-map-name="findPartyCtx">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
</call-service>
<if-not-empty field="partyId">
<if-compare-field field="partyId" to-field="userLogin.partyId" operator="equals">
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -187,8 +187,8 @@
<set field="postalAddressBoundaryLookupMap.geoId" from-field="parameters.geoId"/>
<find-by-and entity-name="PostalAddressBoundary" map-name="postalAddressBoundaryLookupMap" list-name="postalAddressBoundaries"/>
<iterate list="postalAddressBoundaries" entry="postalAddressBoundary">
- <get-related-one value-name="postalAddressBoundary" to-value-name="geo" relation-name="Geo"/>
- <field-to-list field-name="geo" list-name="geos"/>
+ <get-related-one value-name="postalAddressBoundary" to-value-field="geo" relation-name="Geo"/>
+ <field-to-list field-name="geo" list="geos"/>
</iterate>
<field-to-result field="geos"/>
</simple-method>
@@ -318,7 +318,7 @@
<set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>
<set value="LOCAL_FILE" field="dataResource.dataResourceTypeId"/>
<call-service service-name="createDataResource" in-map-name="dataResource" break-on-error="false">
- <result-to-field result-name="dataResourceId" field-name="dataResourceId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
<set-service-fields service-name="updateDataResource" map="dataResource" to-map="dataResource"/>
@@ -333,7 +333,7 @@
<set from-field="dataResourceId" field="createContentMap.dataResourceId"/>
</if-not-empty>
<call-service service-name="createContent" in-map-name="createContentMap" break-on-error="false">
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<!-- create the content role -->
<if-not-empty field="parameters.partyId">
@@ -409,7 +409,7 @@
<set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>
<set value="LOCAL_FILE" field="dataResource.dataResourceTypeId"/>
<call-service service-name="createDataResource" in-map-name="dataResource" break-on-error="false">
- <result-to-field result-name="dataResourceId" field-name="dataResourceId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
<set value="${uploadPath}/${dataResourceId}" field="dataResource.objectInfo"/>
<if-not-empty field="extension">
@@ -450,8 +450,8 @@
<find-by-and entity-name="PartyRelationship" map-name="lookupMap" list-name="partyRelationships"/>
<iterate list="partyRelationships" entry="partyRelationship">
- <get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-name="party"/>
- <field-to-list field-name="party" list-name="parties"/>
+ <get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-field="party"/>
+ <field-to-list field-name="party" list="parties"/>
</iterate>
<if-not-empty field="parties">
<field-to-result field="parties"/>
@@ -930,7 +930,7 @@
<set-service-fields service-name="createPerson" map="personMap" to-map="personContext"/>
<if-empty field="partyId">
<call-service service-name="createPerson" in-map-name="personContext">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
</call-service>
<else><!-- If partyId already exists. -->
<set field="personContext.partyId" from-field="partyId"/>
@@ -946,13 +946,13 @@
<if-empty field="parameters.contactMechId">
<set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
<call-service service-name="createPartyTelecomNumber" in-map="phoneContext">
- <result-to-field result-name="contactMechId" field-name="contactMechId"/>
+ <result-to-field result-name="contactMechId" field="contactMechId"/>
</call-service>
<log level="info" message="Phone Contact created phoneContactMechId is ${contactMechId}"/>
<else>
<set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
<call-service service-name="updatePartyTelecomNumber" in-map="phoneContext">
- <result-to-field result-name="contactMechId" field-name="contactMechId"/>
+ <result-to-field result-name="contactMechId" field="contactMechId"/>
</call-service>
<log level="info" message="Phone Contact updated phoneContactMechId is ${contactMechId}"/>
</else>
@@ -965,13 +965,13 @@
<set-service-fields service-name="createPartyEmailAddress" map="parameters" to-map="emailAddressContext"/>
<set field="emailAddressContext.partyId" from-field="userLogin.partyId"/>
<call-service service-name="createPartyEmailAddress" in-map-name="emailAddressContext">
- <result-to-field result-name="contactMechId" field-name="contactMechId"/>
+ <result-to-field result-name="contactMechId" field="contactMechId"/>
</call-service>
<log level="info" message="Email Contact Created emailContactMechId is ${contactMechId}"></log>
<else>
<set-service-fields service-name="updatePartyEmailAddress" map="parameters" to-map="emailAddressContext"/>
<call-service service-name="updatePartyEmailAddress" in-map="emailAddressContext">
- <result-to-field result-name="contactMechId" field-name="contactMechId"/>
+ <result-to-field result-name="contactMechId" field="contactMechId"/>
</call-service>
<log level="info" message="Email Contact updated emailContactMechId is ${contactMechId}"></log>
</else>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Tue Dec 30 09:12:15 2008
@@ -94,11 +94,11 @@
<set field="partyContentMap.uploadedFile" from-field="byteWrap"/>
<set field="partyContentMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
<call-service service-name="createPartyContent" in-map-name="partyContentMap" break-on-error="false">
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<!-- set the partyId in the request -->
- <field-to-request field-name="partyId" map-name="formInput.formInput" request-name="partyId"/>
- <field-to-request field-name="contentId" request-name="contentId"/>
+ <field-to-request field="partyId" map-name="formInput.formInput" request-name="partyId"/>
+ <field-to-request field="contentId" request-name="contentId"/>
</simple-method>
<!-- Update party content -->
<simple-method method-name="updatePartyContent" short-description="Update Party Associated Content" login-required="false">
@@ -120,11 +120,11 @@
<set field="partyContentMap.uploadedFile" from-field="byteWrap"/>
<set field="partyContentMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
<call-service service-name="updatePartyContent" in-map-name="partyContentMap" break-on-error="false" >
- <result-to-field result-name="contentId" field-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<!-- set the partyId in the request -->
- <field-to-request field-name="partyId" map-name="formInput.formInput" request-name="partyId"/>
- <field-to-request field-name="contentId" request-name="contentId"/>
+ <field-to-request field="partyId" map-name="formInput.formInput" request-name="partyId"/>
+ <field-to-request field="contentId" request-name="contentId"/>
</simple-method>
</simple-methods>
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=730183&r1=730182&r2=730183&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 09:12:15 2008
@@ -115,7 +115,7 @@
<!-- now update with changing the email address, a new record will be created in ContactMech entity this time -->
<set field="serviceCtx.emailAddress" value="ofbiz-test@yahoo.com"/>
<call-service service-name="updatePartyEmailAddress" in-map-name="serviceCtx">
- <result-to-field result-name="contactMechId" field-name="newContactMechId"/>
+ <result-to-field result-name="contactMechId" field="newContactMechId"/>
</call-service>
<log level="info" message="====== New contactMechId [${newContactMechId}] for email address is created for party [${partyId}] ======"/>
<entity-one entity-name="ContactMech" value-field="contactMech">
@@ -166,7 +166,7 @@
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
</assert>
<clear-field field="telecomNumber"/>
- <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-name="telecomNumber"/>
+ <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-field="telecomNumber"/>
<assert>
<not><if-empty field="telecomNumber"/></not>
<if-compare-field field="telecomNumber.areaCode" to-field="serviceCtx.areaCode" operator="equals"/>
@@ -180,7 +180,7 @@
<!-- try now with changing the telecom number, a new record will be created in ContactMech, TelecomNumber entity this time -->
<set field="serviceCtx.contactNumber" value="444-4444"/>
<call-service service-name="updatePartyTelecomNumber" in-map-name="serviceCtx">
- <result-to-field result-name="contactMechId" field-name="newContactMechId"/>
+ <result-to-field result-name="contactMechId" field="newContactMechId"/>
</call-service>
<log level="info" message="====== New contactMechId [${newContactMechId}] for TelecomNumber is created for party [${partyId}] ======"/>
<entity-one entity-name="ContactMech" value-field="contactMech">
@@ -190,7 +190,7 @@
<not><if-empty field="contactMech"/></not>
<if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/>
</assert>
- <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-name="telecomNumber"/>
+ <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-field="telecomNumber"/>
<assert>
<not><if-empty field="telecomNumber"/></not>
<if-compare-field field="telecomNumber.contactNumber" to-field="serviceCtx.contactNumber" operator="equals"/>
@@ -235,7 +235,7 @@
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
</assert>
<clear-field field="postalAddress"/>
- <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-name="postalAddress"/>
+ <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-field="postalAddress"/>
<assert>
<not><if-empty field="postalAddress"/></not>
<if-compare-field field="postalAddress.address1" to-field="serviceCtx.address1" operator="equals"/>
@@ -251,7 +251,7 @@
<set field="serviceCtx.stateProvinceGeoId" value="VA"/>
<set field="serviceCtx.postalCode" value="20147"/>
<call-service service-name="updatePartyPostalAddress" in-map-name="serviceCtx">
- <result-to-field result-name="contactMechId" field-name="newContactMechId"/>
+ <result-to-field result-name="contactMechId" field="newContactMechId"/>
</call-service>
<log level="info" message="====== New contactMechId [${newContactMechId}] for PostalAddress is created for party [${partyId}] ======"/>
<entity-one entity-name="ContactMech" value-field="contactMech">
@@ -261,7 +261,7 @@
<not><if-empty field="contactMech"/></not>
<if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/>
</assert>
- <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-name="postalAddress"/>
+ <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-field="postalAddress"/>
<assert>
<not><if-empty field="postalAddress"/></not>
<if-compare-field field="postalAddress.stateProvinceGeoId" to-field="serviceCtx.stateProvinceGeoId" operator="equals"/>
@@ -402,7 +402,7 @@
<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"/>
+ <result-to-field result-name="communicationEventId" field="commEventMap.communicationEventId"/>
</call-service>
<call-simple-method method-name="testUpdateCommEvent"/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent">
@@ -441,7 +441,7 @@
<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"/>
+ <result-to-field result-name="custRequestId" field="requestMap.custRequestId"/>
</call-service>
<call-simple-method method-name="testUpdateRequest"/>
<entity-one entity-name="CustRequest" value-field="custRequest">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Dec 30 09:12:15 2008
@@ -391,7 +391,7 @@
<call-service service-name="createPartyContactMechPurpose" in-map-name="emailPurposeContext"/>
</if-not-empty>
<!-- set the partyId in the request -->
- <field-to-request field-name="partyId" map-name="tempMap" request-name="partyId"/>
+ <field-to-request field="partyId" map-name="tempMap" request-name="partyId"/>
<!--send New User Email Notification-->
<set field="emailContext.partyId" from-field="partyId"/>