OFBiz › OFBiz - Commits

svn commit: r730098 [4/9] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/scr...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r730098 [4/9] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/scr...

jleroux@apache.org
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 03:28:24 2008
@@ -74,7 +74,7 @@
             <set field="parameters.needsInventoryReceive" value="N"/>
         </if-empty>
 
-        <make-value value-name="newEntity" entity-name="ReturnHeader"/>
+        <make-value value-field="newEntity" entity-name="ReturnHeader"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <!-- If PartyAcctgPreference.useInvoiceIdForReturns is Y, get the ID from the getNextInvoiceId service -->
@@ -149,10 +149,10 @@
             <entity-condition entity-name="ReturnAdjustment" list-name="returnAdjustments" distinct="true">
                 <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/>
             </entity-condition>
-            <iterate entry="returnItem" list-name="returnItems">
+            <iterate entry="returnItem" list="returnItems">
                 <log level="verbose" message="item: ${returnItem.returnItemSeqId} ${returnItem.returnItemTypeId} [${returnItem.description}] ${returnItem.productId} ${returnItem.returnQuantity} ${returnItem.returnPrice}"/>
             </iterate>
-            <iterate entry="returnAdjustment" list-name="returnAdjustments">
+            <iterate entry="returnAdjustment" list="returnAdjustments">
                 <log level="verbose" message="adjustment: ${returnAdjustment.returnItemSeqId} ${returnAdjustment.returnAdjustmentTypeId} [${returnAdjustment.description}] ${returnAdjustment.amount}"/>
             </iterate>
             -->
@@ -162,7 +162,7 @@
             <calculate field-name="returnTotalAmount"><number value="0.0"/></calculate>
 
             <!-- check them all to make sure that the return total does not exceed order total.  -->
-            <iterate entry="returnItem" list-name="returnItems">
+            <iterate entry="returnItem" list="returnItems">
               <!-- check, for cross-ship returns, if a payment method is set to guarantee the cross-shipped item(s)..  -->
               <if>
                   <condition>
@@ -232,7 +232,7 @@
             <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments">
                 <field-map field-name="returnId" from-field="returnHeader.returnId"/>
             </entity-and>
-            <iterate entry="returnAdjustment" list-name="returnAdjustments">
+            <iterate entry="returnAdjustment" list="returnAdjustments">
                 <calculate field-name="returnTotalAmount">
                          <calcop field-name="returnTotalAmount" operator="add">
                              <calcop operator="get" field-name="amount" map-name="returnAdjustment"/>
@@ -306,7 +306,7 @@
 
         <!-- if an orderItemSeqId  is provided, then find the corresponding orderItem  -->
         <if-not-empty field="parameters.orderItemSeqId">
-            <make-value value-name="itemLookup" entity-name="OrderItem"/>
+            <make-value value-field="itemLookup" entity-name="OrderItem"/>
             <set-pk-fields map-name="parameters" value-name="itemLookup"/>
             <if-not-empty field="parameters.orderItemSeqId">
                 <find-by-primary-key entity-name="OrderItem" value-name="orderItem" map-name="itemLookup"/>
@@ -377,7 +377,7 @@
             </else>
         </if-compare>
 
-        <make-value value-name="newEntity" entity-name="ReturnItem"/>
+        <make-value value-field="newEntity" entity-name="ReturnItem"/>
         <!-- do a lookup to find the existing returnItems on this return, order by returnItemSeqId DESC, then get the first one
              and add 1 to returnItemSeqId to get the new returnItemSeqId -->
         <set from-field="parameters.returnId" field="newEntity.returnId"/>
@@ -415,7 +415,7 @@
                 <!-- create return adjustments for all adjustments associated with the order item -->
                 <if-not-empty field="orderItem">
                     <get-related value-name="orderItem" relation-name="OrderAdjustment" list-name="orderAdjustments"/>
-                    <iterate entry="orderAdjustment" list-name="orderAdjustments">
+                    <iterate entry="orderAdjustment" list="orderAdjustments">
                         <clear-field field-name="returnAdjCtx"/>
                         <set field="returnAdjCtx.returnId" from-field="parameters.returnId"/>
                         <set field="returnAdjCtx.returnItemSeqId" from-field="newEntity.returnItemSeqId"/>
@@ -447,7 +447,7 @@
             <field-map field-name="returnId" from-field="returnItem.returnId"/>
             <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
         </entity-and>
-        <iterate entry="returnAdjustment" list-name="returnAdjustments">
+        <iterate entry="returnAdjustment" list="returnAdjustments">
             <log level="info" message="updating returnAdjustment with Id:[${returnAdjustment.returnAdjustmentId}]"/>
             <set-service-fields service-name="updateReturnAdjustment" map-name="returnAdjustment" to-map-name="ctx"/>
             <set field="ctx.originalReturnPrice" from-field="originalReturnPrice"/>
@@ -463,7 +463,7 @@
 
         <set from-field="parameters.returnId" field="lookupPKMap.returnId"/>
         <find-by-and entity-name="ReturnItem" map-name="lookupPKMap" list-name="returnItems"/>
-        <iterate entry="item" list-name="returnItems">
+        <iterate entry="item" list="returnItems">
             <set field="item.statusId" from-field="parameters.statusId"/>
         </iterate>
         <store-list list-name="returnItems"/>
@@ -493,7 +493,7 @@
             <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
             <field-map field-name="returnId" from-field="returnItem.returnId"/>
         </entity-and>
-        <iterate entry="returnAdjustment" list-name="returnAdjustments">
+        <iterate entry="returnAdjustment" list="returnAdjustments">
             <set field="removeCtx.returnAdjustmentId" from-field="returnAdjustment.returnAdjustmentId"/>
             <call-service service-name="removeReturnAdjustment" in-map-name="removeCtx"/>
         </iterate>
@@ -511,7 +511,7 @@
         </if>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ReturnAdjustment"/>
+        <make-value value-field="newEntity" entity-name="ReturnAdjustment"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="ReturnAdjustment" env-name="newEntity.returnAdjustmentId"/>
         <field-to-result field-name="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/>
@@ -537,7 +537,7 @@
         <set from-field="parameters.returnId" field="lookupPKMap.returnId"/>
         <find-by-primary-key entity-name="ReturnHeader" map-name="lookupPKMap" value-name="returnHeader"/>
         <find-by-and entity-name="ShipmentReceipt" map-name="lookupPKMap" list-name="shipmentReceipts"/>
-        <iterate list-name="shipmentReceipts" entry-name="receipt">
+        <iterate list="shipmentReceipts" entry="receipt">
             <if-empty field="totalsMap.${receipt.returnItemSeqId}">
                 <calculate field-name="${receipt.returnItemSeqId}" map-name="totalsMap">
                     <number value="0"/>
@@ -563,7 +563,7 @@
                 
                 <!-- create status change history -->
                 <!-- TODO: this should be done with a createReturnStatus service call -->
-                <make-value entity-name="ReturnStatus" value-name="newReturnStatus"/>
+                <make-value entity-name="ReturnStatus" value-field="newReturnStatus"/>
                 <sequenced-id-to-env sequence-name="ReturnStatus" env-name="newReturnStatus.returnStatusId"/>
                 
                 <set field="newReturnStatus.returnId" from-field="returnItem.returnItemSeqId"/>
