svn commit: r730092 [3/3] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730092 [3/3] - in /ofbiz/trunk: applications/accounting/script
 
|
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=730092&r1=730091&r2=730092&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:11:15 2008 @@ -120,8 +120,8 @@ <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"> - <field-map env-name="lookedUpValue.statusId" field-name="statusId"/> - <field-map env-name="parameters.statusId" field-name="statusIdTo"/> + <field-map from-field="lookedUpValue.statusId" field-name="statusId"/> + <field-map from-field="parameters.statusId" field-name="statusIdTo"/> </entity-one> <if-empty field="checkStatusValidChange"> <string-to-list string="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." list-name="error_list"/> @@ -155,7 +155,7 @@ </condition> <then> <entity-one entity-name="WorkEffort" value-name="estShipWe" auto-field-map="false"> - <field-map field-name="workEffortId" env-name="lookedUpValue.estimatedShipWorkEffId"/> + <field-map field-name="workEffortId" from-field="lookedUpValue.estimatedShipWorkEffId"/> </entity-one> <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedStartDate"/> <set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedCompletionDate"/> @@ -258,7 +258,7 @@ <simple-method method-name="createShipmentForReturn" short-description="Create Shipment based on ReturnHeader"> <entity-one entity-name="ReturnHeader" value-name="returnHeader"> - <field-map field-name="returnId" env-name="parameters.returnId"/> + <field-map field-name="returnId" from-field="parameters.returnId"/> </entity-one> <set from-field="returnHeader.fromPartyId" field="shipmentCtx.partyIdFrom"/> @@ -391,12 +391,12 @@ </if-empty> <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="false"> - <field-map field-name="orderId" env-name="shipment.primaryOrderId"/> + <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"> - <field-map field-name="orderId" env-name="shipment.primaryOrderId"/> - <field-map field-name="shipGroupSeqId" env-name="shipment.primaryShipGroupSeqId"/> + <field-map field-name="orderId" from-field="shipment.primaryOrderId"/> + <field-map field-name="shipGroupSeqId" from-field="shipment.primaryShipGroupSeqId"/> </entity-one> </if-not-empty> @@ -420,7 +420,7 @@ </condition> <then> <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if-compare field="productStore.oneInventoryFacility" operator="equals" value="Y"> <set from-field="productStore.inventoryFacilityId" field="shipment.originFacilityId"/> @@ -431,7 +431,7 @@ <!-- partyIdFrom, partyIdTo (vendorPartyId) - NOTE: these work the same for Purchase and Sales Orders... --> <entity-and entity-name="OrderRole" list-name="orderRoles"> - <field-map field-name="orderId" env-name="shipment.primaryOrderId"/> + <field-map field-name="orderId" from-field="shipment.primaryOrderId"/> </entity-and> <!-- From: SHIP_FROM_VENDOR --> @@ -477,7 +477,7 @@ </if-empty> <entity-and entity-name="OrderContactMech" list-name="orderContactMechs"> - <field-map field-name="orderId" env-name="shipment.primaryOrderId"/> + <field-map field-name="orderId" from-field="shipment.primaryOrderId"/> </entity-and> <!-- destinationContactMechId --> <if-empty field="shipment.destinationContactMechId"> @@ -517,7 +517,7 @@ <else> <!-- use the first unexpired phone number of the shipment partyIdTo --> <entity-and entity-name="PartyAndTelecomNumber" list-name="phoneNumbers" filter-by-date="true"> - <field-map field-name="partyId" env-name="shipment.partyIdTo"/> + <field-map field-name="partyId" from-field="shipment.partyIdTo"/> </entity-and> <first-from-list entry-name="phoneNumber" list-name="phoneNumbers"/> <if-not-empty field="phoneNumber"> @@ -597,8 +597,8 @@ <set from-field="shipment.destinationTelecomNumberId" field="shipmentRouteSegmentMap.destTelecomNumberId"/> <entity-one entity-name="OrderItemShipGroup" value-name="orderItemShipGroup"> - <field-map field-name="orderId" env-name="shipment.primaryOrderId"/> - <field-map field-name="shipGroupSeqId" env-name="shipment.primaryShipGroupSeqId"/> + <field-map field-name="orderId" from-field="shipment.primaryOrderId"/> + <field-map field-name="shipGroupSeqId" from-field="shipment.primaryShipGroupSeqId"/> </entity-one> <if-not-empty field="orderItemShipGroup"> <set from-field="orderItemShipGroup.carrierPartyId" field="shipmentRouteSegmentMap.carrierPartyId"/> @@ -689,7 +689,7 @@ <!-- find email address for currently logged in user, set as sendFrom --> <entity-and entity-name="PartyAndContactMech" list-name="curUserPartyAndContactMechs"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> </entity-and> @@ -701,7 +701,7 @@ <!-- find email addresses of all parties not equal to partyIdFrom in SUPPLIER_AGENT roleTypeId associated with primary order, set as sendTo --> <entity-and entity-name="OrderRole" list-name="supplierAgentOrderRoles"> - <field-map field-name="orderId" env-name="shipment.primaryOrderId"/> + <field-map field-name="orderId" from-field="shipment.primaryOrderId"/> <field-map field-name="roleTypeId" value="SUPPLIER_AGENT"/> </entity-and> @@ -712,7 +712,7 @@ <!-- go through all send to parties and get email addresses --> <iterate-map key-name="sendToPartyId" value-name="sendToPartyIdValue" map-name="sendToPartyIdMap"> <entity-and entity-name="PartyAndContactMech" list-name="sendToPartyPartyAndContactMechs"> - <field-map field-name="partyId" env-name="sendToPartyId"/> + <field-map field-name="partyId" from-field="sendToPartyId"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> </entity-and> @@ -759,9 +759,9 @@ <get-related value-name="shipment" relation-name="ItemIssuance" list-name="issuances"/> <iterate list-name="issuances" entry-name="issuance"> <entity-and entity-name="ShipmentReceipt" list-name="receipts"> - <field-map field-name="shipmentId" env-name="shipment.shipmentId"/> - <field-map field-name="orderId" env-name="issuance.orderId"/> - <field-map field-name="orderItemSeqId" env-name="issuance.orderItemSeqId"/> + <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"> <calculate field-name="issuanceQuantity" type="Double"> @@ -847,8 +847,8 @@ <!-- split the OrderShipment record(s) as well for the new quantities, from originalShipmentItem.shipmentItemSeqId to newShipmentItemSeqId --> <entity-and entity-name="OrderShipment" list-name="itemOrderShipmentList"> - <field-map field-name="shipmentId" env-name="originalShipmentItem.shipmentId"/> - <field-map field-name="shipmentItemSeqId" env-name="originalShipmentItem.shipmentItemSeqId"/> + <field-map field-name="shipmentId" from-field="originalShipmentItem.shipmentId"/> + <field-map field-name="shipmentItemSeqId" from-field="originalShipmentItem.shipmentItemSeqId"/> </entity-and> <set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/> @@ -962,14 +962,14 @@ </simple-method> <simple-method method-name="ensurePackageRouteSeg" short-description="Ensure ShipmentPackageRouteSeg exists for all RouteSegments for this Package"> <entity-and entity-name="ShipmentRouteSegment" list-name="shipmentRouteSegments"> - <field-map field-name="shipmentId" env-name="shipmentId"/> + <field-map field-name="shipmentId" from-field="shipmentId"/> </entity-and> <iterate entry="shipmentRouteSegment" list-name="shipmentRouteSegments"> <entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false"> - <field-map field-name="shipmentId" env-name="shipmentId"/> - <field-map field-name="shipmentPackageSeqId" env-name="shipmentPackageSeqId"/> - <field-map field-name="shipmentRouteSegmentId" env-name="shipmentRouteSegment.shipmentRouteSegmentId"/> + <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"/> </entity-one> <if-empty field="checkShipmentPackageRouteSeg"> @@ -1196,13 +1196,13 @@ </simple-method> <simple-method method-name="ensureRouteSegPackage" short-description="Ensure ShipmentPackageRouteSeg exists for all Packages for this RouteSegment"> <entity-and entity-name="ShipmentPackage" list-name="shipmentPackages"> - <field-map field-name="shipmentId" env-name="shipmentId"/> + <field-map field-name="shipmentId" from-field="shipmentId"/> </entity-and> <iterate entry="shipmentPackage" list-name="shipmentPackages"> <entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false"> - <field-map field-name="shipmentId" env-name="shipmentId"/> - <field-map field-name="shipmentRouteSegmentId" env-name="shipmentRouteSegmentId"/> - <field-map field-name="shipmentPackageSeqId" env-name="shipmentPackage.shipmentPackageSeqId"/> + <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"/> </entity-one> <if-empty field="checkShipmentPackageRouteSeg"> <set field="createShipmentPackageRouteSegMap.shipmentId" from-field="shipmentId"/> @@ -1308,7 +1308,7 @@ <!-- get the product store entity --> <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if-compare field="productStore.reserveInventory" operator="not-equals" value="Y"> @@ -1341,7 +1341,7 @@ <iterate list-name="orderItemShipGrpInvResFacilityIds" entry-name="orderItemShipGrpInvResFacilityId"> <!-- sanity check for valid facility --> <entity-one entity-name="Facility" value-name="facility"> - <field-map field-name="facilityId" env-name="orderItemShipGrpInvResFacilityId"/> + <field-map field-name="facilityId" from-field="orderItemShipGrpInvResFacilityId"/> </entity-one> <!-- should never be empty - referential integrity enforced --> @@ -1378,8 +1378,8 @@ <!-- Iterate through the order items in the ship group --> <entity-and entity-name="OrderItemShipGroupAssoc" list-name="orderItemShipGroupAssocs"> - <field-map field-name="orderId" env-name="parameters.orderId"/> - <field-map field-name="shipGroupSeqId" env-name="parameters.shipGroupSeqId"/> + <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"> <get-related-one relation-name="OrderItem" value-name="orderItemShipGroupAssoc" to-value-name="orderItem"/> @@ -1393,8 +1393,8 @@ <!-- Set the status of any linked sales order items to completed as well --> <entity-and entity-name="OrderItemAssoc" list-name="orderItemAssocs"> - <field-map field-name="toOrderId" env-name="parameters.orderId"/> - <field-map field-name="toOrderItemSeqId" env-name="orderItem.orderItemSeqId"/> + <field-map field-name="toOrderId" from-field="parameters.orderId"/> + <field-map field-name="toOrderItemSeqId" from-field="orderItem.orderItemSeqId"/> <field-map field-name="orderItemAssocTypeId" value="DROP_SHIPMENT"/> </entity-and> <if-not-empty field="orderItemAssocs"> @@ -1420,7 +1420,7 @@ <!-- lookup all the approved items, doing by item because the item must be approved before shipping --> <entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItemAndShipGroupAssocList"> - <field-map field-name="orderId" env-name="orderHeader.orderId"/> + <field-map field-name="orderId" from-field="orderHeader.orderId"/> <field-map field-name="statusId" value="ITEM_APPROVED"/> </entity-and> @@ -1445,8 +1445,8 @@ <iterate list-name="orderItemShipGroupList" entry-name="orderItemShipGroup"> <!-- lookup all the approved items --> <entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItems"> - <field-map field-name="orderId" env-name="orderHeader.orderId"/> - <field-map field-name="shipGroupSeqId" env-name="orderItemShipGroup.shipGroupSeqId"/> + <field-map field-name="orderId" from-field="orderHeader.orderId"/> + <field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/> <field-map field-name="statusId" value="ITEM_APPROVED"/> </entity-and> @@ -1510,9 +1510,9 @@ <!-- place all issued items into a single package --> <entity-and entity-name="ItemIssuance" list-name="itemIssuances"> - <field-map field-name="orderId" env-name="orderHeader.orderId"/> - <field-map field-name="shipGroupSeqId" env-name="orderItemShipGroup.shipGroupSeqId"/> - <field-map field-name="shipmentId" env-name="shipment.shipmentId"/> + <field-map field-name="orderId" from-field="orderHeader.orderId"/> + <field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/> + <field-map field-name="shipmentId" from-field="shipment.shipmentId"/> </entity-and> <set value="New" field="shipmentPackageSeqId"/> @@ -1569,7 +1569,7 @@ <!-- get the product store entity --> <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <get-related relation-name="OrderItemShipGroup" value-name="orderHeader" list-name="orderItemShipGroupList"/> @@ -1588,7 +1588,7 @@ <get-related value-name="orderHeader" relation-name="OrderItem" list-name="orderItems"/> <iterate entry="orderItem" list-name="orderItems"> <entity-one entity-name="Product" value-name="itemProduct" auto-field-map="false" use-cache="true"> - <field-map field-name="productId" env-name="orderItem.productId"/> + <field-map field-name="productId" from-field="orderItem.productId"/> </entity-one> <!-- make sure the OrderItem is for a Product that has a ProductType with isPhysical=Y --> @@ -1644,7 +1644,7 @@ <!-- 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"> - <field-map field-name="itemIssuanceId" env-name="parameters.itemIssuanceId"/> + <field-map field-name="itemIssuanceId" from-field="parameters.itemIssuanceId"/> </entity-one> <clear-field field-name="shipItemContext"/> <set from-field="parameters.shipmentPackageSeqId" field="shipItemContext.shipmentPackageSeqId"/> @@ -1719,7 +1719,7 @@ <if-not-empty field="orderHeader.productStoreId"> <!-- get the product store entity --> <entity-one entity-name="ProductStore" value-name="productStore"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if-compare field="productStore.reserveInventory" operator="not-equals" value="Y"> @@ -1780,7 +1780,7 @@ <log level="info" message="QuickShipOrderByItem grouping by tracking number : ${itemMap.trackingNum}"/> <entity-one entity-name="ItemIssuance" value-name="itemIssuance"> - <field-map field-name="itemIssuanceId" env-name="itemMap.itemIssuanceId"/> + <field-map field-name="itemIssuanceId" from-field="itemMap.itemIssuanceId"/> </entity-one> <clear-field field-name="shipItemContext"/> @@ -1989,7 +1989,7 @@ </check-permission> <entity-and entity-name="OrderShipment" list-name="orderShipmentList"> - <field-map field-name="shipmentId" env-name="parameters.shipmentId"/> + <field-map field-name="shipmentId" from-field="parameters.shipmentId"/> </entity-and> <iterate entry="orderShipment" list-name="orderShipmentList"> <clear-field field-name="deleteOrderShipmentMap"/> @@ -2057,8 +2057,8 @@ <result-to-field result-name="shipmentRouteSegmentId" field-name="shipmentRouteSegmentId" map-name="routeSegMap"/> </call-service> <entity-one entity-name="ShipmentRouteSegment" value-name="shipmentRouteSegment"> - <field-map field-name="shipmentId" env-name="shipRouteSegMap.shipmentId"/> - <field-map field-name="shipmentRouteSegmentId" env-name="routeSegMap.shipmentRouteSegmentId"/> + <field-map field-name="shipmentId" from-field="shipRouteSegMap.shipmentId"/> + <field-map field-name="shipmentRouteSegmentId" from-field="routeSegMap.shipmentRouteSegmentId"/> </entity-one> <assert> <not><if-empty field="shipmentRouteSegment"/></not> 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=730092&r1=730091&r2=730092&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:11:15 2008 @@ -73,7 +73,7 @@ <log level="info" message="=======ShipmentId=======${completePackOutMap.shipmentId}===="/> <entity-one entity-name="Shipment" value-name="shipment"> - <field-map field-name="shipmentId" env-name="completePackOutMap.shipmentId"/> + <field-map field-name="shipmentId" from-field="completePackOutMap.shipmentId"/> </entity-one> <assert> @@ -93,7 +93,7 @@ <set field="invoicesCreated" from-field="createInvFrmShipmentOutMap.invoicesCreated"/> <iterate list-name="invoicesCreated" entry-name="invoiceCreated"> <entity-one entity-name="Invoice" value-name="invoice"> - <field-map field-name="invoiceId" env-name="invoiceCreated"/> + <field-map field-name="invoiceId" from-field="invoiceCreated"/> </entity-one> <assert> @@ -132,7 +132,7 @@ <log level="info" message="=============Update Shipment Id=============${updateShipmentOutMap.shipmentId}========================="/> <entity-one entity-name="Shipment" value-name="shipment"> - <field-map field-name="shipmentId" env-name="updateShipmentOutMap.shipmentId"/> + <field-map field-name="shipmentId" from-field="updateShipmentOutMap.shipmentId"/> </entity-one> <assert> 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=730092&r1=730091&r2=730092&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:11:15 2008 @@ -71,7 +71,7 @@ <call-simple-method method-name="workEffortPartyOwnerRolePermission"/> <!-- get the existing parent ID --> <entity-one entity-name="WorkEffort" value-name="workEffort"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> </entity-one> <if> <condition> 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=730092&r1=730091&r2=730092&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:11:15 2008 @@ -62,9 +62,9 @@ </call-class-method> <!-- check if timesheet already exists --> <entity-and entity-name="Timesheet" list-name="timesheets"> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="fromDate" env-name="parameters.fromDate"/> - <field-map field-name="thruDate" env-name="parameters.thruDate"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="fromDate" from-field="parameters.fromDate"/> + <field-map field-name="thruDate" from-field="parameters.thruDate"/> </entity-and> <if-empty field="timesheets"> <call-simple-method method-name="createTimesheet"/> @@ -169,15 +169,15 @@ <if-empty field="timeEntry.partyId"> <if-not-empty field="timeEntry.timesheetId"> <entity-one entity-name="Timesheet" value-name="timesheet"> - <field-map field-name="timesheetId" env-name="timeEntry.timesheetId"/> + <field-map field-name="timesheetId" from-field="timeEntry.timesheetId"/> </entity-one> <set field="timeEntry.partyId" from-field="timesheet.partyId"/> </if-not-empty> </if-empty> <if-not-empty field="timeEntry.partyId"> <entity-and entity-name="PartyRate" list-name="partyRates" filter-by-date="true"> - <field-map field-name="rateTypeId" env-name="timeEntry.rateTypeId"/> - <field-map field-name="partyId" env-name="timeEntry.partyId"/> + <field-map field-name="rateTypeId" from-field="timeEntry.rateTypeId"/> + <field-map field-name="partyId" from-field="timeEntry.partyId"/> </entity-and> <if-not-empty field="partyRates"> <first-from-list entry-name="partyRate" list-name="partyRates"/> 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=730092&r1=730091&r2=730092&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:11:15 2008 @@ -88,7 +88,7 @@ <set field="updCustReq.statusId" value="CRQ_REVIEWED"/> <call-service service-name="setCustRequestStatus" in-map-name="updCustReq"/> <entity-and list="custRequestContents" entity-name="CustRequestContent"> - <field-map field-name="custRequestId" env-name="parameters.custRequestId"/> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> <iterate entry="custRequestContent" list-name="custRequestContents"> <set field="newWorkEffortContent.workEffortId" from-field="newEntity.workEffortId"/> @@ -129,8 +129,8 @@ <if-not-empty field="lookedUpValue.currentStatusId"> <!-- check if the status change is a valid change --> <entity-and entity-name="StatusValidChange" list-name="validChange"> - <field-map field-name="statusId" env-name="lookedUpValue.currentStatusId"/> - <field-map field-name="statusIdTo" env-name="parameters.currentStatusId"/> + <field-map field-name="statusId" from-field="lookedUpValue.currentStatusId"/> + <field-map field-name="statusIdTo" from-field="parameters.currentStatusId"/> </entity-and> <if-empty field="validChange"> @@ -170,8 +170,8 @@ <simple-method method-name="deleteWorkEffort" short-description="Delete Work Effort"> <!-- check permissions before moving on: if update or delete logged in user must be associated OR have the corresponding UPDATE or DELETE permissions --> <entity-and entity-name="WorkEffortPartyAssignment" list-name="wepaList"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> <if-empty field="wepaList"> <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="Security Error: to run deleteWorkEffort you must have the WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN permission"/></check-permission> @@ -249,9 +249,9 @@ <simple-method method-name="assignPartyToWorkEffort" short-description="Assign Party to Work Effort"> <!-- check if the requested party Assignment already exist --> <entity-and entity-name="WorkEffortPartyAssignment" list-name="currentAssignments" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="roleTypeId" env-name="parameters.roleTypeId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> </entity-and> <if-not-empty field="currentAssignments"> <first-from-list entry-name="firstAssignment" list-name="currentAssignments"/> @@ -1115,7 +1115,7 @@ <check-errors /> <!-- look up the old workEffort and clone it --> <entity-one entity-name="WorkEffort" value-name="oldWorkEffort"> - <field-map field-name="workEffortId" env-name="parameters.oldWorkEffortId"/> + <field-map field-name="workEffortId" from-field="parameters.oldWorkEffortId"/> </entity-one> <clone-value value-name="oldWorkEffort" new-value-name="newWorkEffort"/> @@ -1134,7 +1134,7 @@ <create-value value-name="newTempValue"/> </iterate> <entity-and entity-name="WorkEffortAssoc" list-name="foundValues"> - <field-map field-name="workEffortIdTo" env-name="parameters.oldWorkEffortId"/> + <field-map field-name="workEffortIdTo" from-field="parameters.oldWorkEffortId"/> </entity-and> <iterate entry="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -1228,7 +1228,7 @@ </call-service> <call-simple-method method-name="testUpdateEventService"/> <entity-one entity-name="WorkEffort" value-name="workEffort"> - <field-map field-name="workEffortId" env-name="eventMap.workEffortId"/> + <field-map field-name="workEffortId" from-field="eventMap.workEffortId"/> </entity-one> <assert> <not><if-empty field="workEffort"/></not> @@ -1266,10 +1266,10 @@ <call-simple-method method-name="testUpdateProjectService"/> <call-simple-method method-name="testCreateWorkEffortNoteService"/> <entity-one entity-name="WorkEffort" value-name="workEffort"> - <field-map field-name="workEffortId" env-name="projectMap.workEffortId"/> + <field-map field-name="workEffortId" from-field="projectMap.workEffortId"/> </entity-one> <entity-one entity-name="NoteData" value-name="noteData"> - <field-map field-name="noteId" env-name="workEffortNoteMap.noteId"/> + <field-map field-name="noteId" from-field="workEffortNoteMap.noteId"/> </entity-one> <assert> <not><if-empty field="workEffort"/></not> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -52,8 +52,8 @@ <if-not-empty field="column"> <entity-and entity-name="PortalPagePortlet" list-name="portalPortletList"> - <field-map field-name="portalPageId" env-name="column.portalPageId"/> - <field-map field-name="columnSeqId" env-name="column.columnSeqId"/> + <field-map field-name="portalPageId" from-field="column.portalPageId"/> + <field-map field-name="columnSeqId" from-field="column.columnSeqId"/> </entity-and> <iterate list-name="portalPortletList" entry-name="portalPortlet"> @@ -94,9 +94,9 @@ <simple-method method-name="getPortletAttributes" short-description="Get all attributes of a Portlet" login-required="true"> <entity-and entity-name="PortletAttribute" list-name="attributeList"> - <field-map field-name="portalPageId" env-name="parameters.portalPageId"/> - <field-map field-name="portalPortletId" env-name="parameters.portalPortletId"/> - <field-map field-name="portletSeqId" env-name="parameters.portletSeqId"/> + <field-map field-name="portalPageId" from-field="parameters.portalPageId"/> + <field-map field-name="portalPortletId" from-field="parameters.portalPortletId"/> + <field-map field-name="portletSeqId" from-field="parameters.portletSeqId"/> </entity-and> <iterate list-name="attributeList" entry-name="attributeRecord"> <set field="attributeMap.${attributeRecord.attrName}" from-field="attributeRecord.attrValue"/> @@ -127,7 +127,7 @@ <if-not-empty field="portalPage"> <entity-and entity-name="PortalPageColumn" list-name="portalPageColumnList"> - <field-map field-name="portalPageId" env-name="portalPage.portalPageId"/> + <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/> </entity-and> <iterate list-name="portalPageColumnList" entry-name="portalPageColumn"> @@ -146,8 +146,8 @@ <set field="mainPortalPageId" from-field="parameters.mainPortalPageId"/> <entity-and entity-name="PortalPage" list-name="getMainPage"> - <field-map field-name="originalPortalPageId" env-name="mainPortalPageId"/> - <field-map field-name="ownerUserLoginId" env-name="userLogin.userLoginId"/> + <field-map field-name="originalPortalPageId" from-field="mainPortalPageId"/> + <field-map field-name="ownerUserLoginId" from-field="userLogin.userLoginId"/> </entity-and> <if-empty field="getMainPage"> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml Tue Dec 30 03:11:15 2008 @@ -28,7 +28,7 @@ </entity-and> <iterate list-name="currencies" entry-name="currency"> <entity-and entity-name="CurrencyDimension" list-name="currencyDims"> - <field-map field-name="currencyId" env-name="currency.uomId"/> + <field-map field-name="currencyId" from-field="currency.uomId"/> </entity-and> <if-not-empty field="currencyDims"> <iterate list-name="currencyDims" entry-name="currencyDim"> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -26,7 +26,7 @@ <!-- find the most recent status record and set the statusEndDate --> <entity-and entity-name="ExampleStatus" list-name="oldExampleStatusList"> - <field-map field-name="exampleId" env-name="parameters.exampleId"/> + <field-map field-name="exampleId" from-field="parameters.exampleId"/> <order-by field-name="-statusDate"/> </entity-and> <first-from-list entry-name="oldExampleStatus" list-name="oldExampleStatusList"/> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -100,9 +100,9 @@ <set field="found" value="false"/> <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId"> <entity-and list="emailOwners" entity-name="PartyRelationship" filter-by-date="true"> - <field-map field-name="partyIdFrom" env-name="userLogin.partyId" /> + <field-map field-name="partyIdFrom" from-field="userLogin.partyId" /> <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" /> - <field-map field-name="partyIdTo" env-name="parameters.partyId"/> + <field-map field-name="partyIdTo" from-field="parameters.partyId"/> </entity-and> <if-not-empty field="emailOwners"> <set field="found" value="true"/> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -30,7 +30,7 @@ <then> <if-not-empty field="custReq.fromPartyId"> <entity-and entity-name="PartyAndUserLogin" list-name="partyUserLogin"> - <field-map field-name="partyId" env-name="custReq.fromPartyId"/> + <field-map field-name="partyId" from-field="custReq.fromPartyId"/> </entity-and> <first-from-list entry-name="partyUserLogin" list-name="partyUserLogin"/> <entity-one entity-name="UserPreference" value-name="userPref"> @@ -90,14 +90,14 @@ <then> <if-not-empty field="storeEmail.bodyScreenLocation"> <entity-one entity-name="Person" value-name="person"> - <field-map field-name="partyId" env-name="custReq.fromPartyId"/> + <field-map field-name="partyId" from-field="custReq.fromPartyId"/> </entity-one> <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> <result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" env-name="storeEmail.productStoreId" /> + <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> </entity-and> <first-from-list entry-name="webSite" list-name="webSites" /> <entity-one entity-name="UserLogin" value-name="userLoginSystem"> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -317,8 +317,8 @@ <simple-method method-name="getPortalPageId" short-description=""> <set field="mainPortalPageId" value="MAINMYPORTAL"/> <entity-and entity-name="PortalPage" list-name="getMainPage"> - <field-map field-name="originalPortalPageId" env-name="mainPortalPageId"/> - <field-map field-name="ownerUserLoginId" env-name="userLogin.userLoginId"/> + <field-map field-name="originalPortalPageId" from-field="mainPortalPageId"/> + <field-map field-name="ownerUserLoginId" from-field="userLogin.userLoginId"/> </entity-and> <first-from-list entry-name="getMyportal" list-name="getMainPage"/> <if-empty field="getMainPage"> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -30,7 +30,7 @@ <then> <if-not-empty field="custReq.fromPartyId"> <entity-and entity-name="PartyAndUserLogin" list-name="partyUserLogin"> - <field-map field-name="partyId" env-name="custReq.fromPartyId"/> + <field-map field-name="partyId" from-field="custReq.fromPartyId"/> </entity-and> <first-from-list entry-name="partyUserLogin" list-name="partyUserLogin"/> <entity-one entity-name="UserPreference" value-name="userPref"> @@ -90,14 +90,14 @@ <then> <if-not-empty field="storeEmail.bodyScreenLocation"> <entity-one entity-name="Person" value-name="person"> - <field-map field-name="partyId" env-name="custReq.fromPartyId"/> + <field-map field-name="partyId" from-field="custReq.fromPartyId"/> </entity-one> <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> <result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" env-name="storeEmail.productStoreId" /> + <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> </entity-and> <first-from-list entry-name="webSite" list-name="webSites" /> <entity-one entity-name="UserLogin" value-name="userLoginSystem"> 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=730092&r1=730091&r2=730092&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 03:11:15 2008 @@ -152,19 +152,19 @@ <set field="isMember" value="true" type="Boolean"/> <!--log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId: ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription} isMember: ${isMember}"/--> <entity-and list="custRequests" entity-name="WorkEffortCustRequestView"> - <field-map field-name="workEffortId" env-name="taskId"/> + <field-map field-name="workEffortId" from-field="taskId"/> </entity-and> <first-from-list list-name="custRequests" entry-name="custRequest"/> <entity-and entity-name="PartyRelationship" list-name="accounts"> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> - <field-map field-name="partyIdTo" env-name="custRequest.fromPartyId"/> + <field-map field-name="partyIdTo" from-field="custRequest.fromPartyId"/> </entity-and> <first-from-list list-name="accounts" entry-name="accountCustReq"/> <entity-and entity-name="PartyRelationship" list-name="accounts"> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> - <field-map field-name="partyIdTo" env-name="parameters.userLogin.partyId"/> + <field-map field-name="partyIdTo" from-field="parameters.userLogin.partyId"/> </entity-and> <first-from-list list-name="accounts" entry-name="accountLogin"/> <if> @@ -346,7 +346,7 @@ <return/> <else> <entity-one entity-name="WorkEffort" value-name="task" use-cache="true" > - <field-map field-name="workEffortId" env-name="taskId"/> + <field-map field-name="workEffortId" from-field="taskId"/> </entity-one> <set field="phaseId" from-field="task.workEffortParentId"/> </else> @@ -355,14 +355,14 @@ </if-empty> <if-empty field="projectId"> <entity-one entity-name="WorkEffort" value-name="phase" use-cache="true"> - <field-map field-name="workEffortId" env-name="phaseId"/> + <field-map field-name="workEffortId" from-field="phaseId"/> </entity-one> <set field="projectId" from-field="phase.workEffortParentId"/> </if-empty> <if-not-empty field="projectId"> <entity-and entity-name="WorkEffortPartyAssignment" list-name="projectAssigns" filter-by-date="true" use-cache="true"> - <field-map field-name="workEffortId" env-name="projectId"/> - <field-map field-name="partyId" env-name="partyId"/> + <field-map field-name="workEffortId" from-field="projectId"/> + <field-map field-name="partyId" from-field="partyId"/> </entity-and> <if-not-empty field="projectAssigns"> <set field="isMember" value="true" type="Boolean"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 03:11:15 2008 @@ -62,7 +62,7 @@ short-description="update/create a specif role and type for a project input map: updProjectRole.newPartyId, updProjectRole.roleTypeId"> <entity-and entity-name="WorkEffortPartyAssignment" list-name="workEffortPartyAssignments" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> <field-map field-name="roleTypeId" value="updProjectRole.roleTypeId"/> </entity-and> <!-- end current record if required --> @@ -159,10 +159,10 @@ <if-not-empty field="parameters.fromDate"> <!-- status changed or assignment ended --> <entity-one entity-name="WorkEffortPartyAssignment" value-name="assignment"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="roleTypeId" env-name="parameters.roleTypeId"/> - <field-map field-name="fromDate" env-name="parameters.fromDate"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> + <field-map field-name="fromDate" from-field="parameters.fromDate"/> </entity-one> <if-compare field="parameters.statusId" value="PAS_ENDED" operator="equals"> <!-- special case to indicate end of assignment --> @@ -186,7 +186,7 @@ <simple-method method-name="updateTaskStatusToComplete" short-description="Check partyassignments on a task, if all completes set task status to completed and set actual completiondate to now"> <entity-and entity-name="WorkEffortPartyAssignment" list-name="assignments" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> </entity-and> <!-- check if all open assignments were completed --> <if-not-empty field="assignments"> @@ -202,7 +202,7 @@ <call-simple-method method-name="updateWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <!-- check for related customer request, set these too to completed --> <entity-and list="custRequests" entity-name="CustRequestWorkEffort"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> </entity-and> <if-not-empty field="custRequests"> <iterate entry="custReq" list-name="custRequests"> @@ -267,7 +267,7 @@ </condition> <then> <entity-and entity-name="WorkEffortAssoc" list-name="assocs"> - <field-map field-name="workEffortIdTo" env-name="taskId"/> + <field-map field-name="workEffortIdTo" from-field="taskId"/> </entity-and> <if-not-empty field="assocs"> <iterate entry="assoc" list-name="assocs"> @@ -322,7 +322,7 @@ </call-class-method> <else> <entity-one entity-name="WorkEffort" value-name="workEffort"> - <field-map field-name="workEffortId" env-name="taskId"/> + <field-map field-name="workEffortId" from-field="taskId"/> </entity-one> <if-not-empty field="workEffortId.parentWorkEffortId"> <set field="taskId" from-field="workEffortId.parentWorkEffortId"/> @@ -338,7 +338,7 @@ <!-- create the tasklist --> <entity-one entity-name="WorkEffort" value-name="project"> - <field-map field-name="workEffortId" env-name="parameters.projectId"/> + <field-map field-name="workEffortId" from-field="parameters.projectId"/> </entity-one> <get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/> <if-not-empty field="phases"> @@ -358,7 +358,7 @@ <set field="upd.workEffortId" from-field="task.workEffortId"/> <call-service service-name="updateWorkEffort" in-map-name="upd"/> <entity-one entity-name="WorkEffort" value-name="newTask"> - <field-map field-name="workEffortId" env-name="task.workEffortId"/> + <field-map field-name="workEffortId" from-field="task.workEffortId"/> </entity-one> <call-class-method class-name="org.ofbiz.project.Various" method-name="setDatesFollowingTasks"> <field field-name="newTask" type="org.ofbiz.entity.GenericValue"/> @@ -382,8 +382,8 @@ <!-- check if party assigned to task, when not add with roletype of project, if assigned check status --> <entity-and entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="partyId" env-name="timesheet.partyId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="partyId" from-field="timesheet.partyId"/> </entity-and> <if-empty field="assigns"> <set field="getpr.taskId" from-field="parameters.workEffortId"/> @@ -391,8 +391,8 @@ <result-to-field result-name="projectId"/> </call-service> <entity-and entity-name="WorkEffortPartyAssignment" list-name="projectAssigns" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="projectId"/> - <field-map field-name="partyId" env-name="timesheet.partyId"/> + <field-map field-name="workEffortId" from-field="projectId"/> + <field-map field-name="partyId" from-field="timesheet.partyId"/> </entity-and> <first-from-list entry-name="projectAssign" list-name="projectAssigns"/> <set field="parameters.partyId" from-field="timesheet.partyId"/> @@ -458,8 +458,8 @@ <!-- update the assignment status if required --> <if-compare field="parameters.checkComplete" value="Y" operator="equals"> <entity-and entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> - <field-map field-name="partyId" env-name="timesheet.partyId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> + <field-map field-name="partyId" from-field="timesheet.partyId"/> </entity-and> <first-from-list entry-name="alreadyAssign" list-name="assigns"/> <if-compare field="alreadyAssign.statusId" value="PAS_COMPLETED" operator="not-equals"> @@ -481,7 +481,7 @@ </if-empty> <if-not-empty field="parameters.taskId"> <entity-one entity-name="WorkEffort" value-name="task"> - <field-map field-name="workEffortId" env-name="parameters.taskId"/> + <field-map field-name="workEffortId" from-field="parameters.taskId"/> </entity-one> <if-not-empty field="task"> <get-related-one value-name="task" relation-name="ParentWorkEffort" to-value-name="phase"/> @@ -491,7 +491,7 @@ </if-not-empty> <else> <entity-one entity-name="WorkEffort" value-name="phase"> - <field-map field-name="workEffortId" env-name="parameters.phaseId"/> + <field-map field-name="workEffortId" from-field="parameters.phaseId"/> </entity-one> </else> </if-not-empty> @@ -511,7 +511,7 @@ <simple-method method-name="copyProject" short-description="copy a project with related phases and tasks however no actual data"> <entity-one entity-name="WorkEffort" value-name="project"> - <field-map field-name="workEffortId" env-name="parameters.projectId"/> + <field-map field-name="workEffortId" from-field="parameters.projectId"/> </entity-one> <if-empty field="project"> @@ -597,7 +597,7 @@ <set field="parameters.hoursPartyId" from-field="parameters.partyId"/> </if-not-empty> <entity-one entity-name="WorkEffort" value-name="project"> - <field-map field-name="workEffortId" env-name="parameters.projectId"/> + <field-map field-name="workEffortId" from-field="parameters.projectId"/> </entity-one> <set field="highInfo.projectId" from-field="project.workEffortId"/> <set field="highInfo.projectName" from-field="project.workEffortName"/> @@ -605,7 +605,7 @@ <set field="highInfo.scopeEnumId" from-field="project.scopeEnumId"/> <set field="highInfo.createdStamp" from-field="project.createdStamp"/> <entity-one entity-name="StatusItem" value-name="highSeq"> - <field-map field-name="statusId" env-name="project.currentStatusId"/> + <field-map field-name="statusId" from-field="project.currentStatusId"/> </entity-one> <set field="highInfo.createdDate" from-field="project.createdDate"/> <set field="highInfo.parentProjectId" from-field="parentProject.workEffortId"/> @@ -630,7 +630,7 @@ <!-- translate squenceId back into statusId --> <entity-and entity-name="StatusItem" list-name="statusses"> - <field-map field-name="sequenceId" env-name="highInfo.sequenceId"/> + <field-map field-name="sequenceId" from-field="highInfo.sequenceId"/> <field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/> </entity-and> <first-from-list entry-name="status" list-name="statusses"/> @@ -672,14 +672,14 @@ </if-empty> <entity-and entity-name="WorkEffort" list-name="phases"> <field-map field-name="workEffortTypeId" value="PHASE"/> - <field-map field-name="workEffortParentId" env-name="parameters.projectId"/> + <field-map field-name="workEffortParentId" from-field="parameters.projectId"/> <order-by field-name="workEffortName"/> </entity-and> <if-not-empty field="phases"> <iterate entry="phase" list-name="phases"> <!-- get the phase seq id --> <entity-one entity-name="StatusItem" value-name="highSeq"> - <field-map field-name="statusId" env-name="phase.currentStatusId"/> + <field-map field-name="statusId" from-field="phase.currentStatusId"/> </entity-one> <clear-field field-name="highInfo"/> <set field="highInfo.sequenceId" from-field="highSeq.sequenceId"/> @@ -707,7 +707,7 @@ <!-- translate squenceId back into statusId --> <entity-and entity-name="StatusItem" list-name="statusses"> - <field-map field-name="sequenceId" env-name="highInfo.sequenceId"/> + <field-map field-name="sequenceId" from-field="highInfo.sequenceId"/> <field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/> </entity-and> <first-from-list entry-name="status" list-name="statusses"/> @@ -746,7 +746,7 @@ <return/> </if-empty> <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks"> - <field-map field-name="projectId" env-name="parameters.projectId"/> + <field-map field-name="projectId" from-field="parameters.projectId"/> <order-by field-name="phaseName"/> <order-by field-name="workEffortName"/> </entity-and> @@ -771,7 +771,7 @@ <simple-method method-name="getProjectTask" short-description="get Project task information" login-required="true"> <entity-one entity-name="WorkEffort" value-name="lowInfo"> - <field-map field-name="workEffortId" env-name="parameters.taskId"/> + <field-map field-name="workEffortId" from-field="parameters.taskId"/> </entity-one> <set field="highInfo.taskId" from-field="lowInfo.workEffortId"/> <set field="highInfo.taskName" from-field="lowInfo.workEffortName"/> @@ -813,7 +813,7 @@ <if-empty field="projectParty"> <set field="projectParty.partyId" from-field="task.partyId"/> <entity-one entity-name="PartyNameView" value-name="partyNameView"> - <field-map field-name="partyId" env-name="task.partyId"/> + <field-map field-name="partyId" from-field="task.partyId"/> </entity-one> <if-not-empty field="partyNameView"> <set field="projectParty.partyName" value="${partyNameView.lastName},${partyNameView.firstName}${partyNameView.groupName}"/> @@ -876,7 +876,7 @@ <if-empty field="taskParty"> <set field="taskParty.partyId" from-field="task.partyId"/> <entity-one entity-name="PartyNameView" value-name="partyNameView"> - <field-map field-name="partyId" env-name="task.partyId"/> + <field-map field-name="partyId" from-field="task.partyId"/> </entity-one> <if-not-empty field="partyNameView"> <set field="taskParty.partyName" value="${partyNameView.lastName},${partyNameView.firstName}${partyNameView.groupName}"/> @@ -979,7 +979,7 @@ </if-compare> <entity-one entity-name="StatusItem" value-name="status"> - <field-map field-name="statusId" env-name="lowInfo.currentStatusId"/> + <field-map field-name="statusId" from-field="lowInfo.currentStatusId"/> </entity-one> <if-empty field="highInfo.sequenceId"> <set field="highInfo.sequenceId" from-field="status.sequenceId"/> @@ -1217,8 +1217,8 @@ </if-not-empty> <!-- get role for this party in this project --> <entity-and entity-name="ProjectPartyAndPhaseAndTask" list-name="taskRoles" filter-by-date="true"> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> </entity-and> <first-from-list entry-name="taskRole" list-name="taskRoles"/> <set field="parameters.roleTypeId" from-field="taskRole.roleTypeId"/> @@ -1240,7 +1240,7 @@ <check-errors/> </if-compare> <entity-and list="entries" entity-name="TimeEntry"> - <field-map field-name="invoiceId" env-name="parameters.invoiceId"/> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-and> <iterate list-name="entries" entry-name="timeEntry"> <clear-field field-name="timeEntry.invoiceId"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 03:11:15 2008 @@ -78,7 +78,7 @@ </if-compare> <check-errors/> <entity-and entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true"> - <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> </entity-and> <!-- if all assigns are complete the task will be set to complete --> <if-not-empty field="assigns"> @@ -155,7 +155,7 @@ <string value="dataResourceName"/> </call-class-method> <entity-one entity-name="Content" value-name="content"> - <field-map field-name="contentId" env-name="formInput.formInput.contentId"/> + <field-map field-name="contentId" from-field="formInput.formInput.contentId"/> </entity-one> <set-service-fields service-name="updateContentAndUploadedFile" map-name="formInput.formInput" to-map-name="inMap"/> <set field="inMap._uploadedFile_fileName" from-field="formInput.imageFileName"/> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Tue Dec 30 03:11:15 2008 @@ -203,7 +203,7 @@ <field field-name="fieldName" type="String"/> </call-object-method> <entity-one entity-name="OrderHeader" value-name="orderHeader"> - <field-map field-name="orderId" env-name="parameters.orderId"/> + <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-one> <if-not-empty field="orderHeader"> <set field="fieldName" value="orderDate" type="String"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |