Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml Tue Dec 30 03:49:32 2008 @@ -25,7 +25,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="newEntity"/> + <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarIdAlreadyExist"/> @@ -34,7 +34,7 @@ <else> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="newEntity"/> + <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-field="newEntity"/> <if-empty field="newEntity.calendarWeekId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekIdNotExisting"/> @@ -56,7 +56,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -82,7 +82,7 @@ </add-error> <check-errors/> </if-not-empty> - <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.calendarWeekId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> @@ -93,7 +93,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="newEntity"/> + <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarWeekId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekIdAlreadyExist"/> @@ -113,7 +113,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -139,7 +139,7 @@ </add-error> <check-errors/> </if-not-empty> - <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.calendarWeekId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> @@ -150,7 +150,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="newEntity"/> + <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionDayIdAlreadyExist"/> @@ -170,7 +170,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -180,7 +180,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.calendarId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> @@ -191,7 +191,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="newEntity"/> + <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionWeekIdAlreadyExist"/> @@ -211,7 +211,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -221,7 +221,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.calendarId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Tue Dec 30 03:49:32 2008 @@ -41,7 +41,7 @@ <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaign" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="MarketingCampaign" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -52,7 +52,7 @@ <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaign" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="MarketingCampaign" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -73,7 +73,7 @@ <make-value entity-name="MarketingCampaignPrice" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaignPrice" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="MarketingCampaignPrice" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -94,7 +94,7 @@ <make-value entity-name="MarketingCampaignPromo" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaignPromo" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="MarketingCampaignPromo" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -115,7 +115,7 @@ <make-value entity-name="MarketingCampaignRole" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaignRole" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="MarketingCampaignRole" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createMarketingCampaignRole" short-description="Add Role To MarketingCampaign"> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Tue Dec 30 03:49:32 2008 @@ -47,7 +47,7 @@ <make-value entity-name="TrackingCode" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCode" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCode" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <!-- set the history/audit info --> @@ -62,7 +62,7 @@ <make-value entity-name="TrackingCode" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCode" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCode" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <!-- TrackingCodeType methods --> @@ -89,7 +89,7 @@ <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCodeType" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCodeType" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -100,7 +100,7 @@ <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCodeType" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCodeType" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -120,7 +120,7 @@ <make-value entity-name="TrackingCodeOrder" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCodeOrder" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCodeOrder" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <!-- set the history/audit info --> @@ -145,7 +145,7 @@ <simple-method method-name="createTrackingCodeOrderReturns" short-description="Create TrackingCodeOrderReturn for all the Return Items with Orders that have trackingCodeOrder entry"> <if-not-empty field="parameters.returnId"> <set field="returnHeaderFindContext.returnId" from-field="parameters.returnId" /> - <find-by-primary-key entity-name="ReturnHeader" value-name="returnHeader" map-name="returnHeaderFindContext"/> + <find-by-primary-key entity-name="ReturnHeader" value-field="returnHeader" map-name="returnHeaderFindContext"/> <get-related list-name="returnItems" relation-name="ReturnItem" value-name="returnHeader"/> <log level="info" message="Return items lists are : ${returnItems}"/> <iterate list="returnItems" entry="returnItem"> @@ -174,7 +174,7 @@ <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCodeOrderReturn" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCodeOrderReturn" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <!-- set the history/audit info --> @@ -185,7 +185,7 @@ <simple-method method-name="deleteTrackingCodeOrderReturn" short-description="delete an TrackingCodeOrderReturn"> <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCodeOrderReturn" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="TrackingCodeOrderReturn" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Tue Dec 30 03:49:32 2008 @@ -236,7 +236,7 @@ <!-- the rest of the methods require a userLogin object; so if we are anonymous lets fake it --> <if-empty field="userLogin"> <set field="ulLookup.userLoginId" value="anonymous"/> - <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-name="userLogin"/> + <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-field="userLogin"/> <set field="userLogin.partyId" from-field="tempMap.partyId"/> <set-current-user-login value-name="userLogin"/> <else><!-- of an anonymous vistor is coming back, update the party id in the userLogin object --> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 03:49:32 2008 @@ -54,7 +54,7 @@ <!-- Lookup the existing schedule to modify --> <make-value entity-name="OrderDeliverySchedule" value-field="lookupPkMap"/> <set-pk-fields map-name="parameters" value-name="lookupPkMap"/> - <find-by-primary-key entity-name="OrderDeliverySchedule" map-name="lookupPkMap" value-name="schedule"/> + <find-by-primary-key entity-name="OrderDeliverySchedule" map-name="lookupPkMap" value-field="schedule"/> <!-- only set statusId if hasScheduleAdminRelatedPermission --> <set from-field="schedule.statusId" field="saveStatusId"/> @@ -81,7 +81,7 @@ <make-value entity-name="OrderDeliverySchedule" value-field="orderDeliverySchedule"/> <set-pk-fields value-name="orderDeliverySchedule" map-name="parameters"/> - <find-by-primary-key map-name="orderDeliverySchedule" value-name="orderDeliverySchedule"/> + <find-by-primary-key map-name="orderDeliverySchedule" value-field="orderDeliverySchedule"/> <!-- find email address for currently logged in user, set as sendFrom --> <set field="curUserPcmFindMap.partyId" from-field="userLogin.partyId"/> @@ -161,7 +161,7 @@ <set from-field="parameters.orderId" field="lookupOrderRoleMap.orderId"/> <set from-field="userLogin.partyId" field="lookupOrderRoleMap.partyId"/> <set value="SUPPLIER_AGENT" field="lookupOrderRoleMap.roleTypeId"/> - <find-by-primary-key entity-name="OrderRole" map-name="lookupOrderRoleMap" value-name="permOrderRole"/> + <find-by-primary-key entity-name="OrderRole" map-name="lookupOrderRoleMap" value-field="permOrderRole"/> <if> <condition> <if-empty field="permOrderRole"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 03:49:32 2008 @@ -80,7 +80,7 @@ <!-- If PartyAcctgPreference.useInvoiceIdForReturns is Y, get the ID from the getNextInvoiceId service --> <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="parameters.toPartyId"/> <set field="systemMap.userLoginId" value="system"/> - <find-by-primary-key entity-name="UserLogin" map-name="systemMap" value-name="systemLogin"/> + <find-by-primary-key entity-name="UserLogin" map-name="systemMap" value-field="systemLogin"/> <set field="partyAccountingPreferencesCallMap.userLogin" from-field="systemLogin"/> <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> <result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/> @@ -252,7 +252,7 @@ <simple-method method-name="createReturnItem" short-description="Create Return Item"> <set field="lookupPKMap.returnId" from-field="parameters.returnId"/> - <find-by-primary-key entity-name="ReturnHeader" map-name="lookupPKMap" value-name="returnHeader"/> + <find-by-primary-key entity-name="ReturnHeader" map-name="lookupPKMap" value-field="returnHeader"/> <if> <condition> @@ -309,7 +309,7 @@ <make-value value-field="itemLookup" entity-name="OrderItem"/> <set-pk-fields map-name="parameters" value-name="itemLookup"/> <if-not-empty field="parameters.orderItemSeqId"> - <find-by-primary-key entity-name="OrderItem" value-name="orderItem" map-name="itemLookup"/> + <find-by-primary-key entity-name="OrderItem" value-field="orderItem" map-name="itemLookup"/> <log level="info" message="Return item is an OrderItem - ${orderItem.orderItemSeqId}"/> </if-not-empty> </if-not-empty> @@ -433,7 +433,7 @@ <set from-field="parameters.returnId" field="lookupPKMap.returnId"/> <set from-field="parameters.returnItemSeqId" field="lookupPKMap.returnItemSeqId"/> - <find-by-primary-key entity-name="ReturnItem" map-name="lookupPKMap" value-name="returnItem"/> + <find-by-primary-key entity-name="ReturnItem" map-name="lookupPKMap" value-field="returnItem"/> <set field="originalReturnPrice" from-field="returnItem.returnPrice"/> <set field="originalReturnQuantity" from-field="returnItem.returnQuantity"/> <field-to-result field-name="returnItem.statusId" result-name="currentStatusId"/> @@ -487,7 +487,7 @@ <set from-field="parameters.returnId" field="lookupPKMap.returnId"/> <set from-field="parameters.returnItemSeqId" field="lookupPKMap.returnItemSeqId"/> - <find-by-primary-key entity-name="ReturnItem" map-name="lookupPKMap" value-name="returnItem"/> + <find-by-primary-key entity-name="ReturnItem" map-name="lookupPKMap" value-field="returnItem"/> <!--remove related adjustments--> <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments"> <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/> @@ -524,7 +524,7 @@ <check-errors/> <set from-field="parameters.returnAdjustmentId" field="lookupPKMap.returnAdjustmentId"/> - <find-by-primary-key entity-name="ReturnAdjustment" map-name="lookupPKMap" value-name="returnAdjustment"/> + <find-by-primary-key entity-name="ReturnAdjustment" map-name="lookupPKMap" value-field="returnAdjustment"/> <if-not-empty field="returnAdjustment"> <remove-value value-name="returnAdjustment"/> </if-not-empty> @@ -535,7 +535,7 @@ <check-errors/> <set from-field="parameters.returnId" field="lookupPKMap.returnId"/> - <find-by-primary-key entity-name="ReturnHeader" map-name="lookupPKMap" value-name="returnHeader"/> + <find-by-primary-key entity-name="ReturnHeader" map-name="lookupPKMap" value-field="returnHeader"/> <find-by-and entity-name="ShipmentReceipt" map-name="lookupPKMap" list-name="shipmentReceipts"/> <iterate list="shipmentReceipts" entry="receipt"> <if-empty field="totalsMap.${receipt.returnItemSeqId}"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 03:49:32 2008 @@ -725,7 +725,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="OrderItemShipGroup"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="OrderItemShipGroup" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="OrderItemShipGroup" map-name="lookupPKMap" value-field="lookedUpValue"/> <!-- splitting shipmentMethod request parameter value that contains "@" symbol into "shipmentMethodTypeId" and "carrierPartyId". --> @@ -915,7 +915,7 @@ <if-compare field="keepAddressBook" operator="equals" value="Y"> <make-value entity-name="PostalAddress" value-field="newValue"/> <set-pk-fields value-name="newValue" map-name="shipToAddressCtx"/> - <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-name="oldValue"/> + <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-field="oldValue"/> <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/> <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object"> <call-service service-name="createPartyPostalAddress" in-map-name="shipToAddressCtx"> @@ -961,7 +961,7 @@ <if-compare-field field="shipToAddressCtx.shipToContactMechId" operator="equals" to-field="parameters.billToContactMechId"> <make-value entity-name="PostalAddress" value-field="newValue"/> <set-pk-fields value-name="newValue" map-name="shipToAddressCtx"/> - <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-name="oldValue"/> + <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-field="oldValue"/> <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/> <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 03:49:32 2008 @@ -240,7 +240,7 @@ <check-errors/> <set from-field="parameters.partyId" field="lookupPKMap.partyId"/> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> - <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/> + <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-field="partyRole"/> <if-empty field="partyRole.partyId"> <make-value value-field="partyRole" entity-name="PartyRole"/> <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/> @@ -867,7 +867,7 @@ <simple-method method-name="createQuoteWorkEffort" short-description="Create a QuoteWorkEffort"> <make-value entity-name="QuoteWorkEffort" value-field="lookupMap"/> <set-pk-fields map-name="parameters" value-name="lookupMap"/> - <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/> + <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-field="quoteWorkEffort"/> <if-not-empty field="quoteWorkEffort.quoteId"> <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists."/></add-error> <check-errors/> @@ -882,7 +882,7 @@ <simple-method method-name="deleteQuoteWorkEffort" short-description="Delete a QuoteWorkEffort"> <make-value entity-name="QuoteWorkEffort" value-field="lookupMap"/> <set-pk-fields map-name="parameters" value-name="lookupMap"/> - <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/> + <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-field="quoteWorkEffort"/> <if-empty field="quoteWorkEffort.quoteId"> <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] does not exist."/></add-error> <check-errors/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 03:49:32 2008 @@ -192,7 +192,7 @@ <simple-method method-name="updateCustRequestAttribute" short-description="Update Customer Request Attribute"> <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/> <set from-field="parameters.attrName" field="lookupPKMap.attrName"/> - <find-by-primary-key entity-name="CustRequestAttribute" map-name="lookupPKMap" value-name="custRequestAttr"/> + <find-by-primary-key entity-name="CustRequestAttribute" map-name="lookupPKMap" value-field="custRequestAttr"/> <set-nonpk-fields map-name="parameters" value-name="custRequestAttr"/> <store-value value-name="custRequestAttr"/> </simple-method> @@ -214,7 +214,7 @@ <simple-method method-name="updateCustRequestItem" short-description="Update Customer Request Item"> <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/> <set from-field="parameters.custRequestItemSeqId" field="lookupPKMap.custRequestItemSeqId"/> - <find-by-primary-key entity-name="CustRequestItem" map-name="lookupPKMap" value-name="custRequestItem"/> + <find-by-primary-key entity-name="CustRequestItem" map-name="lookupPKMap" value-field="custRequestItem"/> <set-nonpk-fields map-name="parameters" value-name="custRequestItem"/> <store-value value-name="custRequestItem"/> </simple-method> @@ -222,7 +222,7 @@ <simple-method method-name="createCustRequestParty" short-description="Create Customer RequestParty"> <set from-field="parameters.partyId" field="lookupPKMap.partyId"/> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> - <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/> + <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-field="partyRole"/> <if-empty field="partyRole.partyId"> <make-value value-field="partyRole" entity-name="PartyRole"/> <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 03:49:32 2008 @@ -38,7 +38,7 @@ <simple-method method-name="updateRequirement" short-description="Update a requirement"> <make-value value-field="lookupPKMap" entity-name="Requirement"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="Requirement" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="Requirement" map-name="lookupPKMap" value-field="lookedUpValue"/> <clone-value value-name="lookedUpValue" new-value-name="savedValue"/> <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> @@ -100,7 +100,7 @@ <check-errors/> <set from-field="parameters.partyId" field="lookupPKMap.partyId"/> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> - <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/> + <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-field="partyRole"/> <if-empty field="partyRole.partyId"> <make-value value-field="partyRole" entity-name="PartyRole"/> <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 03:49:32 2008 @@ -63,7 +63,7 @@ <make-value entity-name="ContactMech" value-field="ContactMechMap"/> <set-pk-fields value-name="ContactMechMap" map-name="parameters"/> - <find-by-primary-key entity-name="ContactMech" map-name="ContactMechMap" value-name="oldValue" /> + <find-by-primary-key entity-name="ContactMech" map-name="ContactMechMap" value-field="oldValue" /> <if-compare-field to-field="oldValue.infoString" field="parameters.infoString" operator="not-equals"> <log level="info" message="Contact mech need updating"/> <clone-value value-name="oldValue" new-value-name="newValue"/> @@ -130,7 +130,7 @@ <check-errors/> <make-value entity-name="PostalAddress" value-field="newValue"/> <set-pk-fields value-name="newValue" map-name="parameters"/> - <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-name="oldValue" /> + <find-by-primary-key entity-name="PostalAddress" map-name="newValue" value-field="oldValue" /> <set-nonpk-fields map-name="parameters" value-name="newValue"/> <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/> @@ -178,7 +178,7 @@ <simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number"> <make-value entity-name="TelecomNumber" value-field="newValue"/> <set-pk-fields value-name="newValue" map-name="parameters"/> - <find-by-primary-key entity-name="TelecomNumber" map-name="newValue" value-name="oldValue" /> + <find-by-primary-key entity-name="TelecomNumber" map-name="newValue" value-field="oldValue" /> <set-nonpk-fields map-name="parameters" value-name="newValue"/> <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/> @@ -243,7 +243,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ContactMechLink"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ContactMechLink" map-name="lookupPKMap" value-name="contactMechLinkInstance"/> + <find-by-primary-key entity-name="ContactMechLink" map-name="lookupPKMap" value-field="contactMechLinkInstance"/> <remove-value value-name="contactMechLinkInstance"/> </simple-method> @@ -271,7 +271,7 @@ </condition-list> </entity-condition> <set field="lookupHash.emailAddress" from-field="parameters.emailAddress"/> - <find-by-primary-key value-name="emailAddressVerification" entity-name="EmailAddressVerification" map-name="lookupHash"/> + <find-by-primary-key value-field="emailAddressVerification" entity-name="EmailAddressVerification" map-name="lookupHash"/> <set field="bodyParameters.verifyHash" from-field="emailAddressVerification.verifyHash"/> <first-from-list entry="storeEmail" list="productStoreEmailSettings"/> <entity-and list="webSites" entity-name="WebSite"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml Tue Dec 30 03:49:32 2008 @@ -38,7 +38,7 @@ <make-value value-field="lookupPkMap" entity-name="PartyContent"/> <set-pk-fields value-name="lookupPkMap" map-name="parameters"/> - <find-by-primary-key map-name="lookupPkMap" value-name="partyContent"/> + <find-by-primary-key map-name="lookupPkMap" value-field="partyContent"/> <set-nonpk-fields value-name="partyContent" map-name="parameters"/> <store-value value-name="partyContent"/> </simple-method> @@ -47,7 +47,7 @@ <make-value value-field="lookupPkMap" entity-name="PartyContent"/> <set-pk-fields value-name="lookupPkMap" map-name="parameters"/> - <find-by-primary-key map-name="lookupPkMap" value-name="partyContent"/> + <find-by-primary-key map-name="lookupPkMap" value-field="partyContent"/> <remove-value value-name="partyContent"/> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Tue Dec 30 03:49:32 2008 @@ -62,7 +62,7 @@ </call-map-processor> <if-not-empty field="userLoginContext.userLoginId"> <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" /> - <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/> + <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-field="existingUserLogin"/> <if-not-empty field="existingUserLogin"> <set field="tempErrorMessage" value="Username in use, please choose another." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 03:49:32 2008 @@ -325,7 +325,7 @@ <set from-field="dataResourceId" field="dataResource.dataResourceId"/> <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" /> <set from-field="dataResource.dataResourceId" field="lookup.dataResourceId"/> - <find-by-primary-key use-cache="true" entity-name="DataResource" value-name="dataResourceMap" map-name="lookup"/> + <find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map-name="lookup"/> </if-not-empty> <set-service-fields service-name="createContent" map-name="parameters" to-map-name="createContentMap"/> @@ -388,13 +388,13 @@ <if-not-empty field="parameters._uploadedFile_fileName"> <set from-field="parameters.contentId" field="lookupParam.contentId"/> - <find-by-primary-key use-cache="true" entity-name="Content" value-name="content" map-name="lookupParam"/> + <find-by-primary-key use-cache="true" entity-name="Content" value-field="content" map-name="lookupParam"/> <if-not-empty field="content.dataResourceId"> <set-service-fields service-name="updateDataResource" map-name="parameters" to-map-name="dataResource"/> <set from-field="content.dataResourceId" field="dataResource.dataResourceId"/> <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" /> <set from-field="content.dataResourceId" field="lookup.dataResourceId"/> - <find-by-primary-key use-cache="true" entity-name="DataResource" value-name="dataResourceMap" map-name="lookup"/> + <find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map-name="lookup"/> <else> <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field-name="uploadPath"/> <log level="always" message="[createPartyContent] - Found Subdir : ${uploadPath}"/> @@ -419,7 +419,7 @@ <set from-field="dataResourceId" field="dataResource.dataResourceId"/> <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false" /> <set from-field="dataResource.dataResourceId" field="lookup.dataResourceId"/> - <find-by-primary-key use-cache="true" entity-name="DataResource" value-name="dataResourceMap" map-name="lookup"/> + <find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map-name="lookup"/> </else> </if-not-empty> </if-not-empty> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Tue Dec 30 03:49:32 2008 @@ -40,7 +40,7 @@ <results-to-map map-name="partyList"/> </call-service> - <find-by-primary-key entity-name="PartyRoleDetailAndPartyDetail" map-name="searchParams" value-name="partyRoleDetailAndPartyDetail"/> + <find-by-primary-key entity-name="PartyRoleDetailAndPartyDetail" map-name="searchParams" value-field="partyRoleDetailAndPartyDetail"/> <if-not-empty field="partyRoleDetailAndPartyDetail"> <assert><not><if-empty field="partyList"/></not></assert> <else> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Dec 30 03:49:32 2008 @@ -94,7 +94,7 @@ </call-map-processor> <if-not-empty field="userLoginContext.userLoginId"> <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" /> - <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/> + <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-field="existingUserLogin"/> <if-not-empty field="existingUserLogin"> <set field="tempErrorMessage" value="Username in use, please choose another." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 03:49:32 2008 @@ -69,7 +69,7 @@ <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogCategory" map-name="lookupPKMap" value-name="prodCatalogCategory"/> + <find-by-primary-key entity-name="ProdCatalogCategory" map-name="lookupPKMap" value-field="prodCatalogCategory"/> <set-nonpk-fields map-name="parameters" value-name="prodCatalogCategory"/> <store-value value-name="prodCatalogCategory"/> </simple-method> @@ -77,7 +77,7 @@ <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogCategory" map-name="lookupPKMap" value-name="prodCatalogCategory"/> + <find-by-primary-key entity-name="ProdCatalogCategory" map-name="lookupPKMap" value-field="prodCatalogCategory"/> <remove-value value-name="prodCatalogCategory"/> </simple-method> @@ -96,14 +96,14 @@ <simple-method method-name="updateProdCatalogToParty" short-description="Update ProdCatalog To Party"> <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogRole" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProdCatalogRole" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party"> <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogRole" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProdCatalogRole" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -115,7 +115,7 @@ </else> </if-not-empty> <!-- set field="productCategoryContext.productCategoryId" from-field="defaultTopCategoryId"/> - <find-by-primary-key entity-name="ProductCategory" map-name="productCategoryContext" value-name="productCategory"/> + <find-by-primary-key entity-name="ProductCategory" map-name="productCategoryContext" value-field="productCategory"/> <field-to-list list-name="categories" field-name="productCategory"/> --> <set field="relatedCategoryContext.parentProductCategoryId" from-field="defaultTopCategoryId"/> @@ -172,7 +172,7 @@ </if-not-empty> <else> <set field="productCategoryContext.productCategoryId" from-field="parameters.parentProductCategoryId"/> - <find-by-primary-key entity-name="ProductCategory" value-name="productCategory" map-name="productCategoryContext"/> + <find-by-primary-key entity-name="ProductCategory" value-field="productCategory" map-name="productCategoryContext"/> <field-to-list list-name="categories" field-name="productCategory"/> <field-to-result field-name="categories" result-name="categories"/> </else> @@ -352,7 +352,7 @@ <simple-method method-name="checkImageUrlForCategory" short-description="Check for image url exists or not for product" login-required="false"> <if-not-empty field="parameters.categoryId"> <set field="productCategoryFindContext.productCategoryId" from-field="parameters.categoryId"/> - <find-by-primary-key entity-name="ProductCategory" value-name="category" map-name="productCategoryFindContext"/> + <find-by-primary-key entity-name="ProductCategory" value-field="category" map-name="productCategoryFindContext"/> <!-- check for category image url --> <if-not-empty field="category.categoryImageUrl"> <set field="checkImageUrlContext.imageUrl" from-field="category.categoryImageUrl"/> @@ -403,7 +403,7 @@ <simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false"> <if-not-empty field="parameters.productId"> <set field="productFindContext.productId" from-field="parameters.productId"/> - <find-by-primary-key entity-name="Product" value-name="product" map-name="productFindContext"/> + <find-by-primary-key entity-name="Product" value-field="product" map-name="productFindContext"/> <!-- check for small image url --> <if-not-empty field="product.smallImageUrl"> <set field="checkImageUrlContext.imageUrl" from-field="product.smallImageUrl"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Tue Dec 30 03:49:32 2008 @@ -43,7 +43,7 @@ <simple-method method-name="updateCategoryContent" short-description="Update Content For Category"> <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryContent" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryContent" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -53,7 +53,7 @@ <simple-method method-name="removeCategoryContent" short-description="Remove Content From Category"> <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryContent" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryContent" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createSimpleTextContentForCategory" short-description="Create Simple Text Content For Product Category"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 03:49:32 2008 @@ -185,7 +185,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryMember" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryMember" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -208,7 +208,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryMember" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryMember" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -240,7 +240,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryRole" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryRole" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -252,7 +252,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryRole" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryRole" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -330,7 +330,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryRollup" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryRollup" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -344,7 +344,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryRollup" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductCategoryRollup" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -646,7 +646,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryAttribute" map-name="lookupPKMap" value-name="ProductCategoryAttributeInstance"/> + <find-by-primary-key entity-name="ProductCategoryAttribute" map-name="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <set-nonpk-fields map-name="parameters" value-name="ProductCategoryAttributeInstance"/> <store-value value-name="ProductCategoryAttributeInstance"/> </simple-method> @@ -659,7 +659,7 @@ <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductCategoryAttribute" map-name="lookupPKMap" value-name="ProductCategoryAttributeInstance"/> + <find-by-primary-key entity-name="ProductCategoryAttribute" map-name="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <remove-value value-name="ProductCategoryAttributeInstance"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Dec 30 03:49:32 2008 @@ -50,7 +50,7 @@ <make-value entity-name="ProductConfig" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductConfig" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductConfig" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> @@ -65,7 +65,7 @@ <make-value entity-name="ProductConfig" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductConfig" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductConfig" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -89,7 +89,7 @@ <check-errors/> <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -100,7 +100,7 @@ <check-errors/> <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <!-- Methods for Config Options --> @@ -124,7 +124,7 @@ <check-errors/> <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -135,7 +135,7 @@ <check-errors/> <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <!-- Methods for ProductConfigProduct --> @@ -156,7 +156,7 @@ <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -167,7 +167,7 @@ <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Tue Dec 30 03:49:32 2008 @@ -43,7 +43,7 @@ <simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem"> <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -53,7 +53,7 @@ <simple-method method-name="removeProductConfigItemContent" short-description="Remove Content From ProductConfigItem"> <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 03:49:32 2008 @@ -153,7 +153,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -163,7 +163,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -188,7 +188,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -198,7 +198,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -243,7 +243,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -253,7 +253,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -272,7 +272,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureIactn"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <!-- Methods for ProductFeatureType --> @@ -306,7 +306,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -316,7 +316,7 @@ <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -406,7 +406,7 @@ <simple-method method-name="deleteFeaturePrice" short-description="Delete a feature price"> <make-value entity-name="ProductFeaturePrice" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductFeaturePrice" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductFeaturePrice" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 03:49:32 2008 @@ -322,7 +322,7 @@ <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"> <result-to-field result-name="inventoryItemId" field-name="inventoryItemLookupPk.inventoryItemId"/> </call-service> - <find-by-primary-key entity-name="InventoryItem" map-name="inventoryItemLookupPk" value-name="inventoryItem"/> + <find-by-primary-key entity-name="InventoryItem" map-name="inventoryItemLookupPk" value-field="inventoryItem"/> </if-empty> <!--Step 2 Check if its reserved for other order --> <set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 03:49:32 2008 @@ -226,7 +226,7 @@ <make-value entity-name="InventoryItem" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <if-empty field="lookedUpValue.ownerPartyId"> <get-related-one value-name="lookedUpValue" relation-name="Facility" to-value-name="oldFacility"/> <set field="lookedUpValue.ownerPartyId" from-field="oldFacility.ownerPartyId"/> @@ -406,7 +406,7 @@ <simple-method method-name="checkProductInventoryDiscontinuation" short-description="Check Product Inventory Discontinuation" login-required="false"> <set from-field="parameters.productId" field="productIdMap.productId"/> - <find-by-primary-key entity-name="Product" map-name="productIdMap" value-name="product"/> + <find-by-primary-key entity-name="Product" map-name="productIdMap" value-field="product"/> <now-timestamp-to-env env-name="nowTimestamp"/> <!-- if discontinueProductSales field is empty and the product is a variant, get the fieldcontent from the virtual product --> @@ -471,7 +471,7 @@ <!-- add changes to availableToPromise and quantityOnHand --> <make-value value-field="inventoryItemLookup" entity-name="InventoryItem"/> <set-pk-fields map-name="parameters" value-name="inventoryItemLookup"/> - <find-by-primary-key map-name="inventoryItemLookup" value-name="inventoryItem"/> + <find-by-primary-key map-name="inventoryItemLookup" value-field="inventoryItem"/> <if-compare field="inventoryItem.inventoryItemTypeId" operator="not-equals" value="NON_SERIAL_INV_ITEM"> <string-to-list string="Can only create an InventoryItemVariance for a Non-Serialized Inventory Item" list-name="error_list"/> @@ -535,7 +535,7 @@ <make-value entity-name="ProductFacility" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -543,7 +543,7 @@ <make-value entity-name="ProductFacility" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -559,7 +559,7 @@ <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -567,7 +567,7 @@ <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -995,7 +995,7 @@ <simple-method method-name="updateInventoryTransfer" short-description="Update an Inventory Transfer"> <set from-field="parameters.inventoryTransferId" field="lookupPKMap.inventoryTransferId"/> - <find-by-primary-key entity-name="InventoryTransfer" map-name="lookupPKMap" value-name="inventoryTransfer"/> + <find-by-primary-key entity-name="InventoryTransfer" map-name="lookupPKMap" value-field="inventoryTransfer"/> <if-not-empty field="parameters.statusId"> <if-compare-field field="parameters.statusId" to-field="inventoryTransfer.statusId" operator="not-equals"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Dec 30 03:49:32 2008 @@ -75,7 +75,7 @@ <make-value entity-name="ProductPrice" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPrice" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPrice" map-name="lookupPKMap" value-field="lookedUpValue"/> <!-- grab the old price value before setting nonpk parameter fields --> <field-to-result map-name="lookedUpValue" field-name="price" result-name="oldPrice"/> @@ -157,7 +157,7 @@ <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPriceRule" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPriceRule" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -168,7 +168,7 @@ <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPriceRule" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPriceRule" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -193,7 +193,7 @@ <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPriceCond" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPriceCond" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -204,7 +204,7 @@ <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPriceCond" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPriceCond" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -229,7 +229,7 @@ <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPriceAction" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPriceAction" map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -240,7 +240,7 @@ <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="ProductPriceAction" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductPriceAction" map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=730100&r1=730099&r2=730100&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Dec 30 03:49:32 2008 @@ -43,7 +43,7 @@ <simple-method method-name="updateProductContent" short-description="Update Content For Product"> <make-value value-field="lookupPKMap" entity-name="ProductContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -53,7 +53,7 @@ <simple-method method-name="removeProductContent" short-description="Remove Content From Product"> <make-value value-field="lookupPKMap" entity-name="ProductContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -123,7 +123,7 @@ <simple-method method-name="removeProductFeatureDataResource" short-description="Remove ProductFeature-DataResource"> <make-value value-field="lookupPKMap" entity-name="ProductFeatureDataResource"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> </simple-methods> |
Free forum by Nabble | Edit this page |