@@ -582,7 +582,7 @@
         <!-- check to see if all items have been received -->
         <set field="allReceived" value="true"/>
         <find-by-and entity-name="ReturnItem" map-name="lookupPKMap" list-name="allReturnItems"/>
-        <iterate list-name="allReturnItems" entry-name="item">
+        <iterate list="allReturnItems" entry="item">
             <if-compare field="item.statusId" operator="not-equals" value="RETURN_RECEIVED">
                 <if-not-empty field="item.orderItemSeqId">
                     <!-- non-order items (i.e. adjustments) are not received -->
@@ -597,7 +597,7 @@
             <!--  Go through all the items yet again and set their shipment status to PURCH_SHIP_RECEIVED (if it isn't already)
                 This activates SECAS such as creating return invoices. This MUST be done before updating the return header so that
                 the ReturnItemBillings are created and then whatever SECA binds to the return header update will have them. . -->
-            <iterate list-name="shipmentReceipts" entry-name="receipt">
+            <iterate list="shipmentReceipts" entry="receipt">
                 <get-related-one relation-name="Shipment" value-name="receipt" to-value-name="shipment"/>
                 <if-not-empty field="shipment.shipmentId">
                     <if-compare field="shipment.statusId" operator="not-equals" value="RETURN_RECEIVED">
@@ -613,7 +613,7 @@
             <set from-field="returnHeader.returnId" field="returnHeaderCtx.returnId"/>
             <call-service service-name="updateReturnHeader" in-map-name="returnHeaderCtx"/>
             <!-- create the status history -->
-            <make-value entity-name="ReturnStatus" value-name="newValue"/>
+            <make-value entity-name="ReturnStatus" value-field="newValue"/>
             <sequenced-id-to-env sequence-name="ReturnStatus" env-name="newValue.returnStatusId"/>
             
             <set field="newValue.returnId" from-field="returnHeader.returnId"/>
@@ -628,7 +628,7 @@
         <field-to-result field-name="statusId" map-name="returnHeader" result-name="returnHeaderStatus"/>
     </simple-method>
     <simple-method method-name="createReturnItemResponse" short-description="Create a ReturnItemResponse">
-        <make-value value-name="newEntity" entity-name="ReturnItemResponse"/>
+        <make-value value-field="newEntity" entity-name="ReturnItemResponse"/>
         <sequenced-id-to-env sequence-name="ReturnItemResponse" env-name="newEntity.returnItemResponseId"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -710,7 +710,7 @@
         </if-empty>
 
         <!-- create the return items -->
-        <iterate entry="orderItem" list-name="orderItems">
+        <iterate entry="orderItem" list="orderItems">
             <set from-field="returnId" field="newItemCtx.returnId"/>
             <set from-field="parameters.returnReasonId" field="newItemCtx.returnReasonId"/>
             <set from-field="parameters.returnTypeId" field="newItemCtx.returnTypeId"/>
@@ -782,7 +782,7 @@
                 <condition-expr field-name="orderItemSeqId" operator="equals" value="_NA_"/>
             </condition-list>
         </entity-condition>
-        <iterate entry="orderAdjustment" list-name="orderAdjustments">
+        <iterate entry="orderAdjustment" list="orderAdjustments">
             <clear-field field-name="returnAdjCtx"/>
             <set from-field="orderAdjustment.orderAdjustmentId" field="returnAdjCtx.orderAdjustmentId"/>
             <set from-field="returnId" field="returnAdjCtx.returnId"/>
@@ -863,7 +863,7 @@
     </simple-method>
 
     <simple-method method-name="createReturnItemBilling" short-description="Create a ReturnItemBilling">
-        <make-value entity-name="ReturnItemBilling" value-name="newEntity"/>
+        <make-value entity-name="ReturnItemBilling" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -875,7 +875,7 @@
         <entity-condition entity-name="ReturnItem" list-name="returnItems" distinct="true">
             <condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/>
         </entity-condition>
-        <iterate entry="returnItem" list-name="returnItems">
+        <iterate entry="returnItem" list="returnItems">
             <set field="returnItemMap.returnId" from-field="parameters.returnId"/>
             <set field="returnItemMap.returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
             <set field="returnItemMap.statusId" value="RETURN_CANCELLED" />
@@ -901,7 +901,7 @@
                 <!-- get the order items of the replacement order associated to the returned item  -->
                 <set field="oiaMap.orderItemAssocTypeId" value="REPLACEMENT"/>
                 <get-related value-name="orderItem" relation-name="FromOrderItemAssoc" map-name="oiaMap" list-name="replacementOrderItems"/>
-                <iterate list-name="replacementOrderItems" entry-name="replacementOrderItem">
+                <iterate list="replacementOrderItems" entry="replacementOrderItem">
                     <set field="orderItemMap.orderId" from-field="replacementOrderItem.toOrderId"/>
                     <set field="orderItemMap.orderItemSeqId" from-field="replacementOrderItem.toOrderItemSeqId"/>
                     <call-service service-name="cancelOrderItem" in-map-name="orderItemMap"/>
@@ -929,7 +929,7 @@
     <simple-method method-name="createReturnItemShipment" short-description="Create a ReturnItemShipment">
         <check-permission permission="ORDERMGR" action="_CREATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateReturnItemShipment"/></check-permission>
         <check-errors/>
-        <make-value value-name="newEntity" entity-name="ReturnItemShipment"/>
+        <make-value value-field="newEntity" entity-name="ReturnItemShipment"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 03:28:24 2008
@@ -93,7 +93,7 @@
         </check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="OrderShipment"/>
+        <make-value value-field="newEntity" entity-name="OrderShipment"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -130,7 +130,7 @@
         </check-permission>
         <check-errors/>
         -->
-        <make-value value-name="newEntity" entity-name="OrderRequirementCommitment"/>
+        <make-value value-field="newEntity" entity-name="OrderRequirementCommitment"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -365,7 +365,7 @@
                         <condition-expr field-name="statusId" operator="not-equals" value="REQ_REJECTED"/>
                     </condition-list>
                 </entity-condition>
-                <iterate entry="requirement" list-name="requirements">
+                <iterate entry="requirement" list="requirements">
                     <calculate field-name="existingRequirementTotal" type="Double">
                         <calcop operator="add" field-name="existingRequirementTotal">
                             <calcop operator="get" field-name="requirement.quantity"/>
@@ -401,7 +401,7 @@
             <field-map from-field="parameters.facilityId" field-name="facilityId"/>
         </entity-and>
 
-        <iterate list-name="products" entry-name="productFacility">
+        <iterate list="products" entry="productFacility">
             <set from-field="productFacility.productId" field="parameters.productId"/>
             <clear-field field-name="requirementMethodId"/>
             <call-simple-method method-name="getProductRequirementMethod"/>
@@ -524,7 +524,7 @@
         </check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="OrderHeader"/>
+        <make-value value-field="newEntity" entity-name="OrderHeader"/>
         <if-not-empty field="parameters.orderId">        
             <set field="newEntity.orderId" from-field="parameters.orderId"/>
         <else>
@@ -560,7 +560,7 @@
         <entity-one entity-name="OrderHeader" value-name="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-name="orderItems" entry-name="orderItem">
+        <iterate list="orderItems" entry="orderItem">
             <if>
                 <condition>
                     <and>
@@ -581,7 +581,7 @@
 
         <!-- Accumulate the total existing promotional adjustment -->
         <set field="existingOrderAdjustmentTotal" value="0" type="BigDecimal"/>        
-        <iterate list-name="orderAdjustments" entry-name="orderAdjustment">
+        <iterate list="orderAdjustments" entry="orderAdjustment">
             <if>
                 <condition>
                     <not><if-empty field="orderAdjustment.productPromoId"/></not>
@@ -605,12 +605,12 @@
             <result-to-field result-name="shoppingCart" field-name="cart"/>
         </call-service>
         <call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/>
-        <iterate list-name="items" entry-name="item">
+        <iterate list="items" entry="item">
             <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="orderItemSeqId"/>
             <if-empty field="orderItemSeqId">
                 <!-- this is a new (promo) item -->
                 <!-- a new order item is created -->
-                <make-value value-name="newOrderItem" entity-name="OrderItem"/>
+                <make-value value-field="newOrderItem" entity-name="OrderItem"/>
                 <set field="newOrderItem.orderId" from-field="parameters.orderId"/>
                 <call-object-method obj-field-name="item" method-name="getItemType" ret-field-name="newOrderItem.orderItemTypeId"/>
                 <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field-name="newOrderItem.selectedAmount"/>
@@ -637,7 +637,7 @@
 
         <!-- Accumulate the new promotion total from the recalculated promotion adjustments -->
         <set field="newOrderAdjustmentTotal" value="0" type="BigDecimal"/>        
-        <iterate list-name="adjustments" entry-name="adjustment">
+        <iterate list="adjustments" entry="adjustment">
             <if>
                 <condition>
                     <not><if-empty field="orderAdjustment.productPromoId"/></not>
@@ -680,7 +680,7 @@
            <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderContactMech"/>
         </check-permission>
         <check-errors/>
-        <make-value value-name="orderContactMechMap" entity-name="OrderContactMech"/>
+        <make-value value-field="orderContactMechMap" entity-name="OrderContactMech"/>
         <set-pk-fields map-name="parameters" value-name="orderContactMechMap"/>
         <set from-field="parameters.orderId" field="inputMap.orderId"/>
         <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/>
@@ -691,7 +691,7 @@
            <set field="orderItemShipGroupMap.contactMechId" from-field="parameters.oldContactMechId"/>    
            <find-by-and entity-name="OrderItemShipGroup" list-name="shipGroupList" map-name="orderItemShipGroupMap"/>
            <if-not-empty field="shipGroupList">
-              <iterate list-name="shipGroupList" entry-name="shipGroup">
+              <iterate list="shipGroupList" entry="shipGroup">
                  <set field="inputMap.shipGroupSeqId" from-field="shipGroup.shipGroupSeqId"/>  
                  <set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}"/>
                  <set field="inputMap.oldContactMechId" from-field="parameters.oldContactMechId"/>
