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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -94,7 +94,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="OrderShipment"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -131,7 +131,7 @@ <check-errors/> --> <make-value value-field="newEntity" entity-name="OrderRequirementCommitment"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -681,7 +681,7 @@ </check-permission> <check-errors/> <make-value value-field="orderContactMechMap" entity-name="OrderContactMech"/> - <set-pk-fields map-name="parameters" value-name="orderContactMechMap"/> + <set-pk-fields map="parameters" value-field="orderContactMechMap"/> <set from-field="parameters.orderId" field="inputMap.orderId"/> <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/> <set from-field="parameters.contactMechId" field="inputMap.contactMechId"/> @@ -724,7 +724,7 @@ </check-permission> <check-errors/> <make-value value-field="lookupPKMap" entity-name="OrderItemShipGroup"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="OrderItemShipGroup" map="lookupPKMap" value-field="lookedUpValue"/> <!-- splitting shipmentMethod request parameter value that contains "@" symbol into "shipmentMethodTypeId" and "carrierPartyId". @@ -781,7 +781,7 @@ </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="OrderContactMech"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -811,7 +811,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="OrderTerm"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set value="_NA_" set-if-empty="true" field="newEntity.orderItemSeqId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -914,7 +914,7 @@ <else> <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"/> + <set-pk-fields value-field="newValue" map="shipToAddressCtx"/> <find-by-primary-key entity-name="PostalAddress" map="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"> @@ -960,7 +960,7 @@ <set field="shipToAddressCtx.shipToContactMechId" from-field="shipToAddressCtx.contactMechId"></set> <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"/> + <set-pk-fields value-field="newValue" map="shipToAddressCtx"/> <find-by-primary-key entity-name="PostalAddress" map="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"> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -243,12 +243,12 @@ <find-by-primary-key entity-name="PartyRole" map="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"/> + <set-pk-fields map="lookupPKMap" value-field="partyRole"/> <create-value value-name="partyRole"/> </if-empty> <!-- create new entity and create all the fields --> <make-value value-field="newEntity" entity-name="QuoteRole"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> </simple-method> @@ -414,7 +414,7 @@ <check-errors/> <!-- create new entity and create all the fields --> <make-value value-field="newEntity" entity-name="QuoteAttribute"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -453,7 +453,7 @@ <check-errors/> <!-- create new entity and create all the fields --> <make-value value-field="newEntity" entity-name="QuoteCoefficient"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -866,7 +866,7 @@ <!--Quote workeffort --> <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"/> + <set-pk-fields map="parameters" value-field="lookupMap"/> <find-by-primary-key entity-name="QuoteWorkEffort" map="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> @@ -881,7 +881,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupMap"/> <find-by-primary-key entity-name="QuoteWorkEffort" map="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> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -185,7 +185,7 @@ <simple-method method-name="createCustRequestAttribute" short-description="Create Customer Request Attribute"> <make-value value-field="newEntity" entity-name="CustRequestAttribute"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -199,7 +199,7 @@ <simple-method method-name="createCustRequestItem" short-description="Create Customer Request Item"> <make-value value-field="newEntity" entity-name="CustRequestItem"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="parameters.custRequestItemSeqId"> <make-next-seq-id value-name="newEntity" seq-field-name="custRequestItemSeqId"/> @@ -225,11 +225,11 @@ <find-by-primary-key entity-name="PartyRole" map="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"/> + <set-pk-fields map="lookupPKMap" value-field="partyRole"/> <create-value value-name="partyRole"/> </if-empty> <make-value value-field="newEntity" entity-name="CustRequestParty"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> @@ -474,7 +474,7 @@ <simple-method method-name="createCustRequestContent" short-description="Create Work Effort Content"> <make-value entity-name="CustRequestContent" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -37,7 +37,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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Requirement" map="lookupPKMap" value-field="lookedUpValue"/> <clone-value value-name="lookedUpValue" new-value-name="savedValue"/> <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/> @@ -54,14 +54,14 @@ <simple-method method-name="associateRequirementWithRequestItem" short-description="Associate a requirement and CustRequestItem"> <make-value value-field="newEntity" entity-name="RequirementCustRequest"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="addTaskToRequirement" short-description="Add a task to a requirement"> <make-value value-field="newEntity" entity-name="WorkRequirementFulfillment"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -103,12 +103,12 @@ <find-by-primary-key entity-name="PartyRole" map="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"/> + <set-pk-fields map="lookupPKMap" value-field="partyRole"/> <create-value value-name="partyRole"/> </if-empty> <!-- create new entity and create all the fields --> <make-value value-field="newEntity" entity-name="RequirementRole"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:55:26 2008 @@ -258,7 +258,7 @@ <simple-method method-name="createCommunicationEventPurpose" short-description="Create a CommunicationEventPurpose"> <make-value value-field="newEntity" entity-name="CommunicationEventPurpose"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -279,7 +279,7 @@ <call-service service-name="createPartyRole" in-map-name="partyRole" include-user-login="false"/> <make-value value-field="newEntity" entity-name="CommunicationEventRole" /> - <set-pk-fields map-name="parameters" value-name="newEntity" /> + <set-pk-fields map="parameters" value-field="newEntity" /> <set-nonpk-fields map-name="parameters" value-name="newEntity" /> <if-empty field="newEntity.statusId"> <set field="newEntity.statusId" value="COM_ROLE_CREATED" /> @@ -425,7 +425,7 @@ <simple-method method-name="createCustRequestCommEvent" short-description="Create CustRequestCommEvent" > <make-value value-field="newEntity" entity-name="CustRequestCommEvent"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -62,7 +62,7 @@ </if-compare> <make-value entity-name="ContactMech" value-field="ContactMechMap"/> - <set-pk-fields value-name="ContactMechMap" map-name="parameters"/> + <set-pk-fields value-field="ContactMechMap" map="parameters"/> <find-by-primary-key entity-name="ContactMech" map="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"/> @@ -129,7 +129,7 @@ </if-compare> <check-errors/> <make-value entity-name="PostalAddress" value-field="newValue"/> - <set-pk-fields value-name="newValue" map-name="parameters"/> + <set-pk-fields value-field="newValue" map="parameters"/> <find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue" /> <set-nonpk-fields map-name="parameters" value-name="newValue"/> @@ -177,7 +177,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"/> + <set-pk-fields value-field="newValue" map="parameters"/> <find-by-primary-key entity-name="TelecomNumber" map="newValue" value-field="oldValue" /> <set-nonpk-fields map-name="parameters" value-name="newValue"/> <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/> @@ -235,14 +235,14 @@ <!--TODO: need security check of some sort? --> <check-errors/> <make-value value-field="newEntity" entity-name="ContactMechLink"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="deleteContactMechLink" short-description="Delete a link between two ContactMechs"> <!--TODO: need security check of some sort? --> <check-errors/> <make-value value-field="lookupPKMap" entity-name="ContactMechLink"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ContactMechLink" map="lookupPKMap" value-field="contactMechLinkInstance"/> <remove-value value-name="contactMechLinkInstance"/> </simple-method> @@ -250,7 +250,7 @@ <!-- contactmech attribute services --> <simple-method method-name="createContactMechAttribute" short-description="createContactMechAttribute"> <make-value value-field="newEntity" entity-name="ContactMechAttribute"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 03:55:26 2008 @@ -76,7 +76,7 @@ <!-- Find old value --> <make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/> - <set-pk-fields value-name="partyContactMechMap" map-name="parameters"/> + <set-pk-fields value-field="partyContactMechMap" map="parameters"/> <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/> <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/> <first-from-list entry="partyContactMech" list="validPartyContactMechs"/> @@ -139,7 +139,7 @@ </if-empty> <make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/> - <set-pk-fields value-name="partyContactMechMap" map-name="parameters"/> + <set-pk-fields value-field="partyContactMechMap" map="parameters"/> <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/> <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/> <first-from-list entry="partyContactMech" list="validPartyContactMechs"/> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -23,7 +23,7 @@ <simple-method method-name="createPartyContent" short-description="Create Party Content Entity"> <make-value value-field="partyContent" entity-name="PartyContent"/> - <set-pk-fields value-name="partyContent" map-name="parameters"/> + <set-pk-fields value-field="partyContent" map="parameters"/> <set-nonpk-fields value-name="partyContent" map-name="parameters"/> <if-empty field="partyContent.fromDate"> @@ -36,7 +36,7 @@ <simple-method method-name="updatePartyContent" short-description="Update Party Content Entity"> <make-value value-field="lookupPkMap" entity-name="PartyContent"/> - <set-pk-fields value-name="lookupPkMap" map-name="parameters"/> + <set-pk-fields value-field="lookupPkMap" map="parameters"/> <find-by-primary-key map="lookupPkMap" value-field="partyContent"/> <set-nonpk-fields value-name="partyContent" map-name="parameters"/> @@ -45,7 +45,7 @@ <simple-method method-name="removePartyContent" short-description="Update Party Content Entity"> <make-value value-field="lookupPkMap" entity-name="PartyContent"/> - <set-pk-fields value-name="lookupPkMap" map-name="parameters"/> + <set-pk-fields value-field="lookupPkMap" map="parameters"/> <find-by-primary-key map="lookupPkMap" value-field="partyContent"/> <remove-value value-name="partyContent"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 03:55:26 2008 @@ -54,7 +54,7 @@ </simple-method> <simple-method method-name="createPartyInvitationGroupAssoc" short-description="Create a PartyInvitationGroupAssoc"> <make-value entity-name="PartyInvitationGroupAssoc" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="deletePartyInvitationGroupAssoc" short-description="Remove a PartyInvitationGroupAssoc"> @@ -63,7 +63,7 @@ </simple-method> <simple-method method-name="createPartyInvitationRoleAssoc" short-description="Create a PartyInvitationRoleAssoc"> <make-value entity-name="PartyInvitationRoleAssoc" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="deletePartyInvitationRoleAssoc" short-description="Remove a PartyInvitationRoleAssoc"> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -25,7 +25,7 @@ <entity-one entity-name="PartyRole" value-name="partyRole"/> <if-empty field="partyRole"> <make-value entity-name="PartyRole" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </if-empty> </simple-method> @@ -42,7 +42,7 @@ </if-empty> <make-value value-field="partyNameHistory" entity-name="PartyNameHistory"/> - <set-pk-fields value-name="partyNameHistory" map-name="parameters"/> + <set-pk-fields value-field="partyNameHistory" map="parameters"/> <now-timestamp-to-env env-name="partyNameHistory.changeDate"/> <if> @@ -175,7 +175,7 @@ <!-- PostalAddressBoundary methods --> <simple-method method-name="createPostalAddressBoundary" short-description="Create Postal Address Boundary"> <make-value entity-name="PostalAddressBoundary" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="deletePostalAddressBoundary" short-description="Delete a Postal Address Boundary"> @@ -196,7 +196,7 @@ <!-- PartyClassification methods --> <simple-method method-name="createPartyClassification" short-description="create a PartyClassification"> <make-value entity-name="PartyClassification" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <create-value value-name="newEntity"/> @@ -233,7 +233,7 @@ <!-- Vendor Party services --> <simple-method method-name="createVendor" short-description="createVendor"> <make-value value-field="newEntity" entity-name="Vendor"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -250,7 +250,7 @@ <!-- party attribute services --> <simple-method method-name="createPartyAttribute" short-description="createPartyAttribute"> <make-value value-field="newEntity" entity-name="PartyAttribute"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -274,7 +274,7 @@ <entity-one entity-name="PartyProfileDefault" value-name="partyProfileDefault"/> <if-empty field="partyProfileDefault"> <make-value value-field="partyProfileDefault" entity-name="PartyProfileDefault"/> - <set-pk-fields value-name="partyProfileDefault" map-name="parameters"/> + <set-pk-fields value-field="partyProfileDefault" map="parameters"/> <create-value value-name="partyProfileDefault"/> </if-empty> @@ -346,7 +346,7 @@ <call-service service-name="createContentRole" in-map-name="contentRole" break-on-error="false" /> <!-- check party role --> <make-value value-field="partyRole" entity-name="PartyRole"/> - <set-pk-fields value-name="partyRole" map-name="contentRole"/> + <set-pk-fields value-field="partyRole" map="contentRole"/> <find-by-and entity-name="PartyRole" map-name="partyRole" list-name="pRoles"/> <if-empty field="pRoles"> <set-service-fields service-name="createPartyRole" map-name="contentRole" to-map-name="partyRole"/> @@ -739,13 +739,13 @@ <call-object-method obj-field-name="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapValue" ret-map-name="parameters"/> <call-object-method obj-field-name="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapKey" ret-map-name="parameters"/> <make-value entity-name="AddressMatchMap" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="deleteAddressMatchMap" short-description="remove a AddressMatchMap"> <make-value entity-name="AddressMatchMap" value-field="fieldMap"/> - <set-pk-fields map-name="parameters" value-name="fieldMap"/> + <set-pk-fields map="parameters" value-field="fieldMap"/> <remove-value value-name="fieldMap"/> </simple-method> <simple-method method-name="clearAddressMatchMap" short-description="remove all AddressMatchMap"> @@ -775,7 +775,7 @@ <if-empty field="partyRels"> <make-value value-field="newEntity" entity-name="PartyRelationship"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </if-empty> @@ -798,7 +798,7 @@ <simple-method method-name="createPartyCarrierAccount" short-description="Create PartyCarrierAccount"> <make-value entity-name="PartyCarrierAccount" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -55,7 +55,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="ProdCatalogCategory"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -68,7 +68,7 @@ <simple-method method-name="updateProductCategoryToProdCatalog" short-description="Remove ContactMech From ProdCatalog"> <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> <set-nonpk-fields map-name="parameters" value-name="prodCatalogCategory"/> <store-value value-name="prodCatalogCategory"/> @@ -76,7 +76,7 @@ <simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog"> <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> <remove-value value-name="prodCatalogCategory"/> </simple-method> @@ -84,7 +84,7 @@ <!-- Party and Catalog services --> <simple-method method-name="addProdCatalogToParty" short-description="Add ProdCatalog To Party"> <make-value value-field="newEntity" entity-name="ProdCatalogRole"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -95,14 +95,14 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProdCatalogRole" map="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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -23,7 +23,7 @@ <!-- ProductCategoryContent --> <simple-method method-name="createCategoryContent" short-description="Create Content For Product Category"> <make-value value-field="newEntity" entity-name="ProductCategoryContent"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -42,7 +42,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -52,7 +52,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -116,7 +116,7 @@ <check-errors/> --> <make-value value-field="newEntity" entity-name="ProductCategoryMember"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -141,7 +141,7 @@ <make-value value-field="newEntity" entity-name="ProductCategoryMember"/> <set field="newEntity.productCategoryId" from-field="category"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -161,7 +161,7 @@ <make-value value-field="newEntity" entity-name="ProductCategoryMember"/> <set field="newEntity.productCategoryId" from-field="parameters.categories"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -184,7 +184,7 @@ --> <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -207,7 +207,7 @@ </if-compare-field> <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -223,7 +223,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="ProductCategoryRole"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -239,7 +239,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -251,7 +251,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -269,7 +269,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -290,7 +290,7 @@ <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> <set field="newEntity.parentProductCategoryId" from-field="category"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -309,7 +309,7 @@ <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> <set field="newEntity.parentProductCategoryId" from-field="parameters.categories"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -329,7 +329,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -343,7 +343,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -633,7 +633,7 @@ <make-value value-field="newEntity" entity-name="ProductCategoryAttribute"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -645,7 +645,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <set-nonpk-fields map-name="parameters" value-name="ProductCategoryAttributeInstance"/> <store-value value-name="ProductCategoryAttributeInstance"/> @@ -658,7 +658,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <remove-value value-name="ProductCategoryAttributeInstance"/> </simple-method> @@ -676,7 +676,7 @@ </if-empty> <!-- now set the rest of the PK fields (should just be fromDate now; unless linkSeqId is not empty --> - <set-pk-fields value-name="newEntity" map-name="parameters"/> + <set-pk-fields value-field="newEntity" map="parameters"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml Tue Dec 30 03:55:26 2008 @@ -26,7 +26,7 @@ </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="CommunicationEventProduct"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -30,7 +30,7 @@ <make-value value-field="newEntity" entity-name="ProductConfig"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <now-timestamp-to-env env-name="nowTimestamp"/> @@ -49,7 +49,7 @@ <check-errors/> <make-value entity-name="ProductConfig" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductConfig" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> @@ -64,7 +64,7 @@ <check-errors/> <make-value entity-name="ProductConfig" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductConfig" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> @@ -88,7 +88,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -99,7 +99,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -111,7 +111,7 @@ <check-errors/> <make-value entity-name="ProductConfigOption" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <sequenced-id-to-env sequence-name="ProductConfigOption" env-name="newEntity.configOptionId"/> <create-value value-name="newEntity"/> <field-to-result field-name="newEntity.configItemId" result-name="configItemId"/> @@ -123,7 +123,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -134,7 +134,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -145,7 +145,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -155,7 +155,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -166,7 +166,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -23,7 +23,7 @@ <!-- ProductConfigItemContent --> <simple-method method-name="createProductConfigItemContent" short-description="Create Content For ProductConfigItem"> <make-value value-field="newEntity" entity-name="ProdConfItemContent"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -42,7 +42,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -52,7 +52,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -76,7 +76,7 @@ <now-timestamp-to-env env-name="parameters.fromDate"/> </if-empty> <make-value value-field="newEntity" entity-name="ProductFeatureAppl"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -139,7 +139,7 @@ <make-value value-field="newEntity" entity-name="ProductFeatureCategoryAppl"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> @@ -152,7 +152,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -162,7 +162,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -174,7 +174,7 @@ <make-value value-field="newEntity" entity-name="ProductFeatureCatGrpAppl"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> @@ -187,7 +187,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -197,7 +197,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -229,7 +229,7 @@ <make-value value-field="newEntity" entity-name="ProductFeatureGroupAppl"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> @@ -242,7 +242,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ProductFeatureGroupAppl" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -252,7 +252,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ProductFeatureGroupAppl" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -262,7 +262,7 @@ <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureIactn you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureIactn"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -271,7 +271,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureIactn"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -296,7 +296,7 @@ <make-value value-field="newEntity" entity-name="ProductFeatureType"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -305,7 +305,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -315,7 +315,7 @@ <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -327,7 +327,7 @@ </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> <entity-condition entity-name="ProductFeatureAppl" list-name="productFeatureAppls" filter-by-date="true"> @@ -376,7 +376,7 @@ <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/> </if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <now-timestamp-to-env env-name="nowTimestamp"/> @@ -405,7 +405,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductFeaturePrice" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -494,7 +494,7 @@ <if-empty field="checkOisgirEntity"> <!-- create OrderItemShipGrpInvRes record --> <make-value entity-name="OrderItemShipGrpInvRes" value-field="newOisgirEntity"/> - <set-pk-fields map-name="parameters" value-name="newOisgirEntity"/> + <set-pk-fields map="parameters" value-field="newOisgirEntity"/> <set-nonpk-fields map-name="parameters" value-name="newOisgirEntity"/> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newOisgirEntity.createdDatetime"/> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -225,7 +225,7 @@ <simple-method method-name="updateInventoryItem" short-description="Update an InventoryItem"> <make-value entity-name="InventoryItem" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <if-empty field="lookedUpValue.ownerPartyId"> <get-related-one value-name="lookedUpValue" relation-name="Facility" to-value-name="oldFacility"/> @@ -269,7 +269,7 @@ <make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/> <set-nonpk-fields map-name="parameters" value-name="inventoryItemStatus"/> - <set-pk-fields map-name="parameters" value-name="inventoryItemStatus"/> + <set-pk-fields map="parameters" value-field="inventoryItemStatus"/> <set field="inventoryItemStatus.statusDatetime" from-field="nowTimestamp"/> <!-- make sure the current productId is set, if not passed in look up the current value --> @@ -470,7 +470,7 @@ <!-- add changes to availableToPromise and quantityOnHand --> <make-value value-field="inventoryItemLookup" entity-name="InventoryItem"/> - <set-pk-fields map-name="parameters" value-name="inventoryItemLookup"/> + <set-pk-fields map="parameters" value-field="inventoryItemLookup"/> <find-by-primary-key map="inventoryItemLookup" value-field="inventoryItem"/> <if-compare field="inventoryItem.inventoryItemTypeId" operator="not-equals" value="NON_SERIAL_INV_ITEM"> @@ -488,7 +488,7 @@ <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <make-value value-field="newEntity" entity-name="InventoryItemVariance"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -528,13 +528,13 @@ <make-value value-field="newEntity" entity-name="ProductFacility"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateProductFacility" short-description="Update a ProductFacility"> <make-value entity-name="ProductFacility" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -542,7 +542,7 @@ <simple-method method-name="deleteProductFacility" short-description="Delete a ProductFacility"> <make-value entity-name="ProductFacility" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -552,13 +552,13 @@ <make-value value-field="newEntity" entity-name="ProductFacilityLocation"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateProductFacilityLocation" short-description="Update a ProductFacilityLocation"> <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -566,7 +566,7 @@ <simple-method method-name="deleteProductFacilityLocation" short-description="Delete a ProductFacilityLocation"> <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -1188,7 +1188,7 @@ <!-- Inventory Label Services --> <simple-method method-name="createInventoryItemLabelType" short-description="Create an InventoryItemLabelType"> <make-value entity-name="InventoryItemLabelType" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -1203,7 +1203,7 @@ </simple-method> <simple-method method-name="createInventoryItemLabel" short-description="Create an InventoryItemLabel"> <make-value entity-name="InventoryItemLabel" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -1218,7 +1218,7 @@ </simple-method> <simple-method method-name="createInventoryItemLabelAppl" short-description="Create an InventoryItemLabelAppl"> <make-value entity-name="InventoryItemLabelAppl" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> <set field="newEntity.inventoryItemLabelTypeId" from-field="inventoryItemLabel.inventoryItemLabelTypeId"/> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -30,7 +30,7 @@ <make-value value-field="newEntity" entity-name="ProductPrice"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <now-timestamp-to-env env-name="nowTimestamp"/> @@ -74,7 +74,7 @@ <check-errors/> <make-value entity-name="ProductPrice" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPrice" map="lookupPKMap" value-field="lookedUpValue"/> <!-- grab the old price value before setting nonpk parameter fields --> @@ -114,7 +114,7 @@ <call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/> <check-errors/> <make-value entity-name="ProductPaymentMethodType" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -156,7 +156,7 @@ <check-errors/> <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceRule" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -167,7 +167,7 @@ <check-errors/> <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceRule" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -180,7 +180,7 @@ <make-value value-field="newEntity" entity-name="ProductPriceCond"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-name="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/> <field-to-result field-name="productPriceCondSeqId" map-name="newEntity"/> @@ -192,7 +192,7 @@ <check-errors/> <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceCond" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -203,7 +203,7 @@ <check-errors/> <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceCond" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -216,7 +216,7 @@ <make-value value-field="newEntity" entity-name="ProductPriceAction"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-name="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/> <field-to-result field-name="productPriceActionSeqId" map-name="newEntity"/> @@ -228,7 +228,7 @@ <check-errors/> <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceAction" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -239,7 +239,7 @@ <check-errors/> <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceAction" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> 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=730104&r1=730103&r2=730104&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:55:26 2008 @@ -23,7 +23,7 @@ <!-- ProductContent --> <simple-method method-name="createProductContent" short-description="Create Content For Product"> <make-value value-field="newEntity" entity-name="ProductContent"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -42,7 +42,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -52,7 +52,7 @@ </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -117,12 +117,12 @@ <!-- ProductFeatureDataResource --> <simple-method method-name="createProductFeatureDataResource" short-description="Create ProductFeature-DataResource"> <make-value value-field="newEntity" entity-name="ProductFeatureDataResource"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <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"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> |
Free forum by Nabble | Edit this page |