You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:07:17 UTC
svn commit: r730111 [5/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accountin...
Modified: ofbiz/trunk/applications/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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -119,7 +119,7 @@
<if-not-empty field="parameters.statusId">
<if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
<!-- make sure a StatusValidChange record exists, if not return error -->
- <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
<field-map from-field="lookedUpValue.statusId" field-name="statusId"/>
<field-map from-field="parameters.statusId" field-name="statusIdTo"/>
</entity-one>
@@ -154,7 +154,7 @@
</or>
</condition>
<then>
- <entity-one entity-name="WorkEffort" value-name="estShipWe" auto-field-map="false">
+ <entity-one entity-name="WorkEffort" value-field="estShipWe" auto-field-map="false">
<field-map field-name="workEffortId" from-field="lookedUpValue.estimatedShipWorkEffId"/>
</entity-one>
<set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedStartDate"/>
@@ -252,12 +252,12 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <entity-one entity-name="Shipment" value-name="lookedUpValue"/>
+ <entity-one entity-name="Shipment" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createShipmentForReturn" short-description="Create Shipment based on ReturnHeader">
- <entity-one entity-name="ReturnHeader" value-name="returnHeader">
+ <entity-one entity-name="ReturnHeader" value-field="returnHeader">
<field-map field-name="returnId" from-field="parameters.returnId"/>
</entity-one>
@@ -375,7 +375,7 @@
<check-errors/>
<!-- on Shipment set partyIdFrom, partyIdTo (vendorPartyId), originContactMechId, destinationContactMechId, estimatedShipCost -->
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<if-empty field="shipment.primaryOrderId">
<!-- No primaryOrderId specified, don't do anything -->
@@ -390,11 +390,11 @@
<return response-code="success"/>
</if-empty>
- <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="false">
+ <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="false">
<field-map field-name="orderId" from-field="shipment.primaryOrderId"/>
</entity-one>
<if-not-empty field="shipment.primaryShipGroupSeqId">
- <entity-one entity-name="OrderItemShipGroup" value-name="orderItemShipGroup" auto-field-map="false">
+ <entity-one entity-name="OrderItemShipGroup" value-field="orderItemShipGroup" auto-field-map="false">
<field-map field-name="orderId" from-field="shipment.primaryOrderId"/>
<field-map field-name="shipGroupSeqId" from-field="shipment.primaryShipGroupSeqId"/>
</entity-one>
@@ -419,7 +419,7 @@
</and>
</condition>
<then>
- <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
+ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<if-compare field="productStore.oneInventoryFacility" operator="equals" value="Y">
@@ -596,7 +596,7 @@
<set from-field="shipment.destinationContactMechId" field="shipmentRouteSegmentMap.destContactMechId"/>
<set from-field="shipment.destinationTelecomNumberId" field="shipmentRouteSegmentMap.destTelecomNumberId"/>
- <entity-one entity-name="OrderItemShipGroup" value-name="orderItemShipGroup">
+ <entity-one entity-name="OrderItemShipGroup" value-field="orderItemShipGroup">
<field-map field-name="orderId" from-field="shipment.primaryOrderId"/>
<field-map field-name="shipGroupSeqId" from-field="shipment.primaryShipGroupSeqId"/>
</entity-one>
@@ -622,7 +622,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<clone-value value-name="shipment" new-value-name="shipmentCopy"/>
@@ -685,7 +685,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<!-- find email address for currently logged in user, set as sendFrom -->
<entity-and entity-name="PartyAndContactMech" list-name="curUserPartyAndContactMechs">
@@ -755,7 +755,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<get-related value-name="shipment" relation-name="ItemIssuance" list-name="issuances"/>
<iterate list="issuances" entry="issuance">
<entity-and entity-name="ShipmentReceipt" list-name="receipts">
@@ -823,7 +823,7 @@
</simple-method>
<simple-method method-name="splitShipmentItemByQuantity" short-description="splitShipmentItemByQuantity">
- <entity-one entity-name="ShipmentItem" value-name="originalShipmentItem"/>
+ <entity-one entity-name="ShipmentItem" value-field="originalShipmentItem"/>
<!-- create new ShipmentItem -->
<clear-field field="inputMap"/>
@@ -957,7 +957,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <entity-one entity-name="ShipmentPackage" value-name="lookedUpValue"/>
+ <entity-one entity-name="ShipmentPackage" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="ensurePackageRouteSeg" short-description="Ensure ShipmentPackageRouteSeg exists for all RouteSegments for this Package">
@@ -966,7 +966,7 @@
</entity-and>
<iterate entry="shipmentRouteSegment" list="shipmentRouteSegments">
- <entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false">
+ <entity-one entity-name="ShipmentPackageRouteSeg" value-field="checkShipmentPackageRouteSeg" auto-field-map="false">
<field-map field-name="shipmentId" from-field="shipmentId"/>
<field-map field-name="shipmentPackageSeqId" from-field="shipmentPackageSeqId"/>
<field-map field-name="shipmentRouteSegmentId" from-field="shipmentRouteSegment.shipmentRouteSegmentId"/>
@@ -1167,7 +1167,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
<check-errors/>
- <entity-one entity-name="ShipmentRouteSegment" value-name="lookedUpValue"/>
+ <entity-one entity-name="ShipmentRouteSegment" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<if-empty field="newEntity.carrierServiceStatusId">
@@ -1191,7 +1191,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <entity-one entity-name="ShipmentRouteSegment" value-name="lookedUpValue"/>
+ <entity-one entity-name="ShipmentRouteSegment" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="ensureRouteSegPackage" short-description="Ensure ShipmentPackageRouteSeg exists for all Packages for this RouteSegment">
@@ -1199,7 +1199,7 @@
<field-map field-name="shipmentId" from-field="shipmentId"/>
</entity-and>
<iterate entry="shipmentPackage" list="shipmentPackages">
- <entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false">
+ <entity-one entity-name="ShipmentPackageRouteSeg" value-field="checkShipmentPackageRouteSeg" auto-field-map="false">
<field-map field-name="shipmentId" from-field="shipmentId"/>
<field-map field-name="shipmentRouteSegmentId" from-field="shipmentRouteSegmentId"/>
<field-map field-name="shipmentPackageSeqId" from-field="shipmentPackage.shipmentPackageSeqId"/>
@@ -1227,7 +1227,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusGeneral"/>
</simple-method>
<simple-method method-name="checkCanChangeShipmentStatusGeneral" short-description="Check the Status of a Shipment to see if it can be changed - meant to be called in-line">
- <entity-one entity-name="Shipment" value-name="testShipment"/>
+ <entity-one entity-name="Shipment" value-field="testShipment"/>
<if>
<condition>
<or>
@@ -1271,12 +1271,12 @@
<create-value value-field="carrierShipmentMethod"/>
</simple-method>
<simple-method method-name="updateCarrierShipmentMethod" short-description="Updates a CarrierShipmentMethod">
- <entity-one entity-name="CarrierShipmentMethod" value-name="carrierShipmentMethod"/>
+ <entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/>
<set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/>
<store-value value-name="carrierShipmentMethod"/>
</simple-method>
<simple-method method-name="deleteCarrierShipmentMethod" short-description="Removes a CarrierShipmentMethod">
- <entity-one entity-name="CarrierShipmentMethod" value-name="carrierShipmentMethod"/>
+ <entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/>
<remove-value value-name="carrierShipmentMethod"/>
</simple-method>
@@ -1287,19 +1287,19 @@
<create-value value-field="shipmentMethodType"/>
</simple-method>
<simple-method method-name="updateShipmentMethodType" short-description="Updates a ShipmentMethodType">
- <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType"/>
+ <entity-one entity-name="ShipmentMethodType" value-field="shipmentMethodType"/>
<set-nonpk-fields map="parameters" value-field="shipmentMethodType"/>
<store-value value-name="shipmentMethodType"/>
</simple-method>
<simple-method method-name="deleteShipmentMethodType" short-description="Deletes a ShipmentMethodType">
- <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType"/>
+ <entity-one entity-name="ShipmentMethodType" value-field="shipmentMethodType"/>
<remove-value value-name="shipmentMethodType"/>
</simple-method>
<!-- quick ship entire order in one package per facility & ship group -->
<simple-method method-name="quickShipEntireOrder" short-description="Quick ships an entire order from multiple facilities">
<!-- first get the order header; make sure we have a product store -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader.productStoreId">
<!-- no store cannot use quick ship; throw error -->
<add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
@@ -1307,7 +1307,7 @@
</if-empty>
<!-- get the product store entity -->
- <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
+ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
@@ -1340,7 +1340,7 @@
<!-- traverse facilities, instantiate shipment for each -->
<iterate list="orderItemShipGrpInvResFacilityIds" entry="orderItemShipGrpInvResFacilityId">
<!-- sanity check for valid facility -->
- <entity-one entity-name="Facility" value-name="facility">
+ <entity-one entity-name="Facility" value-field="facility">
<field-map field-name="facilityId" from-field="orderItemShipGrpInvResFacilityId"/>
</entity-one>
<!-- should never be empty - referential integrity enforced -->
@@ -1409,7 +1409,7 @@
</simple-method>
<simple-method method-name="quickShipPurchaseOrder" short-description="Quick ships an entire purchase order to a facility">
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<call-simple-method method-name="getOrderItemShipGroupLists"/>
<call-simple-method method-name="createShipmentForFacilityAndShipGroup"/>
<log level="info" message="Finished quickShipPurchaseOrder for orderId ${parameters.orderId} and destination facilityId ${parameters.facilityId}"/>
@@ -1560,7 +1560,7 @@
<simple-method method-name="createOrderShipmentPlan" short-description="Create Shipment, ShipmentItems and OrderShipment">
<!-- first get the order header; make sure we have a product store -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader.productStoreId">
<!-- no store cannot use quick ship; throw error -->
<add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
@@ -1568,7 +1568,7 @@
</if-empty>
<!-- get the product store entity -->
- <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
+ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<get-related relation-name="OrderItemShipGroup" value-name="orderHeader" list-name="orderItemShipGroupList"/>
@@ -1584,10 +1584,10 @@
<call-service service-name="createShipment" in-map-name="createShipmentContext">
<result-to-field result-name="shipmentId" field-name="parameters.shipmentId"/>
</call-service>
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<get-related value-name="orderHeader" relation-name="OrderItem" list-name="orderItems"/>
<iterate entry="orderItem" list="orderItems">
- <entity-one entity-name="Product" value-name="itemProduct" auto-field-map="false" use-cache="true">
+ <entity-one entity-name="Product" value-field="itemProduct" auto-field-map="false" use-cache="true">
<field-map field-name="productId" from-field="orderItem.productId"/>
</entity-one>
@@ -1643,7 +1643,7 @@
</call-service>
<!-- place all issued items into a package for tracking num -->
<log level="info" message="QuickShipOrderByItem grouping by tracking number : ${parameters.trackingNum}"/>
- <entity-one entity-name="ItemIssuance" value-name="itemIssuance">
+ <entity-one entity-name="ItemIssuance" value-field="itemIssuance">
<field-map field-name="itemIssuanceId" from-field="parameters.itemIssuanceId"/>
</entity-one>
<clear-field field="shipItemContext"/>
@@ -1708,7 +1708,7 @@
<!-- Parameters going out: shipmentId -->
<!-- first get the order header; make sure we have a product store -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="parameters.originFacilityId">
<if-empty field="orderHeader.productStoreId">
@@ -1718,7 +1718,7 @@
</if-empty>
<if-not-empty field="orderHeader.productStoreId">
<!-- get the product store entity -->
- <entity-one entity-name="ProductStore" value-name="productStore">
+ <entity-one entity-name="ProductStore" value-field="productStore">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
@@ -1779,7 +1779,7 @@
<iterate list="itemMapList" entry="itemMap">
<log level="info" message="QuickShipOrderByItem grouping by tracking number : ${itemMap.trackingNum}"/>
- <entity-one entity-name="ItemIssuance" value-name="itemIssuance">
+ <entity-one entity-name="ItemIssuance" value-field="itemIssuance">
<field-map field-name="itemIssuanceId" from-field="itemMap.itemIssuanceId"/>
</entity-one>
@@ -1998,7 +1998,7 @@
</iterate>
<log level="info" message="Cancelling Item Issuances for shimpentId: ${parameters.shipmentId}"/>
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<get-related value-name="shipment" relation-name="ItemIssuance" list-name="issuances"/>
<iterate list="issuances" entry="issuance">
<set from-field="issuance.itemIssuanceId" field="inputMap.itemIssuanceId"/>
@@ -2026,7 +2026,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateQuantityBreak"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuantityBreak" value-name="quantityBreak" auto-field-map="true"/>
+ <entity-one entity-name="QuantityBreak" value-field="quantityBreak" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quantityBreak"/>
<store-value value-name="quantityBreak"/>
@@ -2039,7 +2039,7 @@
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuantityBreak"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="QuantityBreak" value-name="quantityBreak" auto-field-map="true"/>
+ <entity-one entity-name="QuantityBreak" value-field="quantityBreak" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="quantityBreak"/>
<check-errors/>
@@ -2050,13 +2050,13 @@
<log level="info" message="====================Create a Shipment Route Segment test case=========================================="/>
<set field="shipRouteSegMap.shipmentId" value="10000"/>
- <entity-one entity-name="UserLogin" value-name="shipRouteSegMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createShipmentRouteSegment" in-map-name="shipRouteSegMap">
<result-to-field result-name="shipmentRouteSegmentId" field-name="shipmentRouteSegmentId" map-name="routeSegMap"/>
</call-service>
- <entity-one entity-name="ShipmentRouteSegment" value-name="shipmentRouteSegment">
+ <entity-one entity-name="ShipmentRouteSegment" value-field="shipmentRouteSegment">
<field-map field-name="shipmentId" from-field="shipRouteSegMap.shipmentId"/>
<field-map field-name="shipmentRouteSegmentId" from-field="routeSegMap.shipmentRouteSegmentId"/>
</entity-one>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -29,7 +29,7 @@
<set field="packSingleItemInMap.packageSeq" value="1" type="Integer"/>
<set field="packSingleItemInMap.pickerPartyId" value="DemoCustomer"/>
<set field="packSingleItemInMap.handlingInstructions" value="Handle with care"/>
- <entity-one entity-name="UserLogin" value-name="userLogin" auto-field-map="false">
+ <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="packSingleItemInMap.userLogin" from-field="userLogin"/>
@@ -72,7 +72,7 @@
<log level="info" message="=======ShipmentId=======${completePackOutMap.shipmentId}===="/>
- <entity-one entity-name="Shipment" value-name="shipment">
+ <entity-one entity-name="Shipment" value-field="shipment">
<field-map field-name="shipmentId" from-field="completePackOutMap.shipmentId"/>
</entity-one>
@@ -92,7 +92,7 @@
<set field="invoicesCreated" from-field="createInvFrmShipmentOutMap.invoicesCreated"/>
<iterate list="invoicesCreated" entry="invoiceCreated">
- <entity-one entity-name="Invoice" value-name="invoice">
+ <entity-one entity-name="Invoice" value-field="invoice">
<field-map field-name="invoiceId" from-field="invoiceCreated"/>
</entity-one>
@@ -112,7 +112,7 @@
<set field="createShipmentInMap.primaryOrderId" value="DEMO10090"/>
<set field="createShipmentInMap.partyIdTo" value="DemoCustomer"/>
<set field="createShipmentInMap.originFacilityId" value="WebStoreWarehouse"/>
- <entity-one entity-name="UserLogin" value-name="userLogin" auto-field-map="false">
+ <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createShipmentInMap.userLogin" from-field="userLogin"/>
@@ -131,7 +131,7 @@
</call-service>
<log level="info" message="=============Update Shipment Id=============${updateShipmentOutMap.shipmentId}========================="/>
- <entity-one entity-name="Shipment" value-name="shipment">
+ <entity-one entity-name="Shipment" value-field="shipment">
<field-map field-name="shipmentId" from-field="updateShipmentOutMap.shipmentId"/>
</entity-one>
@@ -155,7 +155,7 @@
<simple-method method-name="testReceiveInventoryNonSerialized" short-description="Test Receive Non-Serialized Inventory" login-required="false">
<now-timestamp-to-env env-name="nowTimeStamp"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -170,7 +170,7 @@
<result-to-field field-name="inventoryItemId" result-name="inventoryItemId"/>
</call-service>
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<get-related value-name="inventoryItem" relation-name="InventoryItemDetail" list-name="inventoryItemDetails"/>
<entity-condition entity-name="ShipmentReceipt" list-name="shipmentReceipts">
<condition-expr field-name="inventoryItemId" env-name="inventoryItemId"/>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -70,7 +70,7 @@
<set field="workEffortId" from-field="parameters.workEffortId"/>
<call-simple-method method-name="workEffortPartyOwnerRolePermission"/>
<!-- get the existing parent ID -->
- <entity-one entity-name="WorkEffort" value-name="workEffort">
+ <entity-one entity-name="WorkEffort" value-field="workEffort">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-one>
<if>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -39,7 +39,7 @@
<store-value value-name="timesheet"/>
</simple-method>
<simple-method method-name="updateTimesheetToInProcess" short-description="Updates the Timesheet status back to in process to be able to correct errors">
- <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ <entity-one entity-name="Timesheet" value-field="timesheet"/>
<set field="timesheet.statusId" value="TIMESHEET_IN_PROCESS"/>
<store-value value-name="timesheet"/>
</simple-method>
@@ -85,7 +85,7 @@
<check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
<check-errors/>
- <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ <entity-one entity-name="Timesheet" value-field="timesheet"/>
<get-related value-name="timesheet" relation-name="TimeEntry" list-name="timeEntryList"/>
<if-empty field="parameters.invoiceId">
@@ -101,7 +101,7 @@
</else>
</if-empty>
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<if-empty field="invoice">
<add-error><fail-message message="Could not find invoice with ID [${invoiceId}], not adding Timesheet Entries to it."/></add-error>
<check-errors/>
@@ -112,7 +112,7 @@
<simple-method method-name="addWorkEffortTimeToInvoice" short-description="Add Work Effort Time to Invoice">
<check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
<check-errors/>
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<if-empty field="parameters.invoiceId">
<set-service-fields service-name="createInvoice" map-name="parameters" to-map-name="createInvoiceMap"/>
<set field="createInvoiceMap.invoiceTypeId" value="SALES_INVOICE"/>
@@ -122,14 +122,14 @@
</call-service>
<field-to-result field-name="parameters.invoiceId" result-name="invoiceId"/>
</if-empty>
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<if-empty field="invoice">
<add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error>
<check-errors/>
</if-empty>
<!-- update currency, can be changed with regenerate -->
<!-- find the currency of the receiving party -->
- <entity-one entity-name="Party" value-name="party">
+ <entity-one entity-name="Party" value-field="party">
<field-map field-name="partyId" value="${invoice.partyId}"/>
</entity-one>
<set field="updateInvoiceMap.invoiceId" from-field="parameters.invoiceId"/>
@@ -139,7 +139,7 @@
<property-to-field field-name="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
</if-empty>
<call-service service-name="updateInvoice" in-map-name="updateInvoiceMap"/>
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<call-simple-method method-name="createTimeEntryInvoiceItemsInline"/>
</simple-method>
<simple-method method-name="createTimeEntryInvoiceItemsInline" short-description="createTimeEntryInvoiceItemsInline">
@@ -168,7 +168,7 @@
<!-- check if only a percentage of the hours need to be used -->
<if-empty field="timeEntry.partyId">
<if-not-empty field="timeEntry.timesheetId">
- <entity-one entity-name="Timesheet" value-name="timesheet">
+ <entity-one entity-name="Timesheet" value-field="timesheet">
<field-map field-name="timesheetId" from-field="timeEntry.timesheetId"/>
</entity-one>
<set field="timeEntry.partyId" from-field="timesheet.partyId"/>
@@ -289,7 +289,7 @@
<check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
<check-errors/>
- <entity-one entity-name="TimesheetRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="TimesheetRole" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -311,7 +311,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateTimeEntry" short-description="Update TimeEntry">
- <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/>
+ <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
<!-- allow update of invoiceId and seqId if not yet filled, else check status -->
<if-not-empty field="parameters.invoiceId">
<if-empty field="lookedUpValue.invoiceId">
@@ -326,12 +326,12 @@
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTimeEntry" short-description="Delete TimeEntry">
- <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/>
+ <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
<call-simple-method method-name="checkTimesheetStatus"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="unlinkInvoiceFromTimeEntry" short-description="Delete TimeEntry">
- <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/>
+ <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
<field-to-result field-name="invoiceId" map-name="lookedUpValue"/>
<clear-field field="lookedUpValue.invoiceId"/>
<store-value value-name="lookedUpValue"/>
@@ -340,7 +340,7 @@
<check-permission permission="WORKEFFORTMGR" action="_VIEW"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
<check-errors/>
- <entity-one entity-name="TimeEntry" value-name="timeEntry"/>
+ <entity-one entity-name="TimeEntry" value-field="timeEntry"/>
<set-service-fields service-name="getRateAmount" map-name="parameters" to-map-name="getRate"/>
<set field="getRate.rateCurrencyUomId" from-field="parameters.currencyUomId"/>
@@ -372,7 +372,7 @@
<if-empty field="parameters.timesheetId">
<set field="parameters.timesheetId" from-field="lookedUpValue.timesheetId"/>
</if-empty>
- <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ <entity-one entity-name="Timesheet" value-field="timesheet"/>
<if-empty field="timesheet">
<add-error><fail-message message="Timesheet could not be found, timesheetId: ${parameters.timesheetId}"/></add-error>
<log level="info" message="Timesheet not found, timesheet: ${parameters.timesheetId}"/>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -71,7 +71,7 @@
<!-- attach to a customer request if passed and copy attached docs -->
<if-not-empty field="parameters.custRequestId">
<!-- check status of customer request if valid -->
- <entity-one entity-name="CustRequest" value-name="lookedUpValue"/>
+ <entity-one entity-name="CustRequest" value-field="lookedUpValue"/>
<set field="goodStatusId" value="CRQ_ACCEPTED"/>
<if-compare-field operator="not-equals" field="lookedUpValue.statusId" to-field="goodStatusId" >
<set field="entity" value="Customer request"/>
@@ -112,7 +112,7 @@
<check-errors/>
</if-empty>-->
- <entity-one entity-name="WorkEffort" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffort" value-field="lookedUpValue"/>
<clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -178,7 +178,7 @@
<check-errors/>
</if-empty>
- <entity-one entity-name="WorkEffort" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffort" value-field="lookedUpValue"/>
<!-- Remove associated/dependent entries from other entities here -->
<remove-related value-name="lookedUpValue" relation-name="WorkEffortKeyword"/>
@@ -282,7 +282,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updatePartyToWorkEffortAssignment" short-description="Update WorkEffortPartyAssignment entity">
- <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
+ <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
<!-- to be dropped later (use now workEffortGenericPermission)
<if-compare-field field="userLogin.partyId" to-field="workEffortPartyAssignment.partyId" operator="not-equals">
<check-permission permission="WORKEFFORTMGR" action="_UPDATE">
@@ -310,7 +310,7 @@
<call-service service-name="updatePartyToWorkEffortAssignment" in-map-name="del"/>
</simple-method>
<simple-method method-name="unassignPartyFromWorkEffort" short-description="Service that deletes a WorkEffortPartyAssignment entity">
- <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
+ <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
<remove-value value-name="workEffortPartyAssignment"/>
</simple-method>
@@ -349,7 +349,7 @@
<simple-method method-name="updateWorkEffortContactMech" short-description="Update a WorkEffortContactMech">
<make-value entity-name="WorkEffortContactMech" value-field="newWorkEffortContactMech"/>
<!-- Find old value -->
- <entity-one entity-name="WorkEffortContactMech" value-name="workEffortContactMech"/>
+ <entity-one entity-name="WorkEffortContactMech" value-field="workEffortContactMech"/>
<if-empty field="workEffortContactMech">
<add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
@@ -385,7 +385,7 @@
<simple-method method-name="deleteWorkEffortContactMech" short-description="Delete a WorkEffortContactMech">
<!-- Find old value -->
- <entity-one entity-name="WorkEffortContactMech" value-name="workEffortContactMech"/>
+ <entity-one entity-name="WorkEffortContactMech" value-field="workEffortContactMech"/>
<if-empty field="workEffortContactMech">
<add-error><fail-message message="ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
@@ -581,8 +581,8 @@
<create-value value-field="newWorkEffortNote"/>
</simple-method>
<simple-method method-name="updateWorkEffortNote" short-description="Update Work Effort Note">
- <entity-one entity-name="WorkEffortNote" value-name="lookedUpValue"/>
- <entity-one entity-name="NoteData" value-name="lookedUpValueForNoteData"/>
+ <entity-one entity-name="WorkEffortNote" value-field="lookedUpValue"/>
+ <entity-one entity-name="NoteData" value-field="lookedUpValueForNoteData"/>
<set-nonpk-fields value-field="lookedUpValueForNoteData" map="parameters"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
@@ -592,7 +592,7 @@
<if-empty field="parameters.fromDate">
<now-timestamp-to-env env-name="parameters.fromDate"/>
<else>
- <entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
</else>
</if-empty>
<if-not-empty field="lookedUpValue">
@@ -617,7 +617,7 @@
<if-empty field="parameters.fromDate">
<now-timestamp-to-env env-name="parameters.fromDate"/>
<else>
- <entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
</else>
</if-empty>
@@ -636,17 +636,17 @@
</if-not-empty>
</simple-method>
<simple-method method-name="updateWorkEffortAssoc" short-description="Update a WorkEffort association">
- <entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWorkEffortAssoc" short-description="Remove a WorkEffort association">
- <entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createWorkEffortGoodStandard" short-description="Create a link between a WorkEffort and a Product">
- <entity-one entity-name="WorkEffortGoodStandard" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortGoodStandardAlreadyExist"/></add-error>
<check-errors/>
@@ -662,18 +662,18 @@
</if-not-empty>
</simple-method>
<simple-method method-name="updateWorkEffortGoodStandard" short-description="Update a link between a WorkEffort and a Product">
- <entity-one entity-name="WorkEffortGoodStandard" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWorkEffortGoodStandard" short-description="Remove a link between a WorkEffort and a Product">
- <entity-one entity-name="WorkEffortGoodStandard" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="assignInventoryToWorkEffort" short-description="Create or update WorkEffortInventoryAssign">
<set value="Create or update WorkEffortInventoryAssign" field="operationName"/>
- <entity-one entity-name="WorkEffortInventoryAssign" value-name="foundEntity"/>
+ <entity-one entity-name="WorkEffortInventoryAssign" value-field="foundEntity"/>
<if-not-empty field="foundEntity">
<calculate field-name="foundEntity.quantity" type="Double">
<calcop field-name="foundEntity.quantity" operator="get"/>
@@ -703,7 +703,7 @@
<field-to-result field-name="custRequestId" map-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
- <entity-one entity-name="CustRequestWorkEffort" value-name="custRequestWorkEffort"/>
+ <entity-one entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/>
<if-empty field="custRequestWorkEffort">
<add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
@@ -724,7 +724,7 @@
<create-value value-field="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkEffortRequestItem" short-description="Delete a CustRequestItemWorkEffort">
- <entity-one entity-name="CustRequestItemWorkEffort" value-name="custRequestItemWorkEffort"/>
+ <entity-one entity-name="CustRequestItemWorkEffort" value-field="custRequestItemWorkEffort"/>
<if-empty field="custRequestItemWorkEffort.custRequestItemSeqId">
<add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
@@ -759,7 +759,7 @@
<field-to-result field-name="quoteId" map-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
- <entity-one entity-name="QuoteWorkEffort" value-name="quoteWorkEffort"/>
+ <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/>
<if-empty field="quoteWorkEffort">
<add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
@@ -781,7 +781,7 @@
<field-to-result field-name="requirementId" map-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
- <entity-one entity-name="WorkRequirementFulfillment" value-name="workRequirementFulfillment"/>
+ <entity-one entity-name="WorkRequirementFulfillment" value-field="workRequirementFulfillment"/>
<if-empty field="workRequirementFulfillment">
<add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
@@ -803,7 +803,7 @@
<field-to-result field-name="shoppingListId" map-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
- <entity-one entity-name="ShoppingListWorkEffort" value-name="shoppingListWorkEffort"/>
+ <entity-one entity-name="ShoppingListWorkEffort" value-field="shoppingListWorkEffort"/>
<if-empty field="shoppingListWorkEffort">
<add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
@@ -825,7 +825,7 @@
<field-to-result field-name="orderId" map-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
- <entity-one entity-name="OrderHeaderWorkEffort" value-name="orderWorkEffort"/>
+ <entity-one entity-name="OrderHeaderWorkEffort" value-field="orderWorkEffort"/>
<if-empty field="orderWorkEffort">
<add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
@@ -834,7 +834,7 @@
</simple-method>
<simple-method method-name="setWorkEffortFixedAssetAssign" short-description="Based on task's estimate dates, write assign entries for the fixed asset the task is assigned to">
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<set from-field="workEffort.workEffortId" field="findMap.workEffortId"/>
<set from-field="workEffort.fixedAssetId" field="findMap.fixedAssetId"/>
<find-by-and entity-name="WorkEffortFixedAssetAssign" map-name="findMap" list-name="existingAssignments"/>
@@ -858,7 +858,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetStd" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
<if-not-empty field="lookedUpValue">
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAlreadyExist"/>
@@ -878,7 +878,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionERror"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetStd" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
<set-nonpk-fields map="parameters" value-field="lookedUpValue" />
<store-value value-name="lookedUpValue" />
</simple-method>
@@ -888,7 +888,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetStd" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
<remove-value value-name="lookedUpValue" />
</simple-method>
<simple-method method-name="createWorkEffortFixedAssetAssign"
@@ -897,7 +897,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetAssign" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
<if-not-empty field="lookedUpValue">
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAsgAlreadyExist"/>
@@ -909,7 +909,7 @@
<!-- if the user hasn't specified a fromDate, set it from the actual start date of the task
if there is no actual start date, default to now (to the current date and time) -->
<if-empty field="parameters.fromDate">
- <entity-one entity-name="WorkEffort" value-name="prodRunTask" />
+ <entity-one entity-name="WorkEffort" value-field="prodRunTask" />
<now-timestamp-to-env env-name="newWEFixedAssetAssign.fromDate"/>
<if-not-empty field="prodRunTask.estimatedStartDate">
<set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.estimatedStartDate" />
@@ -928,7 +928,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetAssign" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
<set-nonpk-fields map="parameters" value-field="lookedUpValue" />
<store-value value-name="lookedUpValue" />
</simple-method>
@@ -938,7 +938,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetAssign" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
<remove-value value-name="lookedUpValue" />
</simple-method>
@@ -968,7 +968,7 @@
</check-permission>
<check-errors />
-->
- <entity-one entity-name="WorkEffortContent" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -980,7 +980,7 @@
</check-permission>
<check-errors />
-->
- <entity-one entity-name="WorkEffortContent" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue" />
<remove-value value-name="lookedUpValue" />
</simple-method>
@@ -990,7 +990,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortReview" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortReviewAlreadyExist"/></add-error>
<check-errors/>
@@ -1012,7 +1012,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortReview" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -1022,7 +1022,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortReview" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue" />
<remove-value value-name="lookedUpValue" />
</simple-method>
@@ -1047,7 +1047,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortKeyword" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortKeyword" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortKeywordAlreadyExist"/></add-error>
<else>
@@ -1073,7 +1073,7 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortKeyword" value-name="lookedUpValue" />
+ <entity-one entity-name="WorkEffortKeyword" value-field="lookedUpValue" />
<remove-value value-name="lookedUpValue" />
</simple-method>
@@ -1114,7 +1114,7 @@
</check-permission>
<check-errors />
<!-- look up the old workEffort and clone it -->
- <entity-one entity-name="WorkEffort" value-name="oldWorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="oldWorkEffort">
<field-map field-name="workEffortId" from-field="parameters.oldWorkEffortId"/>
</entity-one>
<clone-value value-name="oldWorkEffort" new-value-name="newWorkEffort"/>
@@ -1196,12 +1196,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateWorkEffortSkillStandard" short-description="Update WorkEffortSkillStandard">
- <entity-one entity-name="WorkEffortSkillStandard" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortSkillStandard" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteWorkEffortSkillStandard" short-description="Delete WorkEffortSkillStandard">
- <entity-one entity-name="WorkEffortSkillStandard" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortSkillStandard" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createWorkEffortInventoryProduced" short-description="Create Work Effort InventoryProduced">
@@ -1210,7 +1210,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="deleteWorkEffortInventoryProduced" short-description="Delete Work Effort InventoryProduced">
- <entity-one entity-name="WorkEffortInventoryProduced" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffortInventoryProduced" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- WorkEffort ServiceTest Services -->
@@ -1220,14 +1220,14 @@
<set field="createEventMap.quickAssignPartyId" value="DemoCustomer"/>
<set field="createEventMap.workEffortName" value="Create Work Effort"/>
<set field="createEventMap.currentStatusId" value="CAL_TENTATIVE"/>
- <entity-one entity-name="UserLogin" value-name="createEventMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="createEventMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createWorkEffort" in-map-name="createEventMap">
<result-to-field result-name="workEffortId" field-name="workEffortId" map-name="eventMap"/>
</call-service>
<call-simple-method method-name="testUpdateEventService"/>
- <entity-one entity-name="WorkEffort" value-name="workEffort">
+ <entity-one entity-name="WorkEffort" value-field="workEffort">
<field-map field-name="workEffortId" from-field="eventMap.workEffortId"/>
</entity-one>
<assert>
@@ -1245,7 +1245,7 @@
<set field="updateEventMap.workEffortTypeId" value="EVENT"/>
<set field="updateEventMap.workEffortName" value="Update an event"/>
<set field="updateEventMap.currentStatusId" value="CAL_ACCEPTED"/>
- <entity-one entity-name="UserLogin" value-name="updateEventMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="updateEventMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="updateWorkEffort" in-map-name="updateEventMap"/>
@@ -1257,7 +1257,7 @@
<set field="createProjectMap.quickAssignPartyId" value="DemoCustomer"/>
<set field="createProjectMap.workEffortName" value="Create a project"/>
<set field="createProjectMap.currentStatusId" value="CAL_TENTATIVE"/>
- <entity-one entity-name="UserLogin" value-name="createProjectMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="createProjectMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createWorkEffort" in-map-name="createProjectMap">
@@ -1265,10 +1265,10 @@
</call-service>
<call-simple-method method-name="testUpdateProjectService"/>
<call-simple-method method-name="testCreateWorkEffortNoteService"/>
- <entity-one entity-name="WorkEffort" value-name="workEffort">
+ <entity-one entity-name="WorkEffort" value-field="workEffort">
<field-map field-name="workEffortId" from-field="projectMap.workEffortId"/>
</entity-one>
- <entity-one entity-name="NoteData" value-name="noteData">
+ <entity-one entity-name="NoteData" value-field="noteData">
<field-map field-name="noteId" from-field="workEffortNoteMap.noteId"/>
</entity-one>
<assert>
@@ -1291,7 +1291,7 @@
<set field="updateProjectMap.workEffortTypeId" value="PROJECT"/>
<set field="updateProjectMap.workEffortName" value="Update a project"/>
<set field="updateProjectMap.currentStatusId" value="CAL_ACCEPTED"/>
- <entity-one entity-name="UserLogin" value-name="updateProjectMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="updateProjectMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="updateWorkEffort" in-map-name="updateProjectMap"/>
@@ -1302,7 +1302,7 @@
<set field="createWorkEffortNoteMap.workEffortId" from-field="projectMap.workEffortId"/>
<set field="createWorkEffortNoteMap.noteParty" value="DemoCustomer"/>
<set field="createWorkEffortNoteMap.noteInfo" value="This is a note for party 'DemoCustomer'"/>
- <entity-one entity-name="UserLogin" value-name="createWorkEffortNoteMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="createWorkEffortNoteMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createWorkEffortNote" in-map-name="createWorkEffortNoteMap">
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml Tue Dec 30 04:07:14 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="cdynePostalAddressFillInCounty" short-description="Cdyne PostalAddress Fill In County">
- <entity-one entity-name="PostalAddress" value-name="postalAddress"/>
+ <entity-one entity-name="PostalAddress" value-field="postalAddress"/>
<log level="verbose" message="In cdynePostalAddressFillInCounty contactMechId=${parameters.contactMechId}; postalAddress=${postalAddress}"/>
<if>
<condition>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -75,7 +75,7 @@
</if-empty>
<!-- first try the regular UomConversion entity (no dates) -->
- <entity-one entity-name="UomConversion" value-name="uomConversion" auto-field-map="true" use-cache="true"/>
+ <entity-one entity-name="UomConversion" value-field="uomConversion" auto-field-map="true" use-cache="true"/>
<!-- if not found, try the dated uom conversion entity -->
<if-empty field="uomConversion">
@@ -161,7 +161,7 @@
<!-- convertUomCustom: Dispatcher for calling Custom Method for UoM conversion -->
<simple-method method-name="convertUomCustom" short-description="Convert UOM values using CustomMethod" login-required="false">
<set field="customMethodId" from-field="parameters.uomConversion.customMethodId"/>
- <entity-one entity-name="CustomMethod" value-name="customMethod" auto-field-map="true" use-cache="true"/>
+ <entity-one entity-name="CustomMethod" value-field="customMethod" auto-field-map="true" use-cache="true"/>
<if-empty field="customMethod.customMethodName">
<add-error> <fail-property property="NoCustomMethodName" resource="CommonUiLabels"/> </add-error>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -29,7 +29,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateEnumeration" short-description="update a Enumeration">
- <entity-one entity-name="Enumeration" value-name="lookedUpValue"/>
+ <entity-one entity-name="Enumeration" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="movePortletToPortalPage" short-description="Moves a PortalPortlet from the actual portalPage to a different one">
- <entity-one entity-name="PortalPagePortlet" value-name="oldEntity" auto-field-map="true"/>
+ <entity-one entity-name="PortalPagePortlet" value-field="oldEntity" auto-field-map="true"/>
<check-errors/>
<make-value value-field="newEntity" entity-name="PortalPagePortlet"/>
@@ -48,7 +48,7 @@
</simple-method>
<simple-method method-name="deletePortalPageColumn" short-description="Delete a Column from a PortalPage">
- <entity-one entity-name="PortalPageColumn" value-name="column" auto-field-map="true" use-cache="true"/>
+ <entity-one entity-name="PortalPageColumn" value-field="column" auto-field-map="true" use-cache="true"/>
<if-not-empty field="column">
<entity-and entity-name="PortalPagePortlet" list-name="portalPortletList">
@@ -79,7 +79,7 @@
</simple-method>
<simple-method method-name="deletePortalPagePortlet" short-description="Delete a PortalPortlet from a PortalPageColumn">
- <entity-one entity-name="PortalPagePortlet" value-name="portlet" auto-field-map="true" use-cache="true"/>
+ <entity-one entity-name="PortalPagePortlet" value-field="portlet" auto-field-map="true" use-cache="true"/>
<if-not-empty field="portlet">
<make-value value-field="newEntity" entity-name="PortletAttribute"/>
@@ -123,7 +123,7 @@
<simple-method method-name="deletePortalPage" short-description="Delete a Portal Page">
<if-compare field="parameters.portalPageId" value="MYPORTAL" operator="not-equals">
<if-compare field="parameters.portalPageId" value="DEFAULT" operator="not-equals">
- <entity-one entity-name="PortalPage" value-name="portalPage" auto-field-map="true" use-cache="true"/>
+ <entity-one entity-name="PortalPage" value-field="portalPage" auto-field-map="true" use-cache="true"/>
<if-not-empty field="portalPage">
<entity-and entity-name="PortalPageColumn" list-name="portalPageColumnList">
Modified: ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml (original)
+++ ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml Tue Dec 30 04:07:14 2008
@@ -68,7 +68,7 @@
<create-value value-field="newEntity"/>
<!-- also set the lastHistoryStartDate on the EntitySync -->
- <entity-one entity-name="EntitySync" value-name="entitySync"/>
+ <entity-one entity-name="EntitySync" value-field="entitySync"/>
<set from-field="newEntity.startDate" field="entitySync.lastHistoryStartDate"/>
<store-value value-name="entitySync"/>
</simple-method>
Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml Tue Dec 30 04:07:14 2008
@@ -48,7 +48,7 @@
<set field="createExampleMap.exampleName" value="Test Example"/>
<set field="createExampleMap.statusId" value="EXST_IN_DESIGN"/>
- <entity-one entity-name="UserLogin" value-name="createExampleMap.userLogin" auto-field-map="false">
+ <entity-one entity-name="UserLogin" value-field="createExampleMap.userLogin" auto-field-map="false">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -56,7 +56,7 @@
<result-to-field result-name="exampleId" field-name="exampleId"/>
</call-service>
- <entity-one entity-name="Example" value-name="example"/>
+ <entity-one entity-name="Example" value-field="example"/>
<assert>
<not><if-empty field="example"/></not>
Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Tue Dec 30 04:07:14 2008
@@ -48,7 +48,7 @@
<set-service-fields map-name="parameters" service-name="updateWorkEffort" to-map-name="updateWorkEffortCtx"/>
<set from-field="parameters.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
<set from-field="parameters.scheduleWorkEffortId" field="workEffortId"/>
- <entity-one value-name="workEffort" entity-name="WorkEffort"/>
+ <entity-one value-field="workEffort" entity-name="WorkEffort"/>
<set field="updateWorkEffortCtx.actualCompletionDate" from-field="parameters.actualCompletionDate" default-value="${workEffort.actualCompletionDate}"/>
<call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 04:07:14 2008
@@ -78,7 +78,7 @@
field="eventRole.statusId">
<call-simple-method method-name="checkCommEventAccess" />
<if-compare operator="equals" value="true" field="found">
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system" />
</entity-one>
<set-service-fields service-name="setCommunicationEventRoleStatus"
@@ -120,7 +120,7 @@
<if-empty field="roles">
<!--partyId To -->
<if-not-empty field="commEvent.partyIdTo">
- <entity-one entity-name="PartyRole" value-name="partyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" value="${commEvent.partyIdTo}" />
<field-map field-name="roleTypeId" value="ADDRESSEE" />
</entity-one>
@@ -140,7 +140,7 @@
<!-- partyIdFrom -->
<if-not-empty field="commEvent.partyIdFrom">
- <entity-one entity-name="PartyRole" value-name="partyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" value="${commEvent.partyIdFrom}" />
<field-map field-name="roleTypeId" value="ORIGINATOR" />
</entity-one>
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="sendEmailToCustomer" short-description="Send Mail When Customer Request is created or commpleted.">
- <entity-one entity-name="CustRequest" value-name="custReq"/>
+ <entity-one entity-name="CustRequest" value-field="custReq"/>
<if>
<condition>
<if-compare field="custReq.statusId" value="CRQ_COMPLETED" operator="equals"></if-compare>
@@ -33,14 +33,14 @@
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-and>
<first-from-list entry="partyUserLogin" list="partyUserLogin"/>
- <entity-one entity-name="UserPreference" value-name="userPref">
+ <entity-one entity-name="UserPreference" value-field="userPref">
<field-map field-name="userLoginId" value="${partyUserLogin.userLoginId}"/>
<field-map field-name="userPrefTypeId" value="sendCustRequestEmail"/>
</entity-one>
<if-empty field="userPref.userPrefValue">
<!-- set send customer requst email field to default-->
<set field="setUserPref.userPrefMap.sendCustRequestEmail" value="Y"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="setUserPref.userLoginId" from-field="userLogin.userLoginId"/>
@@ -89,7 +89,7 @@
</condition>
<then>
<if-not-empty field="storeEmail.bodyScreenLocation">
- <entity-one entity-name="Person" value-name="person">
+ <entity-one entity-name="Person" value-field="person">
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-one>
<set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/>
@@ -100,7 +100,7 @@
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId" />
</entity-and>
<first-from-list entry="webSite" list="webSites" />
- <entity-one entity-name="UserLogin" value-name="userLoginSystem">
+ <entity-one entity-name="UserLogin" value-field="userLoginSystem">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<if-not-empty field="emailParams.sendTo">
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 04:07:14 2008
@@ -70,11 +70,11 @@
</simple-method>
<simple-method method-name="setCommEventToRead" short-description="">
- <entity-one entity-name="CommunicationEventRole" value-name="eventRole"/>
+ <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
<if-compare operator="equals" value="COM_ROLE_CREATED" field="eventRole.statusId">
<call-simple-method method-name="checkCommEventAccess"/>
<if-compare operator="equals" value="true" field="found">
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set-service-fields service-name="setCommunicationEventRoleStatus"
@@ -123,7 +123,7 @@
<if-empty field="roles">
<!--partyId To -->
<if-not-empty field="commEvent.partyIdTo">
- <entity-one entity-name="PartyRole" value-name="partyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" value="${commEvent.partyIdTo}"/>
<field-map field-name="roleTypeId" value="ADDRESSEE"/>
</entity-one>
@@ -144,7 +144,7 @@
<!-- partyIdFrom -->
<if-not-empty field="commEvent.partyIdFrom">
- <entity-one entity-name="PartyRole" value-name="partyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" value="${commEvent.partyIdFrom}"/>
<field-map field-name="roleTypeId" value="ORIGINATOR"/>
</entity-one>
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="sendEmailToCustomer" short-description="Send Mail When Customer Request is created or commpleted.">
- <entity-one entity-name="CustRequest" value-name="custReq"/>
+ <entity-one entity-name="CustRequest" value-field="custReq"/>
<if>
<condition>
<if-compare field="custReq.statusId" value="CRQ_COMPLETED" operator="equals"></if-compare>
@@ -33,14 +33,14 @@
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-and>
<first-from-list entry="partyUserLogin" list="partyUserLogin"/>
- <entity-one entity-name="UserPreference" value-name="userPref">
+ <entity-one entity-name="UserPreference" value-field="userPref">
<field-map field-name="userLoginId" value="${partyUserLogin.userLoginId}"/>
<field-map field-name="userPrefTypeId" value="sendCustRequestEmail"/>
</entity-one>
<if-empty field="userPref.userPrefValue">
<!-- set send customer requst email field to default-->
<set field="setUserPref.userPrefMap.sendCustRequestEmail" value="Y"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="setUserPref.userLoginId" from-field="userLogin.userLoginId"/>
@@ -89,7 +89,7 @@
</condition>
<then>
<if-not-empty field="storeEmail.bodyScreenLocation">
- <entity-one entity-name="Person" value-name="person">
+ <entity-one entity-name="Person" value-field="person">
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-one>
<set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/>
@@ -100,7 +100,7 @@
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId" />
</entity-and>
<first-from-list entry="webSite" list="webSites" />
- <entity-one entity-name="UserLogin" value-name="userLoginSystem">
+ <entity-one entity-name="UserLogin" value-field="userLoginSystem">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<if-not-empty field="emailParams.sendTo">
Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Tue Dec 30 04:07:14 2008
@@ -41,7 +41,7 @@
</simple-method>
<simple-method method-name="updateOagisMessageInfo" short-description="Update Oagis MessageInfo">
- <entity-one entity-name="OagisMessageInfo" value-name="lookedUpValue"/>
+ <entity-one entity-name="OagisMessageInfo" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -55,7 +55,7 @@
</simple-method>
<simple-method method-name="updateOagisMessageErrorInfo" short-description="Update Oagis MessageErrorInfo">
- <entity-one entity-name="OagisMessageErrorInfo" value-name="lookedUpValue"/>
+ <entity-one entity-name="OagisMessageErrorInfo" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Tue Dec 30 04:07:14 2008
@@ -230,7 +230,7 @@
<!-- TIMESHEET -->
<if-compare field="sec_object" value="TIMESHEET" operator="equals">
- <entity-one entity-name="Timesheet" value-name="timesheet" use-cache="true"/>
+ <entity-one entity-name="Timesheet" value-field="timesheet" use-cache="true"/>
<!-- log level="info" message="======ProjectMGR Security===== action: ${mainAction} object: ${sec_object} timesheetId: ${timesheet.timesheetId} partyId: ${timesheet.partyId} resourceDescription: ${parameters.resourceDescription}"/-->
<if>
<condition>
@@ -275,7 +275,7 @@
<!-- TIMEENTRY -->
<if-compare field="sec_object" value="TIMEENTRY" operator="equals">
- <entity-one entity-name="Timesheet" value-name="timesheet" use-cache="true"/>
+ <entity-one entity-name="Timesheet" value-field="timesheet" use-cache="true"/>
<set field="timesheetId" from-field="timesheet.timesheetId"/>
<set field="taskId" from-field="parameters.workEffortId"/>
<set field="partyId" from-field="timesheet.partyId"/>
@@ -345,7 +345,7 @@
<if-empty field="taskId">
<return/>
<else>
- <entity-one entity-name="WorkEffort" value-name="task" use-cache="true" >
+ <entity-one entity-name="WorkEffort" value-field="task" use-cache="true" >
<field-map field-name="workEffortId" from-field="taskId"/>
</entity-one>
<set field="phaseId" from-field="task.workEffortParentId"/>
@@ -354,7 +354,7 @@
</if-empty>
</if-empty>
<if-empty field="projectId">
- <entity-one entity-name="WorkEffort" value-name="phase" use-cache="true">
+ <entity-one entity-name="WorkEffort" value-field="phase" use-cache="true">
<field-map field-name="workEffortId" from-field="phaseId"/>
</entity-one>
<set field="projectId" from-field="phase.workEffortParentId"/>