@@ -723,7 +723,7 @@
             <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderItemShipGroup"/>
         </check-permission>
         <check-errors/>
-        <make-value value-name="lookupPKMap" entity-name="OrderItemShipGroup"/>
+        <make-value value-field="lookupPKMap" entity-name="OrderItemShipGroup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="OrderItemShipGroup" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <!-- splitting shipmentMethod request parameter value that contains "@" symbol
@@ -780,7 +780,7 @@
             <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateOrderContactMech"/>
         </check-permission>
         <check-errors/>
-        <make-value value-name="newEntity" entity-name="OrderContactMech"/>
+        <make-value value-field="newEntity" entity-name="OrderContactMech"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -810,7 +810,7 @@
         </check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="OrderTerm"/>
+        <make-value value-field="newEntity" entity-name="OrderTerm"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set value="_NA_" set-if-empty="true" field="newEntity.orderItemSeqId"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -884,7 +884,7 @@
     </simple-method>
     
     <simple-method method-name="createOrderItemChange" short-description="Creates a new Order Item Change record">
-        <make-value value-name="newEntity" entity-name="OrderItemChange"/>
+        <make-value value-field="newEntity" entity-name="OrderItemChange"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="parameters.changeDatetime">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -913,7 +913,7 @@
             <log level="info" message="Shipping address created with contactMechId ${shipToAddressCtx.shipToContactMechId}"/>
         <else>
             <if-compare field="keepAddressBook" operator="equals" value="Y">
-                <make-value entity-name="PostalAddress" value-name="newValue"/>
+                <make-value entity-name="PostalAddress" value-field="newValue"/>
                 <set-pk-fields value-name="newValue" map-name="shipToAddressCtx"/>
                 <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-name="oldValue"/>
                 <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/>
@@ -959,7 +959,7 @@
             <if-compare field="keepAddressBook" operator="equals" value="N">
                 <set field="shipToAddressCtx.shipToContactMechId" from-field="shipToAddressCtx.contactMechId"></set>
                 <if-compare-field field="shipToAddressCtx.shipToContactMechId" operator="equals" to-field="parameters.billToContactMechId">
-                    <make-value entity-name="PostalAddress" value-name="newValue"/>
+                    <make-value entity-name="PostalAddress" value-field="newValue"/>
                     <set-pk-fields value-name="newValue" map-name="shipToAddressCtx"/>
                     <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-name="oldValue"/>
                     <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/>

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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -85,7 +85,7 @@
         </if>
         <check-errors/>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newEntity" entity-name="Quote"/>
+        <make-value value-field="newEntity" entity-name="Quote"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.statusId">
             <set value="QUO_CREATED" field="newEntity.statusId"/>
@@ -165,7 +165,7 @@
         </call-service>
         <if-compare field="parameters.copyQuoteItems" value="Y" operator="equals">
             <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
-            <iterate list-name="quoteItems" entry-name="quoteItem">
+            <iterate list="quoteItems" entry="quoteItem">
                 <clear-field field-name="createQuoteItemInMap"/>
                 <set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="quoteItem"/>
                 <set from-field="quoteIdTo" field="createQuoteItemInMap.quoteIdTo"/>
@@ -176,7 +176,7 @@
 
         <if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals">
             <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
-            <iterate list-name="quoteAdjustments" entry-name="quoteAdjustment">
+            <iterate list="quoteAdjustments" entry="quoteAdjustment">
                 <if-empty field="quoteAdjustment.quoteItemSeqId">
                     <clear-field field-name="createQuoteAdjustmentInMap"/>
                     <set-service-fields service-name="createQuoteAdjustment" to-map-name="createQuoteAdjustmentInMap" map-name="quoteAdjustment"/>
@@ -188,7 +188,7 @@
         
         <if-compare field="parameters.copyQuoteRoles" value="Y" operator="equals">
             <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/>
-            <iterate list-name="quoteRoles" entry-name="quoteRole">
+            <iterate list="quoteRoles" entry="quoteRole">
                 <if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
                     <clear-field field-name="createQuoteRoleInMap"/>
                     <set-service-fields service-name="createQuoteRole" to-map-name="createQuoteRoleInMap" map-name="quoteRole"/>
@@ -200,7 +200,7 @@
 
         <if-compare field="parameters.copyQuoteAttributes" value="Y" operator="equals">
             <get-related value-name="quote" relation-name="QuoteAttribute" list-name="quoteAttributes"/>
