You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 12:28:28 UTC
svn commit: r730098 [8/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...
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 03:28:24 2008
@@ -24,7 +24,7 @@
<check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run createShipmentReceipt you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentReceipt"/>
+ <make-value value-field="newEntity" entity-name="ShipmentReceipt"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="ShipmentReceipt" env-name="receiptId"/>
@@ -54,7 +54,7 @@
<check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run createShipmentReceiptRole you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentReceiptRole"/>
+ <make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -65,7 +65,7 @@
<check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run removeShipmentReceiptRole you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentReceiptRole"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentReceiptRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -226,7 +226,7 @@
</entity-count>
<set field="nonProductItems" type="Long" value="0"/>
- <iterate entry="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list="returnItems">
<!-- record this return item on the return shipment as well. not sure if this is actually necessary... -->
<clear-field field-name="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
@@ -237,7 +237,7 @@
<result-to-field result-name="shipmentItemSeqId"/>
</call-service>
</iterate>
- <iterate entry="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list="returnItems">
<clear-field field-name="receiveCtx"/>
<if-empty field="returnItem.expectedItemStatus">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 03:28:24 2008
@@ -27,7 +27,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="Shipment"/>
+ <make-value value-field="newEntity" entity-name="Shipment"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-not-empty field="parameters.shipmentId">
@@ -95,7 +95,7 @@
<!-- get the ShipmentStatus history started -->
<if-not-empty field="newEntity.statusId">
- <make-value entity-name="ShipmentStatus" value-name="newStatusValue"/>
+ <make-value entity-name="ShipmentStatus" value-field="newStatusValue"/>
<set from-field="newEntity.statusId" field="newStatusValue.statusId"/>
<set from-field="newEntity.shipmentId" field="newStatusValue.shipmentId"/>
<now-timestamp-to-env env-name="newStatusValue.statusDate"/>
@@ -109,7 +109,7 @@
<set value="Update Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
- <make-value value-name="lookupPKMap" entity-name="Shipment"/>
+ <make-value value-field="lookupPKMap" entity-name="Shipment"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -127,7 +127,7 @@
<string-to-list string="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." list-name="error_list"/>
</if-empty>
- <make-value entity-name="ShipmentStatus" value-name="newStatusValue"/>
+ <make-value entity-name="ShipmentStatus" value-field="newStatusValue"/>
<set from-field="parameters.statusId" field="newStatusValue.statusId"/>
<set from-field="parameters.shipmentId" field="newStatusValue.shipmentId"/>
<now-timestamp-to-env env-name="newStatusValue.statusDate"/>
@@ -310,7 +310,7 @@
<entity-condition entity-name="ReturnItem" list-name="returnItems">
<condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/>
</entity-condition>
- <iterate entry="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list="returnItems">
<clear-field field-name="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
@@ -342,7 +342,7 @@
<entity-condition entity-name="ReturnItem" list-name="returnItems">
<condition-expr field-name="returnId" operator="equals" env-name="parameters.primaryReturnId"/>
</entity-condition>
- <iterate entry="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list="returnItems">
<clear-field field-name="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
@@ -705,7 +705,7 @@
<field-map field-name="roleTypeId" value="SUPPLIER_AGENT"/>
</entity-and>
- <iterate entry="supplierAgentOrderRole" list-name="supplierAgentOrderRoles">
+ <iterate entry="supplierAgentOrderRole" list="supplierAgentOrderRoles">
<set from-field="supplierAgentOrderRole.partyId" field="sendToPartyIdMap.${supplierAgentOrderRole.partyId}"/>
</iterate>
@@ -716,7 +716,7 @@
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <iterate entry="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs">
+ <iterate entry="sendToPartyPartyAndContactMech" list="sendToPartyPartyAndContactMechs">
<string-append field-name="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/>
</iterate>
</iterate-map>
@@ -757,13 +757,13 @@
<entity-one entity-name="Shipment" value-name="shipment"/>
<get-related value-name="shipment" relation-name="ItemIssuance" list-name="issuances"/>
- <iterate list-name="issuances" entry-name="issuance">
+ <iterate list="issuances" entry="issuance">
<entity-and entity-name="ShipmentReceipt" list-name="receipts">
<field-map field-name="shipmentId" from-field="shipment.shipmentId"/>
<field-map field-name="orderId" from-field="issuance.orderId"/>
<field-map field-name="orderItemSeqId" from-field="issuance.orderItemSeqId"/>
</entity-and>
- <iterate list-name="receipts" entry-name="receipt">
+ <iterate list="receipts" entry="receipt">
<calculate field-name="issuanceQuantity" type="Double">
<calcop field-name="receipt.quantityAccepted" operator="add">
<calcop field-name="receipt.quantityRejected" operator="get"/>
@@ -786,7 +786,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentItem"/>
+ <make-value value-field="newEntity" entity-name="ShipmentItem"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- if no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
@@ -802,7 +802,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentItem"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -816,7 +816,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentItem"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -852,7 +852,7 @@
</entity-and>
<set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/>
- <iterate entry="itemOrderShipment" list-name="itemOrderShipmentList">
+ <iterate entry="itemOrderShipment" list="itemOrderShipmentList">
<if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="Double">
<if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="Double">
<!-- there is enough in this OrderShipment record, so just adjust it and move on -->
@@ -911,7 +911,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentPackage"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackage"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -939,7 +939,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusShipped"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentPackage"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackage" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -965,7 +965,7 @@
<field-map field-name="shipmentId" from-field="shipmentId"/>
</entity-and>
- <iterate entry="shipmentRouteSegment" list-name="shipmentRouteSegments">
+ <iterate entry="shipmentRouteSegment" list="shipmentRouteSegments">
<entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false">
<field-map field-name="shipmentId" from-field="shipmentId"/>
<field-map field-name="shipmentPackageSeqId" from-field="shipmentPackageSeqId"/>
@@ -991,7 +991,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentPackageContent"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -1006,7 +1006,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentPackageContent"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -1020,7 +1020,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentPackageContent"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -1032,7 +1032,7 @@
<set value="Create ShipmentPackageContent" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentPackageContent"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<find-by-primary-key value-name="shipmentPackageContent" map-name="newEntity"/>
<log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
@@ -1061,7 +1061,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentPackageRouteSeg"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -1073,7 +1073,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -1087,7 +1087,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -1100,7 +1100,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentContactMech"/>
+ <make-value value-field="newEntity" entity-name="ShipmentContactMech"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -1112,7 +1112,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentContactMech"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentContactMech" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -1126,7 +1126,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ShipmentContactMech"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentContactMech" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -1141,7 +1141,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ShipmentRouteSegment"/>
+ <make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -1198,7 +1198,7 @@
<entity-and entity-name="ShipmentPackage" list-name="shipmentPackages">
<field-map field-name="shipmentId" from-field="shipmentId"/>
</entity-and>
- <iterate entry="shipmentPackage" list-name="shipmentPackages">
+ <iterate entry="shipmentPackage" list="shipmentPackages">
<entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false">
<field-map field-name="shipmentId" from-field="shipmentId"/>
<field-map field-name="shipmentRouteSegmentId" from-field="shipmentRouteSegmentId"/>
@@ -1265,7 +1265,7 @@
<!-- shipment method type services -->
<simple-method method-name="createCarrierShipmentMethod" short-description="Creates a CarrierShipmentMethod">
- <make-value value-name="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/>
+ <make-value value-field="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/>
<set-pk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
<set-nonpk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
<create-value value-name="carrierShipmentMethod"/>
@@ -1281,7 +1281,7 @@
</simple-method>
<simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType">
- <make-value value-name="shipmentMethodType" entity-name="ShipmentMethodType"/>
+ <make-value value-field="shipmentMethodType" entity-name="ShipmentMethodType"/>
<set-pk-fields map-name="parameters" value-name="shipmentMethodType"/>
<set-nonpk-fields map-name="parameters" value-name="shipmentMethodType"/>
<create-value value-name="shipmentMethodType"/>
@@ -1328,7 +1328,7 @@
<condition-expr field-name="statusId" value="ITEM_APPROVED"/>
</condition-list>
</entity-condition>
- <iterate list-name="orderItemAndShipGrpInvResAndItemList" entry-name="orderItemAndShipGrpInvResAndItem">
+ <iterate list="orderItemAndShipGrpInvResAndItemList" entry="orderItemAndShipGrpInvResAndItem">
<if>
<condition><not><if-compare-field field="orderItemShipGrpInvResFacilityIds" to-field="orderItemAndShipGrpInvResAndItem.facilityId" operator="contains"/></not></condition>
<then><field-to-list field-name="orderItemAndShipGrpInvResAndItem.facilityId" list-name="orderItemShipGrpInvResFacilityIds"/></then>
@@ -1338,7 +1338,7 @@
<call-simple-method method-name="getOrderItemShipGroupLists"/>
<!-- traverse facilities, instantiate shipment for each -->
- <iterate list-name="orderItemShipGrpInvResFacilityIds" entry-name="orderItemShipGrpInvResFacilityId">
+ <iterate list="orderItemShipGrpInvResFacilityIds" entry="orderItemShipGrpInvResFacilityId">
<!-- sanity check for valid facility -->
<entity-one entity-name="Facility" value-name="facility">
<field-map field-name="facilityId" from-field="orderItemShipGrpInvResFacilityId"/>
@@ -1381,7 +1381,7 @@
<field-map field-name="orderId" from-field="parameters.orderId"/>
<field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/>
</entity-and>
- <iterate entry="orderItemShipGroupAssoc" list-name="orderItemShipGroupAssocs">
+ <iterate entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
<get-related-one relation-name="OrderItem" value-name="orderItemShipGroupAssoc" to-value-name="orderItem"/>
<!-- Set the item status to completed -->
@@ -1398,7 +1398,7 @@
<field-map field-name="orderItemAssocTypeId" value="DROP_SHIPMENT"/>
</entity-and>
<if-not-empty field="orderItemAssocs">
- <iterate entry="orderItemAssoc" list-name="orderItemAssocs">
+ <iterate entry="orderItemAssoc" list="orderItemAssocs">
<set field="itemStatusContext.orderId" from-field="orderItemAssoc.orderId"/>
<set field="itemStatusContext.orderItemSeqId" from-field="orderItemAssoc.orderItemSeqId"/>
<call-service service-name="changeOrderItemStatus" in-map-name="itemStatusContext"/>
@@ -1434,7 +1434,7 @@
<!-- group orderItems (actually OrderItemAndShipGroupAssocs) by shipGroupSeqId in a Map with List values
This Map is actually used only for sales orders' shipments right now. -->
- <iterate list-name="orderItemAndShipGroupAssocList" entry-name="orderItemAndShipGroupAssoc">
+ <iterate list="orderItemAndShipGroupAssocList" entry="orderItemAndShipGroupAssoc">
<field-to-list field-name="orderItemAndShipGroupAssoc" list-name="orderItemListByShGrpMap.${orderItemAndShipGroupAssoc.shipGroupSeqId}"/>
</iterate>
</simple-method>
@@ -1442,7 +1442,7 @@
<simple-method method-name="createShipmentForFacilityAndShipGroup" short-description="Sub-method used by quickShip methods to create a shipment">
<!-- for OrderItemShipGroup need to split all OISGIRs into their ship groups and create a shipment for each -->
- <iterate list-name="orderItemShipGroupList" entry-name="orderItemShipGroup">
+ <iterate list="orderItemShipGroupList" entry="orderItemShipGroup">
<!-- lookup all the approved items -->
<entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItems">
<field-map field-name="orderId" from-field="orderHeader.orderId"/>
@@ -1478,12 +1478,12 @@
<if><condition><if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
<then>
- <iterate list-name="perShipGroupItemList" entry-name="orderItemAndShipGroupAssoc">
+ <iterate list="perShipGroupItemList" entry="orderItemAndShipGroupAssoc">
<!-- just get the OrderItemShipGrpInvResAndItem records for this facility and this ship group, since that is what this shipment is for -->
<clear-field field-name="itemResFindMap"/>
<set from-field="orderItemShipGrpInvResFacilityId" field="itemResFindMap.facilityId"/>
<get-related value-name="orderItemAndShipGroupAssoc" relation-name="OrderItemShipGrpInvResAndItem" map-name="itemResFindMap" list-name="itemResList"/>
- <iterate list-name="itemResList" entry-name="itemRes">
+ <iterate list="itemResList" entry="itemRes">
<set from-field="shipment.shipmentId" field="issueContext.shipmentId"/>
<set from-field="itemRes.orderId" field="issueContext.orderId"/>
<set from-field="itemRes.orderItemSeqId" field="issueContext.orderItemSeqId"/>
@@ -1497,7 +1497,7 @@
<else> <!-- Issue all purchase order items -->
<clear-field field-name="itemResFindMap"/>
<set from-field="facilityId" field="itemResFindMap.facilityId"/>
- <iterate list-name="orderItemAndShipGroupAssocList" entry-name="item">
+ <iterate list="orderItemAndShipGroupAssocList" entry="item">
<set from-field="shipment.shipmentId" field="issueContext.shipmentId"/>
<set from-field="item.orderId" field="issueContext.orderId"/>
<set from-field="item.orderItemSeqId" field="issueContext.orderItemSeqId"/>
@@ -1516,7 +1516,7 @@
</entity-and>
<set value="New" field="shipmentPackageSeqId"/>
- <iterate list-name="itemIssuances" entry-name="itemIssuance">
+ <iterate list="itemIssuances" entry="itemIssuance">
<log level="verbose" message="In quick ship adding item to package: ${shipmentPackageSeqId}"/>
<clear-field field-name="shipItemContext"/>
<set from-field="itemIssuance.shipmentId" field="shipItemContext.shipmentId"/>
@@ -1573,7 +1573,7 @@
</entity-one>
<get-related relation-name="OrderItemShipGroup" value-name="orderHeader" list-name="orderItemShipGroupList"/>
- <iterate list-name="orderItemShipGroupList" entry-name="orderItemShipGroup">
+ <iterate list="orderItemShipGroupList" entry="orderItemShipGroup">
<!-- For each shipGroup create Shipment -->
<clear-field field-name="createShipmentContext"/>
<set field="createShipmentContext.primaryOrderId" from-field="orderHeader.orderId"/>
@@ -1586,7 +1586,7 @@
</call-service>
<entity-one entity-name="Shipment" value-name="shipment"/>
<get-related value-name="orderHeader" relation-name="OrderItem" list-name="orderItems"/>
- <iterate entry="orderItem" list-name="orderItems">
+ <iterate entry="orderItem" list="orderItems">
<entity-one entity-name="Product" value-name="itemProduct" auto-field-map="false" use-cache="true">
<field-map field-name="productId" from-field="orderItem.productId"/>
</entity-one>
@@ -1617,7 +1617,7 @@
this condition for the non-serialized inventory (Non serialized Inventory will directly issued).
-->
<if-not-empty field="parameters.serialNumber">
- <make-value entity-name="OrderItemShipGrpInvRes" value-name="orderItemShipGrpInvResLookupPk"/>
+ <make-value entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvResLookupPk"/>
<set-pk-fields value-name="orderItemShipGrpInvResLookupPk" map-name="parameters"/>
<find-by-primary-key entity-name="OrderItemShipGrpInvRes" map-name="orderItemShipGrpInvResLookupPk" value-name="orderItemShipGrpInvRes"/>
<get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-name="orderItemShipGrpInvRes"/>
@@ -1652,7 +1652,7 @@
<set value="New" field="shipItemContext.shipmentPackageSeqId"/>
</if-empty>
<log level="info" message="Package SeqID : ${shipItemContext.shipmentPackageSeqId}"/>
- <make-value entity-name="ShipmentPackage" value-name="shipmentPackageLookupPk"/>
+ <make-value entity-name="ShipmentPackage" value-field="shipmentPackageLookupPk"/>
<set-pk-fields value-name="shipmentPackageLookupPk" map-name="parameters"/>
<find-by-primary-key entity-name="ShipmentPackage" map-name="shipmentPackageLookupPk" value-name="shipmentPackage"/>
<if-empty field="shipmentPackage">
@@ -1761,7 +1761,7 @@
<!-- issue the passed in order items -->
<log level="verbose" message="ShipMap List : ${itemMapList} / ${parameters.itemShipList}"/>
- <iterate list-name="itemMapList" entry-name="itemMap">
+ <iterate list="itemMapList" entry="itemMap">
<log level="verbose" message="Item Map : ${itemMap}"/>
<clear-field field-name="issueContext"/>
<set from-field="shipment.shipmentId" field="issueContext.shipmentId"/>
@@ -1776,7 +1776,7 @@
</iterate>
<!-- place all issued items into a unique package per tracking num -->
- <iterate list-name="itemMapList" entry-name="itemMap">
+ <iterate list="itemMapList" entry="itemMap">
<log level="info" message="QuickShipOrderByItem grouping by tracking number : ${itemMap.trackingNum}"/>
<entity-one entity-name="ItemIssuance" value-name="itemIssuance">
@@ -1840,11 +1840,11 @@
<check-permission permission="FACILITY" action="_UPDATE">
<fail-message message="Security Error: to run ${operationName} you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <make-value entity-name="OrderShipment" value-name="lookupPk"/>
+ <make-value entity-name="OrderShipment" value-field="lookupPk"/>
<set-pk-fields value-name="lookupPk" map-name="parameters"/>
<find-by-primary-key entity-name="OrderShipment" map-name="lookupPk" value-name="orderShipment"/>
<clear-field field-name="lookupPk"/>
- <make-value entity-name="ShipmentItem" value-name="lookupPk"/>
+ <make-value entity-name="ShipmentItem" value-field="lookupPk"/>
<set-pk-fields value-name="lookupPk" map-name="parameters"/>
<find-by-primary-key entity-name="ShipmentItem" map-name="lookupPk" value-name="shipmentItem"/>
@@ -1891,7 +1891,7 @@
<if-compare field="parameters.quantity" operator="greater" value="0" type="Double">
<!-- get orderHeader -->
- <make-value entity-name="OrderHeader" value-name="orderHeaderLookupPk"/>
+ <make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
<set-pk-fields value-name="orderHeaderLookupPk" map-name="parameters"/>
<find-by-primary-key map-name="orderHeaderLookupPk" value-name="orderHeader"/>
@@ -1901,12 +1901,12 @@
</if-compare>
<!-- get orderItem -->
- <make-value entity-name="OrderItem" value-name="orderItemLookupPk"/>
+ <make-value entity-name="OrderItem" value-field="orderItemLookupPk"/>
<set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
<find-by-primary-key map-name="orderItemLookupPk" value-name="orderItem"/>
<!-- make sure the orderItem is not already present in this shipment -->
- <make-value entity-name="OrderShipment" value-name="orderShipmentLookup"/>
+ <make-value entity-name="OrderShipment" value-field="orderShipmentLookup"/>
<set-pk-fields value-name="orderShipmentLookup" map-name="parameters"/>
<find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
<if-not-empty field="existingOrderShipments">
@@ -1943,14 +1943,14 @@
</simple-method>
<simple-method method-name="getQuantityForShipment" short-description="get the order item quantity still not put in shipments">
<!-- get orderItem -->
- <make-value entity-name="OrderItem" value-name="orderItemLookupPk"/>
+ <make-value entity-name="OrderItem" value-field="orderItemLookupPk"/>
<set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
<find-by-primary-key map-name="orderItemLookupPk" value-name="orderItem"/>
<set from-field="parameters.orderId" field="orderShipmentLookup.orderId"/>
<set from-field="parameters.orderItemSeqId" field="orderShipmentLookup.orderItemSeqId"/>
<find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
- <iterate list-name="existingOrderShipments" entry-name="orderShipment">
+ <iterate list="existingOrderShipments" entry="orderShipment">
<calculate field-name="plannedQuantity" type="Double">
<calcop field-name="plannedQuantity" operator="add">
<calcop field-name="orderShipment.quantity" operator="get"/>
@@ -1959,7 +1959,7 @@
</iterate>
<clear-field field-name="existingOrderShipments"/>
<find-by-and entity-name="ItemIssuance" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
- <iterate list-name="existingOrderShipments" entry-name="itemIssuance">
+ <iterate list="existingOrderShipments" entry="itemIssuance">
<calculate field-name="issuedQuantity" type="Double">
<calcop field-name="issuedQuantity" operator="add">
<calcop field-name="itemIssuance.quantity" operator="get"/>
@@ -1991,7 +1991,7 @@
<entity-and entity-name="OrderShipment" list-name="orderShipmentList">
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
</entity-and>
- <iterate entry="orderShipment" list-name="orderShipmentList">
+ <iterate entry="orderShipment" list="orderShipmentList">
<clear-field field-name="deleteOrderShipmentMap"/>
<set-service-fields service-name="deleteOrderShipment" map-name="orderShipment" to-map-name="deleteOrderShipmentMap"/>
<call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>
@@ -2000,7 +2000,7 @@
<log level="info" message="Cancelling Item Issuances for shimpentId: ${parameters.shipmentId}"/>
<entity-one entity-name="Shipment" value-name="shipment"/>
<get-related value-name="shipment" relation-name="ItemIssuance" list-name="issuances"/>
- <iterate list-name="issuances" entry-name="issuance">
+ <iterate list="issuances" entry="issuance">
<set from-field="issuance.itemIssuanceId" field="inputMap.itemIssuanceId"/>
<call-service service-name="cancelOrderItemIssuanceFromSalesShipment" in-map-name="inputMap"/>
</iterate>
@@ -2013,7 +2013,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateQuantityBreak"/>
</check-permission>
<check-errors/>
- <make-value value-name="quantityBreak" entity-name="QuantityBreak"/>
+ <make-value value-field="quantityBreak" entity-name="QuantityBreak"/>
<set-nonpk-fields map-name="parameters" value-name="quantityBreak"/>
<sequenced-id-to-env sequence-name="QuantityBreak" env-name="quantityBreak.quantityBreakId"/>
<create-value value-name="quantityBreak"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Dec 30 03:28:24 2008
@@ -91,7 +91,7 @@
<log level="info" message="=============createInvFrmShipmentOutMap===========${createInvFrmShipmentOutMap}====="/>
<set field="invoicesCreated" from-field="createInvFrmShipmentOutMap.invoicesCreated"/>
- <iterate list-name="invoicesCreated" entry-name="invoiceCreated">
+ <iterate list="invoicesCreated" entry="invoiceCreated">
<entity-one entity-name="Invoice" value-name="invoice">
<field-map field-name="invoiceId" from-field="invoiceCreated"/>
</entity-one>
Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Tue Dec 30 03:28:24 2008
@@ -25,7 +25,7 @@
<check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run createSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="SecurityGroup"/>
+ <make-value value-field="newEntity" entity-name="SecurityGroup"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -35,7 +35,7 @@
<check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="SecurityGroup" value-name="lookupPKMap"/>
+ <make-value entity-name="SecurityGroup" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="SecurityGroup" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -47,7 +47,7 @@
<check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run createSecurityPermission you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="SecurityPermission"/>
+ <make-value value-field="newEntity" entity-name="SecurityPermission"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -57,7 +57,7 @@
<check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateSecurityPermission you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="SecurityPermission" value-name="lookupPKMap"/>
+ <make-value entity-name="SecurityPermission" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="SecurityPermission" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -69,7 +69,7 @@
<check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run addSecurityPermissionToSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="SecurityGroupPermission"/>
+ <make-value value-field="newEntity" entity-name="SecurityGroupPermission"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<!-- clear the org.ofbiz.security.Security object's custom cache by newEntity -->
@@ -81,7 +81,7 @@
<check-permission permission="SECURITY" action="_DELETE"><fail-message message="Security Error: to run removeSecurityPermissionFromSecurityGroup you must have the SECURITY_DELETE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="SecurityGroupPermission" value-name="lookupPKMap"/>
+ <make-value entity-name="SecurityGroupPermission" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="SecurityGroupPermission" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -95,7 +95,7 @@
<check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run addUserLoginToSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="UserLoginSecurityGroup"/>
+ <make-value value-field="newEntity" entity-name="UserLoginSecurityGroup"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -113,7 +113,7 @@
<check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateUserLoginToSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="UserLoginSecurityGroup" value-name="lookupPKMap"/>
+ <make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="UserLoginSecurityGroup" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -126,7 +126,7 @@
<check-permission permission="SECURITY" action="_DELETE"><fail-message message="Security Error: to run removeUserLoginFromSecurityGroup you must have the SECURITY_DELETE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="UserLoginSecurityGroup" value-name="lookupPKMap"/>
+ <make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="UserLoginSecurityGroup" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -140,7 +140,7 @@
<check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run addProtectedViewToSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProtectedView"/>
+ <make-value value-field="newEntity" entity-name="ProtectedView"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -152,7 +152,7 @@
<simple-method method-name="updateProtectedViewToSecurityGroup" short-description="Update ProtectedView to SecurityGroup">
<check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateProtectedViewToSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ProtectedView" value-name="lookupPKMap"/>
+ <make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProtectedView" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -165,7 +165,7 @@
<check-permission permission="SECURITY" action="_DELETE"><fail-message message="Security Error: to run removeProtectedViewFromSecurityGroup you must have the SECURITY_DELETE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ProtectedView" value-name="lookupPKMap"/>
+ <make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProtectedView" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Tue Dec 30 03:28:24 2008
@@ -268,7 +268,7 @@
<filter-list-by-date list-name="rolePartyGroups"/>
<if-not-empty field="rolePartyGroups">
<!-- Check to see if User is member of any of these Party groups -->
- <iterate entry="rolePartyGroup" list-name="rolePartyGroups">
+ <iterate entry="rolePartyGroup" list="rolePartyGroups">
<!-- check current party is the member of party group-->
<!-- PartyGroup partyId-->
<set from-field="rolePartyGroup.partyId" field="lookupPartyRoleMap.partyIdFrom"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 03:28:24 2008
@@ -23,7 +23,7 @@
<!-- Timesheet Services -->
<simple-method method-name="createTimesheet" short-description="Create Timesheet">
- <make-value value-name="newEntity" entity-name="Timesheet"/>
+ <make-value value-field="newEntity" entity-name="Timesheet"/>
<sequenced-id-to-env sequence-name="Timesheet" env-name="newEntity.timesheetId"/>
<field-to-result field-name="newEntity.timesheetId" result-name="timesheetId"/>
@@ -75,7 +75,7 @@
</if-empty>
</simple-method>
<simple-method method-name="createTimesheets" short-description="Creates Timesheet multiple parties at a time">
- <iterate list-name="parameters.partyIdList" entry-name="partyId">
+ <iterate list="parameters.partyIdList" entry="partyId">
<set field="parameters.partyId" from-field="partyId"/>
<set-service-fields to-map-name="createParams" service-name="createTimesheet" map-name="parameters"/>
<call-service service-name="createTimesheet" in-map-name="createParams"/>
@@ -149,7 +149,7 @@
<set field="invoiceItemMap.taxableFlag" value="N"/>
<set field="invoiceItemMap.invoiceItemTypeId" value="INV_TE_ITEM"/>
<set field="invoiceItemMap.uomId" value="TF_hr"/>
- <iterate entry="timeEntry" list-name="timeEntryList">
+ <iterate entry="timeEntry" list="timeEntryList">
<if>
<condition>
<or>
@@ -281,7 +281,7 @@
<check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="TimesheetRole"/>
+ <make-value value-field="newEntity" entity-name="TimesheetRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -298,7 +298,7 @@
<call-simple-method method-name="checkTimesheetStatus"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <make-value value-name="newEntity" entity-name="TimeEntry"/>
+ <make-value value-field="newEntity" entity-name="TimeEntry"/>
<sequenced-id-to-env sequence-name="TimeEntry" env-name="newEntity.timeEntryId"/>
<field-to-result field-name="newEntity.timeEntryId" result-name="timeEntryId"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 03:28:24 2008
@@ -33,7 +33,7 @@
</simple-method>
<simple-method method-name="createWorkEffort" short-description="Create Work Effort">
- <make-value value-name="newEntity" entity-name="WorkEffort"/>
+ <make-value value-field="newEntity" entity-name="WorkEffort"/>
<if-empty field="parameters.workEffortId">
<sequenced-id-to-env sequence-name="WorkEffort" env-name="newEntity.workEffortId"/>
<else>
@@ -53,7 +53,7 @@
<create-value value-name="newEntity"/>
<!-- create new status entry, and set lastStatusUpdate date -->
- <make-value value-name="newWorkEffortStatus" entity-name="WorkEffortStatus"/>
+ <make-value value-field="newWorkEffortStatus" entity-name="WorkEffortStatus"/>
<set from-field="newEntity.workEffortId" field="newWorkEffortStatus.workEffortId"/>
<set from-field="newEntity.currentStatusId" field="newWorkEffortStatus.statusId"/>
<set from-field="nowTimestamp" field="newWorkEffortStatus.statusDatetime"/>
@@ -62,7 +62,7 @@
<!-- Attach the workeffort to a requirement if passed -->
<if-not-empty field="parameters.requirementId">
- <make-value value-name="workFullfillment" entity-name="WorkRequirementFulfillment"/>
+ <make-value value-field="workFullfillment" entity-name="WorkRequirementFulfillment"/>
<set from-field="newEntity.workEffortId" field="workFullfillment.workEffortId"/>
<set from-field="parameters.requirementId" field="workFullfillment.requirementId"/>
<create-value value-name="workFullfillment"/>
@@ -79,7 +79,7 @@
<check-errors/>
</if-compare-field>
<!-- create customer request / work effort relation -->
- <make-value value-name="custRequestWorkEffort" entity-name="CustRequestWorkEffort"/>
+ <make-value value-field="custRequestWorkEffort" entity-name="CustRequestWorkEffort"/>
<set field="custRequestWorkEffort.workEffortId" from-field="newEntity.workEffortId" />
<set field="custRequestWorkEffort.custRequestId" from-field="parameters.custRequestId"/>
<create-value value-name="custRequestWorkEffort"/>
@@ -90,7 +90,7 @@
<entity-and list="custRequestContents" entity-name="CustRequestContent">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
- <iterate entry="custRequestContent" list-name="custRequestContents">
+ <iterate entry="custRequestContent" list="custRequestContents">
<set field="newWorkEffortContent.workEffortId" from-field="newEntity.workEffortId"/>
<set field="newWorkEffortContent.contentId" from-field="custRequestContent.contentId"/>
<set field="newWorkEffortContent.workEffortContentTypeId" value="SUPPORTING_MEDIA"/>
@@ -141,7 +141,7 @@
</if-not-empty>
<set from-field="nowTimestamp" field="lookedUpValue.lastStatusUpdate"/>
- <make-value value-name="newWorkEffortStatus" entity-name="WorkEffortStatus"/>
+ <make-value value-field="newWorkEffortStatus" entity-name="WorkEffortStatus"/>
<set from-field="lookedUpValue.workEffortId" field="newWorkEffortStatus.workEffortId"/>
<set from-field="parameters.currentStatusId" field="newWorkEffortStatus.statusId"/>
<set from-field="parameters.reason" field="newWorkEffortStatus.reason"/>
@@ -198,7 +198,7 @@
<!-- communication event workeffort -->
<simple-method method-name="makeCommunicationEventWorkEffort" short-description="Make a Communication Event WorkEffort">
- <make-value entity-name="CommunicationEventWorkEff" value-name="lookupMap"/>
+ <make-value entity-name="CommunicationEventWorkEff" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="lookupMap" value-name="eventWe"/>
<if-not-empty field="eventWe.workEffortId">
@@ -219,7 +219,7 @@
<check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this work effort."/></check-permission>
<check-errors/>
<!-- Find old value -->
- <make-value entity-name="CommunicationEventWorkEff" value-name="communicationEventWorkEff"/>
+ <make-value entity-name="CommunicationEventWorkEff" value-field="communicationEventWorkEff"/>
<set-pk-fields value-name="communicationEventWorkEff" map-name="parameters"/>
<find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="communicationEventWorkEff" value-name="communicationEventWorkEff"/>
<if-empty field="communicationEventWorkEff">
@@ -234,7 +234,7 @@
<check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation for this work effort."/></check-permission>
<check-errors/>
<!-- Find old value -->
- <make-value entity-name="CommunicationEventWorkEff" value-name="communicationEventWorkEff"/>
+ <make-value entity-name="CommunicationEventWorkEff" value-field="communicationEventWorkEff"/>
<set-pk-fields value-name="communicationEventWorkEff" map-name="parameters"/>
<find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="communicationEventWorkEff" value-name="communicationEventWorkEff"/>
<if-empty field="communicationEventWorkEff">
@@ -261,7 +261,7 @@
</if-not-empty>
<check-errors/>
- <make-value value-name="newEntity" entity-name="WorkEffortPartyAssignment"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -316,7 +316,7 @@
<!-- Create a WorkEffortContactMech -->
<simple-method method-name="createWorkEffortContactMech" short-description="Create a WorkEffortContactMech">
- <make-value value-name="newValue" entity-name="WorkEffortContactMech"/>
+ <make-value value-field="newValue" entity-name="WorkEffortContactMech"/>
<if-empty field="parameters.contactMechId">
<if-not-empty field="parameters.partyId">
<set-service-fields service-name="createPartyContactMech" map-name="parameters" to-map-name="context"/>
@@ -347,7 +347,7 @@
</simple-method>
<simple-method method-name="updateWorkEffortContactMech" short-description="Update a WorkEffortContactMech">
- <make-value entity-name="WorkEffortContactMech" value-name="newWorkEffortContactMech"/>
+ <make-value entity-name="WorkEffortContactMech" value-field="newWorkEffortContactMech"/>
<!-- Find old value -->
<entity-one entity-name="WorkEffortContactMech" value-name="workEffortContactMech"/>
<if-empty field="workEffortContactMech">
@@ -394,7 +394,7 @@
</simple-method>
<simple-method method-name="createWorkEffortPostalAddress" short-description="Create a PostalAddress for WorkEffort">
- <make-value entity-name="WorkEffortContactMech" value-name="newValue"/>
+ <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
<log level="info" message="Creating postal address"/>
<if-not-empty field="parameters.addToParty">
<call-map-processor xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"
@@ -426,7 +426,7 @@
</simple-method>
<simple-method method-name="updateWorkEffortPostalAddress" short-description="Update a PostalAddress for WorkEffort">
- <make-value entity-name="WorkEffortContactMech" value-name="newValue"/>
+ <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
<call-map-processor xml-resource="org/ofbiz/party/contact/ContactMechMapProcs.xml"
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="updatePostalAddress">
@@ -446,7 +446,7 @@
</simple-method>
<simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
- <make-value entity-name="WorkEffortContactMech" value-name="newValue"/>
+ <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
<log level="info" message="Creating telecom number"/>
<if-not-empty field="parameters.addToParty">
<call-map-processor xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"
@@ -477,7 +477,7 @@
</simple-method>
<simple-method method-name="updateWorkEffortTelecomNumber" short-description="Update a TelecomNumber for WorkEffort">
- <make-value entity-name="WorkEffortContactMech" value-name="newValue"/>
+ <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
<call-map-processor xml-resource="org/ofbiz/party/contact/ContactMechMapProcs.xml"
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="updateTelecomNumber">
@@ -525,13 +525,13 @@
<if-not-empty field="parameters.quickAssignPartyId">
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... -->
- <make-value value-name="newPartyRole" entity-name="PartyRole"/>
+ <make-value value-field="newPartyRole" entity-name="PartyRole"/>
<set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/>
<set value="CAL_OWNER" field="newPartyRole.roleTypeId"/>
<field-to-list field-name="newPartyRole" list-name="newPartyRoleList"/>
<store-list list-name="newPartyRoleList"/>
- <make-value value-name="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
+ <make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
<set from-field="parameters.workEffortId" field="newWorkEffortPartyAssignment.workEffortId"/>
<set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/>
<set value="CAL_OWNER" field="newWorkEffortPartyAssignment.roleTypeId"/>
@@ -543,13 +543,13 @@
<simple-method method-name="quickAssignPartyToWorkEffortWithRole" short-description="Quick Assign Party To WorkEffort">
<if-not-empty field="parameters.quickAssignPartyId">
<!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... -->
- <make-value value-name="newPartyRole" entity-name="PartyRole"/>
+ <make-value value-field="newPartyRole" entity-name="PartyRole"/>
<set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/>
<set from-field="parameters.roleTypeId" field="newPartyRole.roleTypeId"/>
<set field="newPartyRoleList[]" from-field="newPartyRole"/>
<store-list list-name="newPartyRoleList"/>
- <make-value value-name="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
+ <make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
<set from-field="parameters.workEffortId" field="newWorkEffortPartyAssignment.workEffortId"/>
<set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/>
<set from-field="parameters.roleTypeId" field="newWorkEffortPartyAssignment.roleTypeId"/>
@@ -559,7 +559,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="createWorkEffortNote" short-description="Create Work Effort Note">
- <make-value value-name="newEntity" entity-name="NoteData"/>
+ <make-value value-field="newEntity" entity-name="NoteData"/>
<sequenced-id-to-env sequence-name="NoteData" env-name="newEntity.noteId"/>
<field-to-result field-name="newEntity.noteId" result-name="noteId"/>
<set from-field="parameters.noteInfo" field="newEntity.noteInfo"/>
@@ -574,7 +574,7 @@
<create-value value-name="newEntity"/>
<!-- create new status entry, and set lastStatusUpdate date -->
- <make-value value-name="newWorkEffortNote" entity-name="WorkEffortNote"/>
+ <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
<set from-field="newEntity.noteId" field="newWorkEffortNote.noteId"/>
<set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
<set from-field="parameters.internalNote" field="newWorkEffortNote.internalNote"/>
@@ -625,7 +625,7 @@
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/></add-error>
<check-errors/>
<else>
- <make-value value-name="newEntity" entity-name="WorkEffortAssoc"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortAssoc"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.sequenceNum">
@@ -651,7 +651,7 @@
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortGoodStandardAlreadyExist"/></add-error>
<check-errors/>
<else>
- <make-value value-name="newEntity" entity-name="WorkEffortGoodStandard"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortGoodStandard"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -681,7 +681,7 @@
</calculate>
<store-value value-name="foundEntity"/>
<else>
- <make-value value-name="newEntity" entity-name="WorkEffortInventoryAssign"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortInventoryAssign"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -691,7 +691,7 @@
<!-- CustRequest workeffort -->
<simple-method method-name="createWorkEffortRequest" short-description="Create a CustRequestWorkEffort">
- <make-value entity-name="CustRequestWorkEffort" value-name="lookupMap"/>
+ <make-value entity-name="CustRequestWorkEffort" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="CustRequestWorkEffort" map-name="lookupMap" value-name="custRequestWorkEffort"/>
<if-not-empty field="custRequestWorkEffort">
@@ -713,7 +713,7 @@
<!-- CustRequestItem workeffort -->
<simple-method method-name="createWorkEffortRequestItem" short-description="Create a CustRequestItemWorkEffort">
- <make-value entity-name="CustRequestItemWorkEffort" value-name="lookupMap"/>
+ <make-value entity-name="CustRequestItemWorkEffort" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="custRequestItemWorkEffort"/>
<if-not-empty field="custRequestItemWorkEffort">
@@ -732,7 +732,7 @@
<remove-value value-name="lookupMap"/>
</simple-method>
<simple-method method-name="checkCustRequestItemExists" short-description="Checks to see if a CustRequestItem exists">
- <make-value entity-name="CustRequestItem" value-name="lookupMap"/>
+ <make-value entity-name="CustRequestItem" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="CustRequestItem" map-name="lookupMap" value-name="custRequestItem"/>
<if-not-empty field="custRequestItem">
@@ -747,7 +747,7 @@
<!--Quote workeffort -->
<simple-method method-name="createWorkEffortQuote" 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">
@@ -769,7 +769,7 @@
<!--Requirement workeffort -->
<simple-method method-name="createWorkRequirementFulfillment" short-description="Create a WorkRequirementFulfillment">
- <make-value entity-name="WorkRequirementFulfillment" value-name="lookupMap"/>
+ <make-value entity-name="WorkRequirementFulfillment" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="WorkRequirementFulfillment" map-name="lookupMap" value-name="workRequirementFulfillment"/>
<if-not-empty field="workRequirementFulfillment">
@@ -791,7 +791,7 @@
<!--ShoppingList workeffort -->
<simple-method method-name="createShoppingListWorkEffort" short-description="Create a ShoppingListWorkEffort">
- <make-value entity-name="ShoppingListWorkEffort" value-name="lookupMap"/>
+ <make-value entity-name="ShoppingListWorkEffort" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="ShoppingListWorkEffort" map-name="lookupMap" value-name="shoppingListWorkEffort"/>
<if-not-empty field="shoppingListWorkEffort">
@@ -813,7 +813,7 @@
<!--OrderHeader workeffort -->
<simple-method method-name="createOrderHeaderWorkEffort" short-description="Create a OrderHeaderWorkEffort">
- <make-value entity-name="OrderHeaderWorkEffort" value-name="lookupMap"/>
+ <make-value entity-name="OrderHeaderWorkEffort" value-field="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="OrderHeaderWorkEffort" map-name="lookupMap" value-name="orderWorkEffort"/>
<if-not-empty field="orderWorkEffort">
@@ -839,10 +839,10 @@
<set from-field="workEffort.fixedAssetId" field="findMap.fixedAssetId"/>
<find-by-and entity-name="WorkEffortFixedAssetAssign" map-name="findMap" list-name="existingAssignments"/>
<filter-list-by-date list-name="existingAssignments"/>
- <iterate list-name="existingAssignments" entry-name="existingAssignment">
+ <iterate list="existingAssignments" entry="existingAssignment">
<remove-value value-name="existingAssignment"/>
</iterate>
- <make-value value-name="newEntity" entity-name="WorkEffortFixedAssetAssign"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortFixedAssetAssign"/>
<set from-field="workEffort.workEffortId" field="newEntity.workEffortId"/>
<set from-field="workEffort.fixedAssetId" field="newEntity.fixedAssetId"/>
<set from-field="workEffort.currentStatusId" field="newEntity.statusId"/>
@@ -865,7 +865,7 @@
</add-error>
<check-errors />
<else>
- <make-value entity-name="WorkEffortFixedAssetStd" value-name="newWEFixedAssetStd" />
+ <make-value entity-name="WorkEffortFixedAssetStd" value-field="newWEFixedAssetStd" />
<set-pk-fields map-name="parameters" value-name="newWEFixedAssetStd" />
<set-nonpk-fields map-name="parameters" value-name="newWEFixedAssetStd" />
<create-value value-name="newWEFixedAssetStd" />
@@ -903,7 +903,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAsgAlreadyExist"/>
</add-error>
<else>
- <make-value entity-name="WorkEffortFixedAssetAssign" value-name="newWEFixedAssetAssign" />
+ <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newWEFixedAssetAssign" />
<set-pk-fields map-name="parameters" value-name="newWEFixedAssetAssign" />
<set-nonpk-fields map-name="parameters" value-name="newWEFixedAssetAssign" />
<!-- if the user hasn't specified a fromDate, set it from the actual start date of the task
@@ -950,7 +950,7 @@
</check-permission>
<check-errors />
-->
- <make-value entity-name="WorkEffortContent" value-name="newEntity"/>
+ <make-value entity-name="WorkEffortContent" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -995,7 +995,7 @@
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortReviewAlreadyExist"/></add-error>
<check-errors/>
<else>
- <make-value entity-name="WorkEffortReview" value-name="newEntity"/>
+ <make-value entity-name="WorkEffortReview" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -1051,7 +1051,7 @@
<if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortKeywordAlreadyExist"/></add-error>
<else>
- <make-value value-name="newEntity" entity-name="WorkEffortKeyword"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortKeyword"/>
<if-empty field="parameters.workEffortId">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/></add-error>
</if-empty>
@@ -1128,7 +1128,7 @@
<set field="reverseWorkEffortFindContext.workEffortIdTo" from-field="parameters.oldWorkEffortId"/>
<if-not-empty field="parameters.duplicateWorkEffortAssocs">
<find-by-and entity-name="WorkEffortAssoc" map-name="workEffortAssocFindContext" list-name="foundValues"/>
- <iterate entry="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortIdFrom"/>
<create-value value-name="newTempValue"/>
@@ -1136,7 +1136,7 @@
<entity-and entity-name="WorkEffortAssoc" list-name="foundValues">
<field-map field-name="workEffortIdTo" from-field="parameters.oldWorkEffortId"/>
</entity-and>
- <iterate entry="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortIdTo"/>
<create-value value-name="newTempValue"/>
@@ -1148,7 +1148,7 @@
<set field="workEffortFindContext.workEffortId" from-field="parameters.oldWorkEffortId"/>
<if-not-empty field="parameters.duplicateWorkEffortNotes">
<find-by-and entity-name="WorkEffortNote" map-name="workEffortFindContext" list-name="foundValues"/>
- <iterate entry="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>
<create-value value-name="newTempValue"/>
@@ -1156,7 +1156,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateWorkEffortContents">
<find-by-and entity-name="WorkEffortContent" map-name="workEffortFindContext" list-name="foundValues"/>
- <iterate entry="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>
<create-value value-name="newTempValue"/>
@@ -1165,7 +1165,7 @@
<if-not-empty field="parameters.duplicateWorkEffortAssignmentRates">
<find-by-and entity-name="RateAmount" map-name="workEffortFindContext" list-name="foundValuesAll"/>
<filter-list-by-date list-name="foundValuesAll" to-list-name="foundValues"/>
- <iterate entry="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>
<create-value value-name="newTempValue"/>
@@ -1190,7 +1190,7 @@
<!-- WorkEffortSkillStandard Services-->
<simple-method method-name="createWorkEffortSkillStandard" short-description="Create WorkEffortSkillStandard">
- <make-value entity-name="WorkEffortSkillStandard" value-name="newEntity"/>
+ <make-value entity-name="WorkEffortSkillStandard" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -1205,7 +1205,7 @@
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createWorkEffortInventoryProduced" short-description="Create Work Effort InventoryProduced">
- <make-value entity-name="WorkEffortInventoryProduced" value-name="newEntity"/>
+ <make-value entity-name="WorkEffortInventoryProduced" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml (original)
+++ ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml Tue Dec 30 03:28:24 2008
@@ -43,7 +43,7 @@
<condition-expr field-name="invoiceDate" operator="less-equals" env-name="parameters.thruDate"/>
</condition-list>
</entity-condition>
- <iterate list-name="invoices" entry-name="invoice">
+ <iterate list="invoices" entry="invoice">
<clear-field field-name="inMap"/>
<set field="inMap.invoiceId" from-field="invoice.invoiceId"/>
<call-service service-name="loadSalesInvoiceFact" in-map-name="inMap"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Dec 30 03:28:24 2008
@@ -28,7 +28,7 @@
<simple-method method-name="createKeywordThesaurus" short-description="Create a KeywordThesaurus">
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createKeywordThesaurus you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="KeywordThesaurus"/>
+ <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<call-object-method obj-field-name="newEntity.enteredKeyword" method-name="toLowerCase" ret-field-name="newEntity.enteredKeyword"/>
@@ -38,7 +38,7 @@
<simple-method method-name="updateKeywordThesaurus" short-description="Update a KeywordThesaurus">
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateKeywordThesaurus you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="KeywordThesaurus"/>
+ <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<store-value value-name="newEntity"/>
@@ -46,14 +46,14 @@
<simple-method method-name="deleteKeywordThesaurus" short-description="Delete a KeywordThesaurus">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteKeywordThesaurus you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="KeywordThesaurus"/>
+ <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<remove-by-and entity-name="KeywordThesaurus" map-name="newEntity"/>
</simple-method>
<!-- Uom Conversion service -->
<simple-method method-name="createUomConversionDated" short-description="Create a new dated UOM conversion entity">
- <make-value value-name="newEntity" entity-name="UomConversionDated"/>
+ <make-value value-field="newEntity" entity-name="UomConversionDated"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -211,7 +211,7 @@
<add-error><fail-property property="VisualThemeResourcesNotFound" resource="CommonUiLabels"/></add-error>
<check-errors/>
</if-empty>
- <iterate list-name="resourceList" entry-name="resourceRecord">
+ <iterate list="resourceList" entry="resourceRecord">
<set field="resourceTypeEnumId" from-field="resourceRecord.resourceTypeEnumId"/>
<set field="resourceValue" from-field="resourceRecord.resourceValue"/>
<if-empty field="resourceValue">
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- Enumeration methods -->
<simple-method method-name="createEnumeration" short-description="create a Enumeration">
- <make-value entity-name="Enumeration" value-name="newEntity"/>
+ <make-value entity-name="Enumeration" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="Enumeration" env-name="newEntity.enumId"/> <!-- get the next sequenced ID -->
<field-to-result field-name="newEntity.enumId" result-name="enumId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Tue Dec 30 03:28:24 2008
@@ -28,7 +28,7 @@
<set from-field="parameters.lastName" field="LookupMap.lastName"/>
</if-not-empty>
<find-by-and entity-name="Person" map-name="LookupMap" list-name="parties" />
- <iterate entry="party" list-name="parties">
+ <iterate entry="party" list="parties">
<set from-field="party.firstName" field="resultEntry.label"/>
<set from-field="party.partyId" field="resultEntry.value"/>
<field-to-list field-name="resultEntry" list-name="lookupResult"/>