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=730245&r1=730244&r2=730245&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 13:29:24 2008 @@ -201,7 +201,7 @@ <then> <set field="assignPartyToWorkEffortShip.workEffortId" from-field="lookedUpValue.estimatedShipWorkEffId"/> <set field="assignPartyToWorkEffortShip.partyId" from-field="parameters.partyIdFrom"/> - <find-by-and entity-name="WorkEffortPartyAssignment" list-name="existingShipWepas" map-name="assignPartyToWorkEffortShip"/> + <find-by-and entity-name="WorkEffortPartyAssignment" list="existingShipWepas" map="assignPartyToWorkEffortShip"/> <filter-list-by-date list-name="existingShipWepas"/> <if-empty field="existingShipWepas"> <set field="assignPartyToWorkEffortShip.roleTypeId" value="CAL_ATTENDEE"/> @@ -221,7 +221,7 @@ <then> <set field="assignPartyToWorkEffortArrival.workEffortId" from-field="lookedUpValue.estimatedArrivalWorkEffId"/> <set field="assignPartyToWorkEffortArrival.partyId" from-field="parameters.partyIdTo"/> - <find-by-and entity-name="WorkEffortPartyAssignment" list-name="existingArrivalWepas" map-name="assignPartyToWorkEffortArrival"/> + <find-by-and entity-name="WorkEffortPartyAssignment" list="existingArrivalWepas" map="assignPartyToWorkEffortArrival"/> <filter-list-by-date list-name="existingArrivalWepas"/> <if-empty field="existingArrivalWepas"> <set field="assignPartyToWorkEffortArrival.roleTypeId" value="CAL_ATTENDEE"/> @@ -546,7 +546,7 @@ <if-empty field="shipment.originFacilityId"> <if-compare field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT"> <set from-field="shipment.destinationContactMechId" field="facilityLookup.contactMechId"/> - <find-by-and entity-name="FacilityContactMech" map-name="facilityLookup" list-name="facilities"/> + <find-by-and entity-name="FacilityContactMech" map="facilityLookup" list="facilities"/> <first-from-list list="facilities" entry="destinationFacility"/> <set from-field="destinationFacility.facilityId" field="shipment.destinationFacilityId"/> </if-compare> @@ -583,7 +583,7 @@ <!-- create a ShipmentRouteSegment with originFacilityId (if set on Shipment), destContactMechId, and from OrderItemShipGroup shipmentMethodTypeId, carrierPartyId, etc --> <set from-field="shipment.shipmentId" field="shipmentRouteSegmentMap.shipmentId"/> - <find-by-and entity-name="ShipmentRouteSegment" map-name="shipmentRouteSegmentMap" list-name="shipmentRouteSegments"/> + <find-by-and entity-name="ShipmentRouteSegment" map="shipmentRouteSegmentMap" list="shipmentRouteSegments"/> <if-empty field="shipmentRouteSegments"> <!-- estimatedShipDate, estimatedArrivalDate --> <set from-field="shipment.estimatedShipDate" field="shipmentRouteSegmentMap.estimatedStartDate"/> @@ -1908,7 +1908,7 @@ <!-- make sure the orderItem is not already present in this shipment --> <make-value entity-name="OrderShipment" value-field="orderShipmentLookup"/> <set-pk-fields value-field="orderShipmentLookup" map="parameters"/> - <find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/> + <find-by-and entity-name="OrderShipment" map="orderShipmentLookup" list="existingOrderShipments"/> <if-not-empty field="existingOrderShipments"> <string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the order item is already in the shipment (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list-name="error_list"/> </if-not-empty> @@ -1949,7 +1949,7 @@ <set from-field="parameters.orderId" field="orderShipmentLookup.orderId"/> <set from-field="parameters.orderItemSeqId" field="orderShipmentLookup.orderItemSeqId"/> - <find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/> + <find-by-and entity-name="OrderShipment" map="orderShipmentLookup" list="existingOrderShipments"/> <iterate list="existingOrderShipments" entry="orderShipment"> <calculate field="plannedQuantity" type="Double"> <calcop field="plannedQuantity" operator="add"> @@ -1958,7 +1958,7 @@ </calculate> </iterate> <clear-field field="existingOrderShipments"/> - <find-by-and entity-name="ItemIssuance" map-name="orderShipmentLookup" list-name="existingOrderShipments"/> + <find-by-and entity-name="ItemIssuance" map="orderShipmentLookup" list="existingOrderShipments"/> <iterate list="existingOrderShipments" entry="itemIssuance"> <calculate field="issuedQuantity" type="Double"> <calcop field="issuedQuantity" operator="add"> 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=730245&r1=730244&r2=730245&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 13:29:24 2008 @@ -138,14 +138,14 @@ <set value="CAL_OWNER" field="lookupRoleWorkEffortMap.roleTypeId"/> <log level="always" message="Running find-by-and: ${lookupRoleWorkEffortMap}"/> - <find-by-and entity-name="WorkEffortPartyAssignment" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/> + <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupRoleWorkEffortMap" list="roleParties"/> <filter-list-by-date list-name="roleParties"/> <log level="always" message="Found role parties: ${roleParties}"/> <if-empty field="roleParties"> <log level="info" message="Party ${userLogin.partyId} is not in ${roleTypeId} role with workEffort: ${workEffortId}"/> <set value="CAL_DELEGATE" field="lookupRoleWorkEffortMap.roleTypeId"/> - <find-by-and entity-name="WorkEffortPartyAssignment" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/> + <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupRoleWorkEffortMap" list="roleParties"/> </if-empty> <filter-list-by-date list-name="roleParties"/> @@ -187,7 +187,7 @@ then lookup the parent workEffort and check if user is in any role with WorkEffort --> <set from-field="workEffortId" field="lookupRoleWorkEffortMap.workEffortId"/> <set from-field="userLogin.partyId" field="lookupRoleWorkEffortMap.partyId"/> - <find-by-and entity-name="WorkEffortPartyAssignment" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/> + <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupRoleWorkEffortMap" list="roleParties"/> <filter-list-by-date list-name="roleParties"/> <if-not-empty field="roleParties"> @@ -230,7 +230,7 @@ <if-not-empty field="workEffortId"> <set from-field="workEffortId" field="lookupRoleWorkEffortMap.workEffortId"/> <set from-field="userLogin.partyId" field="lookupRoleWorkEffortMap.partyId"/> - <find-by-and entity-name="WorkEffortPartyAssignByRole" map-name="lookupRoleWorkEffortMap" list-name="roleParties"/> + <find-by-and entity-name="WorkEffortPartyAssignByRole" map="lookupRoleWorkEffortMap" list="roleParties"/> <filter-list-by-date list-name="roleParties"/> <if-empty field="roleParties"> <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/> @@ -256,14 +256,14 @@ <set value="PARTY_GROUP" field="lookupPartyRoleWorkEffortMap.partyTypeId"/> <log level="info" message="Running find-by-and: ${lookupPartyRoleWorkEffortMap}"/> - <find-by-and entity-name="WorkEffortPartyAssignView" map-name="lookupPartyRoleWorkEffortMap" list-name="rolePartyGroups"/> + <find-by-and entity-name="WorkEffortPartyAssignView" map="lookupPartyRoleWorkEffortMap" list="rolePartyGroups"/> <filter-list-by-date list-name="rolePartyGroups"/> <log level="always" message="Found role parties Group: ${rolePartyGroups}"/> <if-empty field="rolePartyGroups"> <log level="info" message="No Party Group found in CAL_OWNER role with workEffort: ${workEffortId}"/> <set value="CAL_DELEGATE" field="lookupRoleWorkEffortMap.roleTypeId"/> - <find-by-and entity-name="WorkEffortPartyAssignView" map-name="lookupRoleWorkEffortMap" list-name="rolePartyGroups"/> + <find-by-and entity-name="WorkEffortPartyAssignView" map="lookupRoleWorkEffortMap" list="rolePartyGroups"/> </if-empty> <filter-list-by-date list-name="rolePartyGroups"/> <if-not-empty field="rolePartyGroups"> @@ -275,7 +275,7 @@ <!-- logged party partyId--> <set from-field="userLogin.partyId" field="lookupPartyRoleMap.partyIdTo"/> <log level="always" message="Conditions: ${lookupPartyRoleMap}"/> - <find-by-and entity-name="PartyRelationship" map-name="lookupPartyRoleMap" list-name="partyGroupRelationships"/> + <find-by-and entity-name="PartyRelationship" map="lookupPartyRoleMap" list="partyGroupRelationships"/> <log level="always" message="Found role parties relations: ${partyGroupRelationships}"/> <if-not-empty field="partyGroupRelationships"> <set field="hasPermission" type="Boolean" value="true"/> 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=730245&r1=730244&r2=730245&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 13:29:24 2008 @@ -106,7 +106,7 @@ <!-- <set from-field="workEffortId" map-name="parameters" to-map-name="findWepaMap"/> <set from-field="partyId" map-name="userLogin" to-map-name="findWepaMap"/> - <find-by-and entity-name="WorkEffortPartyAssignment" map-name="findWepaMap" list-name="wepaList"/> + <find-by-and entity-name="WorkEffortPartyAssignment" map="findWepaMap" list="wepaList"/> <if-empty field="wepaList"> <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateWorkEffort you must have the WORKEFFORTMGR_UPDATE or WORKEFFORTMGR_ADMIN permission"/></check-permission> <check-errors/> @@ -837,7 +837,7 @@ <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"/> + <find-by-and entity-name="WorkEffortFixedAssetAssign" map="findMap" list="existingAssignments"/> <filter-list-by-date list-name="existingAssignments"/> <iterate list="existingAssignments" entry="existingAssignment"> <remove-value value-field="existingAssignment"/> @@ -1127,7 +1127,7 @@ <set field="workEffortAssocFindContext.workEffortIdFrom" from-field="parameters.oldWorkEffortId"/> <set field="reverseWorkEffortFindContext.workEffortIdTo" from-field="parameters.oldWorkEffortId"/> <if-not-empty field="parameters.duplicateWorkEffortAssocs"> - <find-by-and entity-name="WorkEffortAssoc" map-name="workEffortAssocFindContext" list-name="foundValues"/> + <find-by-and entity-name="WorkEffortAssoc" map="workEffortAssocFindContext" list="foundValues"/> <iterate entry="foundValue" list="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> <set from-field="parameters.workEffortId" field="newTempValue.workEffortIdFrom"/> @@ -1147,7 +1147,7 @@ <!-- set up entity filter --> <set field="workEffortFindContext.workEffortId" from-field="parameters.oldWorkEffortId"/> <if-not-empty field="parameters.duplicateWorkEffortNotes"> - <find-by-and entity-name="WorkEffortNote" map-name="workEffortFindContext" list-name="foundValues"/> + <find-by-and entity-name="WorkEffortNote" map="workEffortFindContext" list="foundValues"/> <iterate entry="foundValue" list="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> <set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/> @@ -1155,7 +1155,7 @@ </iterate> </if-not-empty> <if-not-empty field="parameters.duplicateWorkEffortContents"> - <find-by-and entity-name="WorkEffortContent" map-name="workEffortFindContext" list-name="foundValues"/> + <find-by-and entity-name="WorkEffortContent" map="workEffortFindContext" list="foundValues"/> <iterate entry="foundValue" list="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> <set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/> @@ -1163,7 +1163,7 @@ </iterate> </if-not-empty> <if-not-empty field="parameters.duplicateWorkEffortAssignmentRates"> - <find-by-and entity-name="RateAmount" map-name="workEffortFindContext" list-name="foundValuesAll"/> + <find-by-and entity-name="RateAmount" map="workEffortFindContext" list="foundValuesAll"/> <filter-list-by-date list-name="foundValuesAll" to-list-name="foundValues"/> <iterate entry="foundValue" list="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=730245&r1=730244&r2=730245&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Tue Dec 30 13:29:24 2008 @@ -27,7 +27,7 @@ <if-not-empty field="parameters.lastName"> <set from-field="parameters.lastName" field="LookupMap.lastName"/> </if-not-empty> - <find-by-and entity-name="Person" map-name="LookupMap" list-name="parties" /> + <find-by-and entity-name="Person" map="LookupMap" list="parties" /> <iterate entry="party" list="parties"> <set from-field="party.firstName" field="resultEntry.label"/> <set from-field="party.partyId" field="resultEntry.value"/> |
Free forum by Nabble | Edit this page |