-            <iterate list-name="quoteAttributes" entry-name="quoteAttribute">
+            <iterate list="quoteAttributes" entry="quoteAttribute">
                 <clear-field field-name="createQuoteAttributeInMap"/>
                 <set-service-fields service-name="createQuoteAttribute" to-map-name="createQuoteAttributeInMap" map-name="quoteAttribute"/>
                 <set from-field="quoteIdTo" field="createQuoteAttributeInMap.quoteId"/>
@@ -210,7 +210,7 @@
 
         <if-compare field="parameters.copyQuoteCoefficients" value="Y" operator="equals">
             <get-related value-name="quote" relation-name="QuoteCoefficient" list-name="quoteCoefficients"/>
-            <iterate list-name="quoteCoefficients" entry-name="quoteCoefficient">
+            <iterate list="quoteCoefficients" entry="quoteCoefficient">
                 <clear-field field-name="createQuoteCoefficientInMap"/>
                 <set-service-fields service-name="createQuoteCoefficient" to-map-name="createQuoteCoefficientInMap" map-name="quoteCoefficient"/>
                 <set from-field="quoteIdTo" field="createQuoteCoefficientInMap.quoteId"/>
@@ -242,12 +242,12 @@
         <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
         <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/>
         <if-empty field="partyRole.partyId">
-            <make-value value-name="partyRole" entity-name="PartyRole"/>
+            <make-value value-field="partyRole" entity-name="PartyRole"/>
             <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/>
             <create-value value-name="partyRole"/>
         </if-empty>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newEntity" entity-name="QuoteRole"/>
+        <make-value value-field="newEntity" entity-name="QuoteRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <check-errors/>
@@ -283,7 +283,7 @@
 
         <check-errors/>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newEntity" entity-name="QuoteItem"/>
+        <make-value value-field="newEntity" entity-name="QuoteItem"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <set from-field="parameters.quoteId" field="newEntity.quoteId"/>
@@ -394,7 +394,7 @@
                 
         <if-compare field="parameters.copyQuoteAdjustments" value="Y" operator="equals">
             <get-related value-name="quoteItem" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
-            <iterate list-name="quoteAdjustments" entry-name="quoteAdjustment">
+            <iterate list="quoteAdjustments" entry="quoteAdjustment">
                 <clear-field field-name="createQuoteAdjustmentInMap"/>
                 <set-service-fields service-name="createQuoteAdjustment" to-map-name="createQuoteAdjustmentInMap" map-name="quoteAdjustment"/>
                 <set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
@@ -413,7 +413,7 @@
         </check-permission>
         <check-errors/>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newEntity" entity-name="QuoteAttribute"/>
+        <make-value value-field="newEntity" entity-name="QuoteAttribute"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -452,7 +452,7 @@
         </check-permission>
         <check-errors/>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newEntity" entity-name="QuoteCoefficient"/>
+        <make-value value-field="newEntity" entity-name="QuoteCoefficient"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -500,8 +500,8 @@
         </if-empty>
         <check-errors/>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newQuote" entity-name="Quote"/>
-        <make-value value-name="newQuoteItem" entity-name="QuoteItem"/>
+        <make-value value-field="newQuote" entity-name="Quote"/>
+        <make-value value-field="newQuoteItem" entity-name="QuoteItem"/>
         <set-nonpk-fields map-name="parameters" value-name="newQuote"/>
         <set-nonpk-fields map-name="parameters" value-name="newQuoteItem"/>
         <if-empty field="newQuote.statusId">
@@ -527,10 +527,10 @@
         <create-value value-name="newQuote"/>
         <create-value value-name="newQuoteItem"/>
         <!-- copy the roles from the request to the quote-->
-        <make-value value-name="lookupRequestRole" entity-name="CustRequestParty"/>
+        <make-value value-field="lookupRequestRole" entity-name="CustRequestParty"/>
         <set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/>
         <find-by-and entity-name="CustRequestParty" map-name="lookupRequestRole" list-name="roles"/>
-        <iterate entry="role" list-name="roles">
+        <iterate entry="role" list="roles">
             <clear-field field-name="cqrContext"/>
             <set from-field="quoteId" field="cqrContext.quoteId"/>
             <set from-field="role.partyId" field="cqrContext.partyId"/>
@@ -574,7 +574,7 @@
         <entity-one entity-name="Quote" value-name="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-name="quoteItems" entry-name="quoteItem">
+        <iterate list="quoteItems" entry="quoteItem">
             <if-compare field="quoteItem.isPromo" value="Y" operator="equals">
                 <clear-field field-name="removeQuoteItemInMap"/>
                 <set-service-fields service-name="removeQuoteItem" to-map-name="removeQuoteItemInMap" map-name="parameters"/>
@@ -584,7 +584,7 @@
         </iterate>
         <!-- all existing auto quote adjustments are removed -->
         <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/>
-        <iterate list-name="quoteAdjustments" entry-name="quoteAdjustment">
+        <iterate list="quoteAdjustments" entry="quoteAdjustment">
             <!-- make sure this is not a manual adjustments -->
             <if-not-empty field="quoteAdjustment.productPromoId">
                 <clear-field field-name="removeQuoteAdjustmentInMap"/>
@@ -600,7 +600,7 @@
         </call-service>
 
         <call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/>
-        <iterate list-name="items" entry-name="item">
+        <iterate list="items" entry="item">
             <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="orderItemSeqId"/>
             <if-empty field="orderItemSeqId">
                 <!-- this is a new (promo) item -->
@@ -622,7 +622,7 @@
         </iterate>
         <!-- set the quoteUnitPrice from the item basePrice -->
         <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/>
-        <iterate list-name="quoteItems" entry-name="quoteItem">
+        <iterate list="quoteItems" entry="quoteItem">
             <if>
                 <condition>
                     <or>
@@ -645,7 +645,7 @@
 
         <call-object-method obj-field-name="cart" method-name="makeAllQuoteAdjustments" ret-field-name="adjustments"/>
 
-        <iterate list-name="adjustments" entry-name="adjustment">
+        <iterate list="adjustments" entry="adjustment">
             <set from-field="parameters.quoteId" field="adjustment.quoteId"/>
             <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="adjustment.quoteAdjustmentId"/>
             <create-value value-name="adjustment"/>
@@ -657,7 +657,7 @@
         </check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="QuoteAdjustment"/>
+        <make-value value-field="newEntity" entity-name="QuoteAdjustment"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="quoteAdjustmentId"/>
@@ -718,7 +718,7 @@
 
         <!-- create, for every cart item, a quote item -->
         <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
-        <iterate list-name="items" entry-name="item">
+        <iterate list="items" entry="item">
             <!-- a new quote item is created -->
             <clear-field field-name="createQuoteItemInMap"/>
             <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field-name="isPromo"/>
@@ -765,7 +765,7 @@
             </condition>
             <then>
                 <call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field-name="adjustments"/>
-                <iterate list-name="adjustments" entry-name="adjustment">
+                <iterate list="adjustments" entry="adjustment">
                     <set from-field="quote.quoteId" field="adjustment.quoteId"/>
                     <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="adjustment.quoteAdjustmentId"/>
                     <create-value value-name="adjustment"/>
@@ -833,7 +833,7 @@
         <check-errors/>
         
         <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems"/>
-        <iterate list-name="custRequestItems" entry-name="custRequestItem">
+        <iterate list="custRequestItems" entry="custRequestItem">
             <clear-field field-name="createQuoteItemInMap"/>
             <set field="createQuoteItemInMap.quoteId" from-field="quoteId"/>
             <set field="createQuoteItemInMap.custRequestId" from-field="custRequestItem.custRequestId"/>
@@ -849,7 +849,7 @@
         </iterate>
         <!-- roles -->
         <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="custRequestParties"/>
-        <iterate list-name="custRequestParties" entry-name="custRequestParty">
+        <iterate list="custRequestParties" entry="custRequestParty">
             <clear-field field-name="createQuoteRoleInMap"/>
             <!-- The REQ_TAKER role is automatically added by the createQuote service -->
             <if-compare field="custRequestParty.roleTypeId" value="REQ_TAKER" operator="not-equals">
@@ -865,7 +865,7 @@
 
     <!--Quote workeffort -->
     <simple-method method-name="createQuoteWorkEffort" short-description="Create a QuoteWorkEffort">
-        <make-value entity-name="QuoteWorkEffort" value-name="lookupMap"/>
+        <make-value entity-name="QuoteWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
         <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/>
         <if-not-empty field="quoteWorkEffort.quoteId">
@@ -880,7 +880,7 @@
         </if-empty>
     </simple-method>
     <simple-method method-name="deleteQuoteWorkEffort" short-description="Delete a QuoteWorkEffort">
-        <make-value entity-name="QuoteWorkEffort" value-name="lookupMap"/>
+        <make-value entity-name="QuoteWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
         <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/>
         <if-empty field="quoteWorkEffort.quoteId">

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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -49,7 +49,7 @@
     </simple-method>
 
     <simple-method method-name="createCustRequest" short-description="Create Customer Request">
-        <make-value value-name="newEntity" entity-name="CustRequest"/>
+        <make-value value-field="newEntity" entity-name="CustRequest"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
         <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -134,7 +134,7 @@
                 <!-- check for related workefforts ...and when no time recorded cancel these too -->
                 <get-related value-name="custRequest" relation-name="CustRequestWorkEffort" list-name="workEfforts"/>
                 <if-not-empty field="workEfforts">
-                    <iterate entry="workEffort" list-name="workEfforts">
+                    <iterate entry="workEffort" list="workEfforts">
                         <entity-one entity-name="WorkEffort" value-name="lowInfo">
                             <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/>
                         </entity-one>
@@ -184,7 +184,7 @@
     </simple-method>
 
     <simple-method method-name="createCustRequestAttribute" short-description="Create Customer Request Attribute">
-        <make-value value-name="newEntity" entity-name="CustRequestAttribute"/>
+        <make-value value-field="newEntity" entity-name="CustRequestAttribute"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -198,7 +198,7 @@
     </simple-method>
 
     <simple-method method-name="createCustRequestItem" short-description="Create Customer Request Item">
-        <make-value value-name="newEntity" entity-name="CustRequestItem"/>
+        <make-value value-field="newEntity" entity-name="CustRequestItem"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="parameters.custRequestItemSeqId">
@@ -224,11 +224,11 @@
         <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
         <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/>
         <if-empty field="partyRole.partyId">
-            <make-value value-name="partyRole" entity-name="PartyRole"/>
+            <make-value value-field="partyRole" entity-name="PartyRole"/>
             <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/>
             <create-value value-name="partyRole"/>
         </if-empty>
-        <make-value value-name="newEntity" entity-name="CustRequestParty"/>
+        <make-value value-field="newEntity" entity-name="CustRequestParty"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.fromDate">
@@ -248,7 +248,7 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createCustRequestNote" short-description="Create Customer Request Note">
-        <make-value value-name="newEntity" entity-name="CustRequestNote"/>
+        <make-value value-field="newEntity" entity-name="CustRequestNote"/>
         <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/>
         <set from-field="parameters.noteInfo" field="newNoteMap.note"/>
         <call-service service-name="createNote" in-map-name="newNoteMap">
@@ -266,7 +266,7 @@
         <store-value value-name="lookedUpValueForNoteData"/>
     </simple-method>
     <simple-method method-name="createCustRequestItemNote" short-description="Create Customer RequestItem Note">
-        <make-value value-name="newEntity" entity-name="CustRequestItemNote"/>
+        <make-value value-field="newEntity" entity-name="CustRequestItemNote"/>
         <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/>
         <set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/>
         <set from-field="parameters.note" field="newNoteMap.note"/>
@@ -306,7 +306,7 @@
 
         <!-- create, for every cart item, a request item -->
         <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
-        <iterate list-name="items" entry-name="item">
+        <iterate list="items" entry="item">
             <!-- a new request item is created -->
             <clear-field field-name="createCustRequestItemInMap"/>
             <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field-name="configWrapper"/>
@@ -374,7 +374,7 @@
                 
         <if-compare field="parameters.copyLinkedQuotes" value="Y" operator="equals">
             <get-related value-name="custRequestItem" relation-name="QuoteItem" list-name="quoteItems"/>
-            <iterate list-name="quoteItems" entry-name="quoteItem">
+            <iterate list="quoteItems" entry="quoteItem">
                 <clear-field field-name="createQuoteItemInMap"/>
                 <set-service-fields service-name="createQuoteItem" to-map-name="createQuoteItemInMap" map-name="quoteItem"/>
                 <set field="createQuoteItemInMap.custRequestId" from-field="custRequestIdTo"/>
@@ -388,7 +388,7 @@
     </simple-method>
 
     <simple-method method-name="createCustRequestStatus" short-description="Create Customer Request Status">
-        <make-value value-name="newEntity" entity-name="CustRequestStatus"/>
+        <make-value value-field="newEntity" entity-name="CustRequestStatus"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="custRequestStatusId"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.statusDatetime">
@@ -456,7 +456,7 @@
         <entity-and entity-name="CommEventContentAssoc" list-name="custRequestContents">
             <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
         </entity-and>
-        <iterate entry="custRequestContent" list-name="custRequestContents">
+        <iterate entry="custRequestContent" list="custRequestContents">
             <set field="reqContent.custRequestId" from-field="parameters.custRequestId"/>
             <set field="reqContent.contentId" from-field="custRequestContent.contentId"/>
             <call-service service-name="createCustRequestContent" in-map-name="reqContent"/>
@@ -472,7 +472,7 @@
     
     <!-- Create/Delete  CustRequest Content -->    
     <simple-method method-name="createCustRequestContent" short-description="Create Work Effort Content">
-        <make-value entity-name="CustRequestContent" value-name="newEntity"/>
+        <make-value entity-name="CustRequestContent" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 03:28:24 2008
@@ -21,7 +21,7 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createRequirement" short-description="Create a new requirement">
-        <make-value value-name="newEntity" entity-name="Requirement"/>
+        <make-value value-field="newEntity" entity-name="Requirement"/>
         <sequenced-id-to-env sequence-name="Requirement" env-name="requirementId"/>
         <to-string field-name="requirementId"/>
         <set from-field="requirementId" field="newEntity.requirementId"/>
@@ -36,7 +36,7 @@
     </simple-method>
 
     <simple-method method-name="updateRequirement" short-description="Update a requirement">
-        <make-value value-name="lookupPKMap" entity-name="Requirement"/>
+        <make-value value-field="lookupPKMap" entity-name="Requirement"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="Requirement" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
@@ -53,14 +53,14 @@
     </simple-method>
 
     <simple-method method-name="associateRequirementWithRequestItem" short-description="Associate a requirement and CustRequestItem">
-        <make-value value-name="newEntity" entity-name="RequirementCustRequest"/>
+        <make-value value-field="newEntity" entity-name="RequirementCustRequest"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
 
     <simple-method method-name="addTaskToRequirement" short-description="Add a task to a requirement">
-        <make-value value-name="newEntity" entity-name="WorkRequirementFulfillment"/>
+        <make-value value-field="newEntity" entity-name="WorkRequirementFulfillment"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -81,7 +81,7 @@
                 <filter-list-by-date list-name="supplierProducts" valid-date-name="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
                 <first-from-list list="supplierProducts" entry="supplierProduct"/>
                 <if-not-empty field="supplierProduct.partyId">
-                    <make-value value-name="requirementSupplier" entity-name="RequirementRole"/>
+                    <make-value value-field="requirementSupplier" entity-name="RequirementRole"/>
                     <set field="requirementSupplier.requirementId" from-field="requirement.requirementId"/>
                     <set field="requirementSupplier.partyId" from-field="supplierProduct.partyId"/>
                     <set field="requirementSupplier.roleTypeId" value="SUPPLIER"/>
@@ -102,12 +102,12 @@
         <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
         <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/>
         <if-empty field="partyRole.partyId">
-            <make-value value-name="partyRole" entity-name="PartyRole"/>
+            <make-value value-field="partyRole" entity-name="PartyRole"/>
             <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/>
             <create-value value-name="partyRole"/>
         </if-empty>
         <!-- create new entity and create all the fields -->
-        <make-value value-name="newEntity" entity-name="RequirementRole"/>
+        <make-value value-field="newEntity" entity-name="RequirementRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.fromDate">

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 03:28:24 2008
@@ -35,7 +35,7 @@
         </if>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ShoppingList"/>
+        <make-value value-field="newEntity" entity-name="ShoppingList"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
         <if-empty field="newEntity.partyId">
@@ -123,7 +123,7 @@
             <add-error> <fail-property property="ProductErrorProductNotFound" resource="ProductUiLabels"/> </add-error>
             <check-errors/>
         </if-empty>
-        <make-value value-name="newEntity" entity-name="ShoppingListItem"/>
+        <make-value value-field="newEntity" entity-name="ShoppingListItem"/>
         <set from-field="parameters.shoppingListId" field="newEntity.shoppingListId"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/>
 
@@ -186,7 +186,7 @@
             <condition-expr field-name="shoppingListId" env-name="parameters.shoppingListId" />
         </entity-condition>
 
-        <iterate list-name="shoppingListItemList" entry-name="shoppingListItem">
+        <iterate list="shoppingListItemList" entry="shoppingListItem">
             <if-compare-field field="parameters.productId" to-field="shoppingListItem.productId" operator="equals">
                 <field-to-result field-name="shoppingListItem.shoppingListItemSeqId" result-name="shoppingListItemSeqId" />
                 <return />
@@ -216,7 +216,7 @@
         </entity-and>
 
         <set field="totalPrice" type="Double" value="0.0"/>
-        <iterate entry="shoppingListItem" list-name="shoppingListItems">
+        <iterate entry="shoppingListItem" list="shoppingListItems">
             <entity-one entity-name="Product" value-name="product" use-cache="true" auto-field-map="false">
                 <field-map field-name="productId" from-field="shoppingListItem.productId"/>
             </entity-one>
@@ -241,7 +241,7 @@
             <field-map field-name="parentShoppingListId" from-field="parameters.shoppingListId"/>
             <field-map field-name="partyId" from-field="userLogin.partyId"/>
         </entity-and>
-        <iterate entry="childshoppingList" list-name="childshoppingLists">
+        <iterate entry="childshoppingList" list="childshoppingLists">
             <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">
@@ -325,7 +325,7 @@
             <condition-expr field-name="orderId" env-name="parameters.orderId" />
             <order-by field-name="orderItemSeqId" />
         </entity-condition>
-        <iterate list-name="orderItemList" entry-name="orderItem">
+        <iterate list="orderItemList" entry="orderItem">
             <if-not-empty field="orderItem.productId">
                 <entity-condition entity-name="ProductAssoc" list-name="compProductAssocList" filter-by-date="true">
                     <condition-list combine="and">
@@ -333,7 +333,7 @@
                         <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" />
                     </condition-list>
                 </entity-condition>
-                <iterate list-name="compProductAssocList" entry-name="compProductAssoc">
+                <iterate list="compProductAssocList" entry="compProductAssoc">
                     <clear-field field-name="shoppingListParameters" />
                     <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" />
                     <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" />
@@ -358,7 +358,7 @@
                                 <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" />
                             </condition-list>
                         </entity-condition>
-                        <iterate list-name="compProductAssocList" entry-name="compProductAssoc">
+                        <iterate list="compProductAssocList" entry="compProductAssoc">
                             <clear-field field-name="shoppingListParameters" />
                             <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" />
                             <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" />

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:28:24 2008
@@ -52,7 +52,7 @@
             <set value="COM_ENTERED" field="parameters.statusId"/>    
         </if-empty>
 
-        <make-value value-name="newEntity" entity-name="CommunicationEvent"/>
+        <make-value value-field="newEntity" entity-name="CommunicationEvent"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
         <if-empty field="parameters.communicationEventId">
@@ -79,19 +79,19 @@
         <create-value value-name="newEntity"/>
 
         <if-not-empty field="parameters.productId">
-            <make-value value-name="eventProduct" entity-name="CommunicationEventProduct"/>
+            <make-value value-field="eventProduct" entity-name="CommunicationEventProduct"/>
             <set from-field="parameters.productId" field="eventProduct.productId"/>
             <set from-field="newEntity.communicationEventId" field="eventProduct.communicationEventId"/>
             <create-value value-name="eventProduct"/>
         </if-not-empty>
         <if-not-empty field="parameters.orderId">
-            <make-value value-name="eventOrder" entity-name="CommunicationEventOrder"/>
+            <make-value value-field="eventOrder" entity-name="CommunicationEventOrder"/>
             <set from-field="parameters.orderId" field="eventOrder.orderId"/>
             <set from-field="newEntity.communicationEventId" field="eventOrder.communicationEventId"/>
             <create-value value-name="eventOrder"/>
         </if-not-empty>
         <if-not-empty field="parameters.custReqId">
-            <make-value value-name="eventRequest" entity-name="CustRequestCommEvent"/>
+            <make-value value-field="eventRequest" entity-name="CustRequestCommEvent"/>
             <set from-field="parameters.custReqId" field="eventRequest.custReqId"/>
             <set from-field="newEntity.communicationEventId" field="eventRequest.communicationEventId"/>
             <create-value value-name="eventRequest"/>
@@ -199,13 +199,13 @@
         <!-- remove related links to content -->
         <get-related value-name="event" relation-name="CommEventContentAssoc" list-name="contentAssocs"/>
         <if-not-empty field="contentAssocs">
-            <iterate entry="contentAssoc" list-name="contentAssocs">
+            <iterate entry="contentAssoc" list="contentAssocs">
                 <remove-value value-name="contentAssoc"/>
                 <!-- delete content and dataresource too if requested -->
                 <if-compare field="parameters.delContentDataResource" value="Y" operator="equals">
                     <get-related value-name="contentAssoc" relation-name="FromContent" list-name="contents"/>
                     <if-not-empty field="contents">
-                        <iterate entry="content" list-name="contents">
+                        <iterate entry="content" list="contents">
                             <remove-related value-name="content" relation-name="ContentRole"/>
                             <remove-value value-name="content"/>
                             <get-related-one value-name="content" relation-name="DataResource" to-value-name="dataResource"/>
@@ -236,7 +236,7 @@
         <!-- 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">
-            <iterate entry="workEffortCom" list-name="workEffortComs">
+            <iterate entry="workEffortCom" list="workEffortComs">
                 <remove-value value-name="workEffortCom"/>
                 <get-related-one value-name="workEffortCom" relation-name="WorkEffort" to-value-name="workEffort"/>
                 <get-related value-name="workEffort" relation-name="CommunicationEventWorkEff" list-name="otherComs"/>
@@ -257,7 +257,7 @@
         they will all use the CME_UPDATE permission -->
     <simple-method method-name="createCommunicationEventPurpose" short-description="Create a CommunicationEventPurpose">
         
-        <make-value value-name="newEntity" entity-name="CommunicationEventPurpose"/>
+        <make-value value-field="newEntity" entity-name="CommunicationEventPurpose"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
         <create-value value-name="newEntity"/>    
@@ -278,7 +278,7 @@
             <set field="partyRole.userLogin" from-field="sysUserLogin"/>
             <call-service service-name="createPartyRole" in-map-name="partyRole" include-user-login="false"/>
             
-            <make-value value-name="newEntity" entity-name="CommunicationEventRole" />
+            <make-value value-field="newEntity" entity-name="CommunicationEventRole" />
             <set-pk-fields map-name="parameters" value-name="newEntity" />
             <set-nonpk-fields map-name="parameters" value-name="newEntity" />
             <if-empty field="newEntity.statusId">
@@ -356,7 +356,7 @@
                 </condition-list>
             </condition-list>
         </entity-condition>
-        <iterate entry="communicationEvent" list-name="communicationEvents">
+        <iterate entry="communicationEvent" list="communicationEvents">
             <set-service-fields service-name="sendCommEventAsEmail" map-name="communicationEvent" to-map-name="inMap"/>
             <call-service service-name="sendCommEventAsEmail" in-map-name="inMap" require-new-transaction="true"/>
         </iterate>
@@ -424,7 +424,7 @@
     </simple-method>
 
     <simple-method method-name="createCustRequestCommEvent" short-description="Create CustRequestCommEvent" >
-        <make-value value-name="newEntity" entity-name="CustRequestCommEvent"/>
+        <make-value value-field="newEntity" entity-name="CustRequestCommEvent"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>    
     </simple-method>
@@ -447,7 +447,7 @@
                     <!-- if complete, set all role status fields to 'complete' (intentionally ignoring the status change checking)-->
                     <if-compare operator="equals" value="COM_COMPLETE" field="parameters.statusId">
                         <get-related value-name="communicationEvent" relation-name="CommunicationEventRole" list-name="updRoles"/>
-                        <iterate entry="updRole" list-name="updRoles">
+                        <iterate entry="updRole" list="updRoles">
                             <set field="updRole.statusId" value="COM_ROLE_COMPLETED"/>
                             <store-value value-name="updRole"/>
                         </iterate>

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 03:28:24 2008
@@ -21,7 +21,7 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createContactMech" short-description="Create Contact Mechanism">
-        <make-value value-name="newValue" entity-name="ContactMech"/>
+        <make-value value-field="newValue" entity-name="ContactMech"/>
         <if-empty field="parameters.contactMechId">
             <sequenced-id-to-env sequence-name="ContactMech" env-name="newValue.contactMechId"/>
             <else>
@@ -61,7 +61,7 @@
             <set field="successMessageProperty" value="PartyDomainNameSuccessfullyUpdated"/>
         </if-compare>
 
-        <make-value entity-name="ContactMech" value-name="ContactMechMap"/>
+        <make-value entity-name="ContactMech" value-field="ContactMechMap"/>
         <set-pk-fields value-name="ContactMechMap" map-name="parameters"/>
         <find-by-primary-key entity-name="ContactMech" map-name="ContactMechMap" value-name="oldValue" />
         <if-compare-field to-field="oldValue.infoString" field="parameters.infoString" operator="not-equals">
@@ -100,7 +100,7 @@
           </if-empty>
         </if-compare>                        
         <check-errors/>
-        <make-value entity-name="PostalAddress" value-name="newValue"/>
+        <make-value entity-name="PostalAddress" value-field="newValue"/>
         <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/>
         <call-service service-name="createContactMech" in-map-name="context">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
@@ -128,7 +128,7 @@
           </if-empty>
         </if-compare>                        
         <check-errors/>
-        <make-value entity-name="PostalAddress" value-name="newValue"/>
+        <make-value entity-name="PostalAddress" value-field="newValue"/>
         <set-pk-fields value-name="newValue" map-name="parameters"/>
         <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-name="oldValue" />
         <set-nonpk-fields map-name="parameters" value-name="newValue"/>
@@ -163,7 +163,7 @@
     </simple-method>
     
     <simple-method method-name="createTelecomNumber" short-description="Create Contact Mechanism with Telecom Number">
-        <make-value entity-name="TelecomNumber" value-name="newValue"/>
+        <make-value entity-name="TelecomNumber" value-field="newValue"/>
         <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/>
         <call-service service-name="createContactMech" in-map-name="context">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
@@ -176,7 +176,7 @@
     </simple-method>
     
     <simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number">
-        <make-value entity-name="TelecomNumber" value-name="newValue"/>
+        <make-value entity-name="TelecomNumber" value-field="newValue"/>
         <set-pk-fields value-name="newValue" map-name="parameters"/>
         <find-by-primary-key entity-name="TelecomNumber" map-name="newValue" value-name="oldValue" />
         <set-nonpk-fields map-name="parameters" value-name="newValue"/>
@@ -234,14 +234,14 @@
    <simple-method method-name="createContactMechLink" short-description="Create a link between two ContactMechs, such as PostalAddress and TelecomNumber or email">
        <!--TODO: need security check of some sort? -->
        <check-errors/>
-       <make-value value-name="newEntity" entity-name="ContactMechLink"/>
+       <make-value value-field="newEntity" entity-name="ContactMechLink"/>
        <set-pk-fields map-name="parameters" value-name="newEntity"/>
        <create-value value-name="newEntity"/>
    </simple-method>
    <simple-method method-name="deleteContactMechLink" short-description="Delete a link between two ContactMechs">
        <!--TODO: need security check of some sort? -->
        <check-errors/>
-       <make-value value-name="lookupPKMap" entity-name="ContactMechLink"/>
+       <make-value value-field="lookupPKMap" entity-name="ContactMechLink"/>
        <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
        <find-by-primary-key entity-name="ContactMechLink" map-name="lookupPKMap" value-name="contactMechLinkInstance"/>
        <remove-value value-name="contactMechLinkInstance"/>
@@ -249,7 +249,7 @@
 
     <!-- contactmech attribute services -->
     <simple-method method-name="createContactMechAttribute" short-description="createContactMechAttribute">
-        <make-value value-name="newEntity" entity-name="ContactMechAttribute"/>
+        <make-value value-field="newEntity" entity-name="ContactMechAttribute"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>

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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 03:28:24 2008
@@ -21,8 +21,8 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createPartyContactMech" short-description="Create a PartyContactMech">
-        <make-value entity-name="PartyContactMech" value-name="newValue"/>
-        <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/><!-- DEJ20061016: is this really needed? doesn't seem to be used... -->
+        <make-value entity-name="PartyContactMech" value-field="newValue"/>
+        <make-value entity-name="PartyContactMech" value-field="newPartyContactMech"/><!-- DEJ20061016: is this really needed? doesn't seem to be used... -->
         <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
@@ -31,7 +31,7 @@
         <entity-and list="partyAndContactMechs" entity-name="PartyAndContactMech" filter-by-date="true">
             <field-map field-name="partyId" from-field="parameters.partyId"/>
         </entity-and>
-        <iterate entry="partyAndContactMech" list-name="partyAndContactMechs">
+        <iterate entry="partyAndContactMech" list="partyAndContactMechs">
             <entity-one entity-name="ContactMechType" value-name="contactMechType">
                 <field-map field-name="contactMechTypeId" from-field="partyAndContactMech.contactMechTypeId"/>
             </entity-one>
@@ -69,13 +69,13 @@
     </simple-method>
     
     <simple-method method-name="updatePartyContactMech" short-description="Update a PartyContactMech">
-        <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
+        <make-value entity-name="PartyContactMech" value-field="newPartyContactMech"/>
         <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
         <!-- Find old value -->
-        <make-value entity-name="PartyContactMech" value-name="partyContactMechMap"/>
+        <make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/>
         <set-pk-fields value-name="partyContactMechMap" map-name="parameters"/>
         <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
         <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
@@ -110,7 +110,7 @@
         
         <if-compare-field to-field="newPartyContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
             <get-related value-name="partyContactMech" relation-name="PartyContactMechPurpose" list-name="partyContactMechPurposes"/>  
-            <iterate entry="partyContactMechPurposeOld" list-name="partyContactMechPurposes">
+            <iterate entry="partyContactMechPurposeOld" list="partyContactMechPurposes">
                 <clone-value value-name="partyContactMechPurposeOld" new-value-name="partyContactMechPurpose"/>
                 <now-timestamp-to-env env-name="partyContactMechPurposeOld.thruDate"/>
                 <store-value value-name="partyContactMechPurposeOld"/>
@@ -133,12 +133,12 @@
     </simple-method>    
     
     <simple-method method-name="deletePartyContactMech" short-description="Delete a PartyContactMech">
-        <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
+        <make-value entity-name="PartyContactMech" value-field="newPartyContactMech"/>
         <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
-        <make-value entity-name="PartyContactMech" value-name="partyContactMechMap"/>
+        <make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/>
         <set-pk-fields value-name="partyContactMechMap" map-name="parameters"/>
         <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
         <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
@@ -177,7 +177,7 @@
     </simple-method>
     
     <simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party">
-        <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
+        <make-value entity-name="PartyContactMech" value-field="newPartyContactMech"/>
         <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
@@ -224,7 +224,7 @@
     </simple-method>
     
     <simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party">
-        <make-value entity-name="PartyContactMech" value-name="newPartyContactMech"/>
+        <make-value entity-name="PartyContactMech" value-field="newPartyContactMech"/>
         <if-empty field="parameters.partyId">
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
     <simple-method method-name="createPartyContent" short-description="Create Party Content Entity">
-        <make-value value-name="partyContent" entity-name="PartyContent"/>
+        <make-value value-field="partyContent" entity-name="PartyContent"/>
         <set-pk-fields value-name="partyContent" map-name="parameters"/>
         <set-nonpk-fields value-name="partyContent" map-name="parameters"/>
 
@@ -35,7 +35,7 @@
     </simple-method>
 
     <simple-method method-name="updatePartyContent" short-description="Update Party Content Entity">
-        <make-value value-name="lookupPkMap" entity-name="PartyContent"/>
+        <make-value value-field="lookupPkMap" entity-name="PartyContent"/>
         <set-pk-fields value-name="lookupPkMap" map-name="parameters"/>
 
         <find-by-primary-key map-name="lookupPkMap" value-name="partyContent"/>
@@ -44,7 +44,7 @@
     </simple-method>
 
     <simple-method method-name="removePartyContent" short-description="Update Party Content Entity">
-        <make-value value-name="lookupPkMap" entity-name="PartyContent"/>
+        <make-value value-field="lookupPkMap" entity-name="PartyContent"/>
         <set-pk-fields value-name="lookupPkMap" map-name="parameters"/>
 
         <find-by-primary-key map-name="lookupPkMap" value-name="partyContent"/>

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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -69,7 +69,7 @@
             </if-not-empty>
         </if-not-empty>
 
-        <make-value entity-name="UserLogin" value-name="newUserLogin"/>
+        <make-value entity-name="UserLogin" value-field="newUserLogin"/>
         <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId" />
         <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" />
         <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" />
@@ -242,7 +242,7 @@
         </if-compare>
 
         <!-- create the PartyDataSource entry to track where this info came from... -->
-        <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
+        <make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
         <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
         <set field="partyDataSource.fromDate" from-field="nowStamp" />
         <set field="partyDataSource.isCreate" value="Y" />

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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -23,7 +23,7 @@
 
     <!-- Party Invitation Services -->
     <simple-method method-name="createPartyInvitation" short-description="Create a PartyInvitation">
-        <make-value entity-name="PartyInvitation" value-name="newEntity"/>
+        <make-value entity-name="PartyInvitation" value-field="newEntity"/>
         <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">
@@ -53,7 +53,7 @@
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createPartyInvitationGroupAssoc" short-description="Create a PartyInvitationGroupAssoc">
-        <make-value entity-name="PartyInvitationGroupAssoc" value-name="newEntity"/>
+        <make-value entity-name="PartyInvitationGroupAssoc" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>        
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -62,7 +62,7 @@
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createPartyInvitationRoleAssoc" short-description="Create a PartyInvitationRoleAssoc">
-        <make-value entity-name="PartyInvitationRoleAssoc" value-name="newEntity"/>
+        <make-value entity-name="PartyInvitationRoleAssoc" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>        
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -77,7 +77,7 @@
         <if-not-empty field="partyInvitationGroupAssocs">
             <set field="createPartyRelationshipCtx.partyIdTo" from-field="parameters.partyId"/>
             <set field="createPartyRelationshipCtx.partyRelationshipTypeId" value="GROUP_ROLLUP"/>            
-            <iterate list-name="partyInvitationGroupAssocs" entry-name="partyInvitationGroupAssoc">
+            <iterate list="partyInvitationGroupAssocs" entry="partyInvitationGroupAssoc">
                 <set field="createPartyRelationshipCtx.partyIdFrom" from-field="partyInvitationGroupAssoc.partyIdTo"/>
                 <call-service service-name="createPartyRelationship" in-map-name="createPartyRelationshipCtx"/>
             </iterate>
@@ -87,7 +87,7 @@
         </entity-and>
         <if-not-empty field="partyInvitationRoleAssocs">
             <set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/>
-            <iterate list-name="partyInvitationRoleAssocs" entry-name="partyInvitationRoleAssoc">
+            <iterate list="partyInvitationRoleAssocs" entry="partyInvitationRoleAssoc">
                 <set field="createPartyRoleCtx.roleTypeId" from-field="partyInvitationRoleAssoc.roleTypeId"/>
                 <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
             </iterate>


Free forum by Nabble Edit this page