You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:07:17 UTC
svn commit: r730111 [2/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accountin...
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="genCompDocInstance" short-description="Create CompDoc">
- <entity-one entity-name="Content" value-name="rootTemplateContent">
+ <entity-one entity-name="Content" value-field="rootTemplateContent">
<field-map field-name="contentId" from-field="parameters.instanceOfContentId"/>
</entity-one>
<log message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}" level="info"/>
@@ -53,7 +53,7 @@
<log level="info" message="genCompDocInstance 2> rootInstanceContent: ${rootInstanceContent}"/>
<else>
<!-- check to see if it already exists, error if so -->
- <entity-one entity-name="Content" value-name="existingContent">
+ <entity-one entity-name="Content" value-field="existingContent">
<field-map field-name="contentId" from-field="parameters.rootInstanceContentId"/>
</entity-one>
<if-not-empty field="existingContent">
@@ -261,7 +261,7 @@
</simple-method>
<simple-method method-name="persistCompDocContent" short-description="Persist a CompDoc DataResource and data">
- <entity-one entity-name="Content" value-name="content" use-cache="false"/>
+ <entity-one entity-name="Content" value-field="content" use-cache="false"/>
<set from-field="content.dataResourceId" field="oldDataResourceId"/>
<log level="info" message="persistCompDocContent(0).content : ${content}"/>
@@ -453,11 +453,11 @@
</entity-condition>
<if-not-empty field="contentRevisionItems">
<set field="contentRevisionItem" from-field="contentRevisionItems[0]"/>
- <entity-one entity-name="Content" value-name="content" use-cache="true">
+ <entity-one entity-name="Content" value-field="content" use-cache="true">
<field-map field-name="contentId" from-field="contentRevisionItem.itemContentId"/>
</entity-one>
<if-not-empty field="content">
- <entity-one entity-name="DataResource" value-name="dataResource" use-cache="true">
+ <entity-one entity-name="DataResource" value-field="dataResource" use-cache="true">
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
<field-to-result field-name="dataResource" result-name="dataResource"/>
@@ -465,16 +465,16 @@
</if-not-empty>
</simple-method>
<simple-method method-name="getRevisionItemDataResource" short-description="Get version of DataResource that fits overall revision">
- <entity-one entity-name="ContentRevisionItem" value-name="contentRevisionItem" use-cache="true">
+ <entity-one entity-name="ContentRevisionItem" value-field="contentRevisionItem" use-cache="true">
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="itemContentId" from-field="parameters.itemContentId"/>
<field-map field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId"/>
</entity-one>
- <entity-one entity-name="Content" value-name="content" use-cache="true">
+ <entity-one entity-name="Content" value-field="content" use-cache="true">
<field-map field-name="contentId" from-field="contentRevisionItem.itemContentId"/>
</entity-one>
<if-not-empty field="content">
- <entity-one entity-name="DataResource" value-name="dataResource" use-cache="true">
+ <entity-one entity-name="DataResource" value-field="dataResource" use-cache="true">
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
<field-to-result field-name="dataResource" result-name="dataResource"/>
@@ -604,7 +604,7 @@
</iterate>
</simple-method>
<simple-method method-name="cloneInstanceContentApprovals" short-description="Bump the previous ContentApproval approvals up to current CDI">
- <entity-one entity-name="Content" value-name="content">
+ <entity-one entity-name="Content" value-field="content">
<field-map field-name="contentId" from-field="parameters.contentId"/>
</entity-one>
<set from-field="parameters.contentId" field="thisContentId"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 04:07:14 2008
@@ -53,7 +53,7 @@
<field-to-result field-name="content.contentId" result-name="contentId"/>
</simple-method>
<simple-method method-name="updateContent" short-description="Update a Content Record">
- <entity-one entity-name="Content" value-name="content" auto-field-map="true"/>
+ <entity-one entity-name="Content" value-field="content" auto-field-map="true"/>
<set-nonpk-fields value-field="content" map="parameters"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -94,7 +94,7 @@
</simple-method>
<simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record">
<set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
- <entity-one entity-name="ContentAssoc" value-name="assoc" auto-field-map="true"/>
+ <entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/>
<set-nonpk-fields value-field="assoc" map="parameters"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -114,11 +114,11 @@
<!-- update content; just status -->
<simple-method method-name="setContentStatus" short-description="Set The Content Status">
- <entity-one entity-name="Content" value-name="content"/>
+ <entity-one entity-name="Content" value-field="content"/>
<field-to-result field-name="content.statusId" result-name="oldStatusId"/>
<if-compare-field field="content.statusId" to-field="parameters.statusId" operator="not-equals">
- <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false">
<field-map field-name="statusId" from-field="content.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
@@ -731,7 +731,7 @@
<!-- This method will create a skeleton content record from a data resource -->
<simple-method method-name="createContentFromDataResource" short-description="Create Content from DataResource Object">
- <entity-one entity-name="DataResource" value-name="dataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-empty field="dataResource">
@@ -895,7 +895,7 @@
<!-- retrieve Data resource information -->
<simple-method method-name="getDataResource" short-description="get the content and relasted resource information" login-required="false">
- <entity-one entity-name="DataResource" value-name="resultData.dataResource">
+ <entity-one entity-name="DataResource" value-field="resultData.dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-not-empty field="resultData.dataResource">
@@ -912,7 +912,7 @@
</simple-method>
<simple-method method-name="getContentAndDataResource" short-description="get the content and related resource information" login-required="false">
- <entity-one entity-name="Content" value-name="resultDataContent.content">
+ <entity-one entity-name="Content" value-field="resultDataContent.content">
<field-map field-name="contentId" from-field="parameters.contentId"/>
</entity-one>
<if-not-empty field="resultDataContent.content">
@@ -1216,7 +1216,7 @@
<set field="map.contentId" from-field="view2.contentId"/>
<set field="map.contentName" from-field="view2.contentName"/>
<set field="map.description" from-field="view2.description"/>
- <entity-one entity-name="ElectronicText" value-name="electronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="view2.dataResourceId"/>
</entity-one>
<set field="map.textData" from-field="electronicText.textData"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 04:07:14 2008
@@ -600,7 +600,7 @@
</if-compare>
<if-compare field="parameters.dataResourceTypeId" value="IMAGE_OBJECT" operator="equals">
- <entity-one entity-name="ImageDataResource" value-name="dataResObj">
+ <entity-one entity-name="ImageDataResource" value-field="dataResObj">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-not-empty field="dataResObj">
@@ -611,7 +611,7 @@
</if-compare>
<if-compare field="parameters.dataResourceTypeId" value="VIDEO_OBJECT" operator="equals">
- <entity-one entity-name="VideoDataResource" value-name="dataResObj">
+ <entity-one entity-name="VideoDataResource" value-field="dataResObj">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-not-empty field="dataResObj">
@@ -622,7 +622,7 @@
</if-compare>
<if-compare field="parameters.dataResourceTypeId" value="AUDIO_OBJECT" operator="equals">
- <entity-one entity-name="AudioDataResource" value-name="dataResObj">
+ <entity-one entity-name="AudioDataResource" value-field="dataResObj">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-not-empty field="dataResObj">
@@ -633,7 +633,7 @@
</if-compare>
<if-compare field="parameters.dataResourceTypeId" value="OTHER_OBJECT" operator="equals">
- <entity-one entity-name="OtherDataResource" value-name="dataResObj">
+ <entity-one entity-name="OtherDataResource" value-field="dataResObj">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-not-empty field="dataResObj">
@@ -649,7 +649,7 @@
<!-- save LOCAL_FILE data -->
<simple-method method-name="saveLocalFileDateResource" short-description="Attach an uploaded file to a data resource as LOCAL_FILE">
- <entity-one entity-name="DataResource" value-name="dataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-empty field="dataResource">
@@ -709,7 +709,7 @@
<!-- save OTHER_OBJECT data -->
<simple-method method-name="saveOtherObjectDateResource" short-description="Attach an uploaded file to a data resource as OTHER_OBJECT">
- <entity-one entity-name="DataResource" value-name="dataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-empty field="dataResource">
@@ -765,7 +765,7 @@
<!-- save IMAGE_OBJECT data -->
<simple-method method-name="saveImageObjectDateResource" short-description="Attach an uploaded file to a data resource as IMAGE_OBJECT">
- <entity-one entity-name="DataResource" value-name="dataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-empty field="dataResource">
@@ -821,7 +821,7 @@
<!-- save VIDEO_OBJECT data -->
<simple-method method-name="saveVideoObjectDateResource" short-description="Attach an uploaded file to a data resource as VIDEO_OBJECT">
- <entity-one entity-name="DataResource" value-name="dataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-empty field="dataResource">
@@ -877,7 +877,7 @@
<!-- save AUDIO_OBJECT data -->
<simple-method method-name="saveAudioObjectDateResource" short-description="Attach an uploaded file to a data resource as AUDIO_OBJECT">
- <entity-one entity-name="DataResource" value-name="dataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
<if-empty field="dataResource">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml Tue Dec 30 04:07:14 2008
@@ -141,7 +141,7 @@
<check-errors/>
<!-- grab the current requested content record -->
- <entity-one entity-name="Content" value-name="content">
+ <entity-one entity-name="Content" value-field="content">
<field-map field-name="contentId" from-field="contentId"/>
</entity-one>
@@ -241,7 +241,7 @@
</and>
</condition>
<then>
- <entity-one entity-name="Content" value-name="currentContent">
+ <entity-one entity-name="Content" value-field="currentContent">
<field-map field-name="contentId" from-field="checkId"/>
</entity-one>
<if>
@@ -318,7 +318,7 @@
<log level="verbose" message="Found necessary ROLE permission: ${primaryPermission}_${mainAction}"/>
<!-- obtain the current content record -->
- <entity-one entity-name="Content" value-name="thisContent">
+ <entity-one entity-name="Content" value-field="thisContent">
<field-map field-name="contentId"/>
</entity-one>
<if-empty field="thisContent">
@@ -386,7 +386,7 @@
</and>
</condition>
<then>
- <entity-one entity-name="Content" value-name="currentContent">
+ <entity-one entity-name="Content" value-field="currentContent">
<field-map field-name="contentId" from-field="checkId"/>
</entity-one>
<if>
@@ -434,7 +434,7 @@
<set field="contentPurposeTypeId" value="_NA_"/>
</if-empty>
- <entity-one entity-name="Content" value-name="checkContent">
+ <entity-one entity-name="Content" value-field="checkContent">
<field-map field-name="contentId" from-field="checkId"/>
</entity-one>
<set field="statusId" from-field="checkContent.statusId"/>
@@ -586,7 +586,7 @@
</and>
</condition>
<then>
- <entity-one entity-name="Content" value-name="currentContent">
+ <entity-one entity-name="Content" value-field="currentContent">
<field-map field-name="contentId" from-field="checkId"/>
</entity-one>
<if>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml Tue Dec 30 04:07:14 2008
@@ -141,7 +141,7 @@
<log level="verbose" message="Found necessary ROLE permission: ${primaryPermission}_${mainAction}"/>
<!-- obtain the current data resource record -->
- <entity-one entity-name="DataResource" value-name="thisDataResource">
+ <entity-one entity-name="DataResource" value-field="thisDataResource">
<field-map field-name="dataResourceId"/>
</entity-one>
<if-empty field="thisDataResource">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Dec 30 04:07:14 2008
@@ -30,7 +30,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateWebSite" short-description="Update a WebSite">
- <entity-one entity-name="WebSite" value-name="webSite"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
<set-nonpk-fields map="parameters" value-field="webSite"/>
<store-value value-name="webSite"/>
</simple-method>
@@ -148,7 +148,7 @@
<!-- quick create website CMS content -->
<simple-method method-name="quickCreateWebSiteContent" short-description="Auto-Create WebSite CMS Content">
- <entity-one entity-name="WebSite" value-name="webSite">
+ <entity-one entity-name="WebSite" value-field="webSite">
<field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
</entity-one>
<now-timestamp-to-env env-name="now"/>
@@ -156,7 +156,7 @@
<if-instance-of field-name="parameters.webSiteContentTypeId" class="String">
<!-- just one checked -->
- <entity-one entity-name="WebSiteContentType" value-name="wct">
+ <entity-one entity-name="WebSiteContentType" value-field="wct">
<field-map field-name="webSiteContentTypeId" from-field="parameters.webSiteContentTypeId"/>
</entity-one>
@@ -174,7 +174,7 @@
<else>
<!-- multi-checked -->
<iterate entry="thisType" list="parameters.webSiteContentTypeId">
- <entity-one entity-name="WebSiteContentType" value-name="wct">
+ <entity-one entity-name="WebSiteContentType" value-field="wct">
<field-map field-name="webSiteContentTypeId" from-field="thisType"/>
</entity-one>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 04:07:14 2008
@@ -952,7 +952,7 @@
processor-name="userLogin" in-map-name="parameters" out-map-name="userLoginMap"/>
<if-not-empty field="userLoginMap.userLoginId">
- <entity-one entity-name="UserLogin" value-name="existingUserLogin">
+ <entity-one entity-name="UserLogin" value-field="existingUserLogin">
<field-map field-name="userLoginId" value="${userLoginMap.userLoginId}"/>
</entity-one>
<if-not-empty field="existingUserLogin">
@@ -974,12 +974,12 @@
<set-service-fields service-name="createUserLogin" map-name="userLoginMap" to-map-name="userLoginCtx"/>
<!-- call the service with the system account to get around security constraints for this special create -->
- <entity-one entity-name="UserLogin" value-name="userLoginCtx.userLogin" auto-field-map="false">
+ <entity-one entity-name="UserLogin" value-field="userLoginCtx.userLogin" auto-field-map="false">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createUserLogin" in-map-name="userLoginCtx"/>
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" from-field="userLoginMap.userLoginId"/>
</entity-one>
@@ -1013,7 +1013,7 @@
<simple-method method-name="setAnonUserLogin" short-description="Set user login in the session" login-required="false">
<if-empty field="userLogin">
- <entity-one entity-name="UserLogin" value-name="userLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="anonymous"/>
</entity-one>
<set field="userLogin.partyId" from-field="partyId"/>
@@ -1103,7 +1103,7 @@
<log level="info" message=" carrierPartyId is ${carrierPartyId}"/>
<log level="info" message=" productStoreShipMethId is ${productStoreShipMethId}"/>
- <entity-one entity-name="CarrierAndShipmentMethod" value-name="shipmentMethod">
+ <entity-one entity-name="CarrierAndShipmentMethod" value-field="shipmentMethod">
<field-map field-name="shipmentMethodTypeId" from-field="shipmentMethodTypeId"/>
<field-map field-name="partyId" from-field="carrierPartyId"/>
<field-map field-name="roleTypeId" value="CARRIER"/>
Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 04:07:14 2008
@@ -38,13 +38,13 @@
<!-- Ability Group -->
<simple-method method-name="updatePartyQual" short-description="Update Qualification of a Party">
- <entity-one entity-name="PartyQual" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyQual" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyQual" short-description="Delete Qualification of a Party">
- <entity-one entity-name="PartyQual" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyQual" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -57,13 +57,13 @@
</simple-method>
<simple-method method-name="updatePartyResume" short-description="Update a Resume of a Party">
- <entity-one entity-name="PartyResume" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyResume" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyResume" short-description="Delete a Resume of a Party">
- <entity-one entity-name="PartyResume" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyResume" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -71,7 +71,7 @@
<make-value entity-name="PartySkill" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <entity-one entity-name="PartySkill" value-name="partySkill" auto-field-map="true"/>
+ <entity-one entity-name="PartySkill" value-field="partySkill" auto-field-map="true"/>
<if>
<condition>
<and>
@@ -92,13 +92,13 @@
</simple-method>
<simple-method method-name="updatePartySkill" short-description="Update Party Skills">
- <entity-one entity-name="PartySkill" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartySkill" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartySkill" short-description="Delete a Skill of Party">
- <entity-one entity-name="PartySkill" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartySkill" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -112,13 +112,13 @@
</simple-method>
<simple-method method-name="updatePerfReview" short-description="Update Performance Review">
- <entity-one entity-name="PerfReview" value-name="lookedUpValue"/>
+ <entity-one entity-name="PerfReview" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePerfReview" short-description="Delete Performance Review">
- <entity-one entity-name="PerfReview" value-name="lookedUpValue"/>
+ <entity-one entity-name="PerfReview" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -132,13 +132,13 @@
</simple-method>
<simple-method method-name="updatePerfReviewItem" short-description="Update Performance Review Items">
- <entity-one entity-name="PerfReviewItem" value-name="lookedUpValue"/>
+ <entity-one entity-name="PerfReviewItem" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePerfReviewItem" short-description="Delete Performance Review Items">
- <entity-one entity-name="PerfReviewItem" value-name="lookedUpValue"/>
+ <entity-one entity-name="PerfReviewItem" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -154,13 +154,13 @@
</simple-method>
<simple-method method-name="updatePerformanceNote" short-description="Update Performance Note">
- <entity-one entity-name="PerformanceNote" value-name="lookedUpValue"/>
+ <entity-one entity-name="PerformanceNote" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePerformanceNote" short-description="Delete Performance Note">
- <entity-one entity-name="PerformanceNote" value-name="lookedUpValue"/>
+ <entity-one entity-name="PerformanceNote" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -176,13 +176,13 @@
</simple-method>
<simple-method method-name="updatePersonTraining" short-description="Update a Person Training">
- <entity-one entity-name="PersonTraining" value-name="lookedUpValue"/>
+ <entity-one entity-name="PersonTraining" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePersonTraining" short-description="Delete a Person Training">
- <entity-one entity-name="PersonTraining" value-name="lookedUpValue"/>
+ <entity-one entity-name="PersonTraining" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -202,13 +202,13 @@
</simple-method>
<simple-method method-name="updateEmployment" short-description="Update Employment">
- <entity-one entity-name="Employment" value-name="lookedUpValue"/>
+ <entity-one entity-name="Employment" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmployment" short-description="Delete Employment">
- <entity-one entity-name="Employment" value-name="lookedUpValue"/>
+ <entity-one entity-name="Employment" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -221,13 +221,13 @@
</simple-method>
<simple-method method-name="updateEmploymentApp" short-description="Update EmploymentApp">
- <entity-one entity-name="EmploymentApp" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmploymentApp" short-description="Delete EmploymentApp">
- <entity-one entity-name="EmploymentApp" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -243,14 +243,14 @@
</simple-method>
<simple-method method-name="updatePartyBenefit" short-description="Update Party Benefit">
- <entity-one entity-name="PartyBenefit" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyBenefit" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyBenefit" short-description="Delete Party Benefit">
<now-timestamp-to-env env-name="nowTimeStamp"/>
- <entity-one entity-name="PartyBenefit" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyBenefit" value-field="lookedUpValue"/>
<set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
<store-value value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -270,13 +270,13 @@
</simple-method>
<simple-method method-name="updatePayGrade" short-description="Update Pay Grade">
- <entity-one entity-name="PayGrade" value-name="lookedUpValue"/>
+ <entity-one entity-name="PayGrade" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePayGrade" short-description="Delete Pay Grade">
- <entity-one entity-name="PayGrade" value-name="lookedUpValue"/>
+ <entity-one entity-name="PayGrade" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -292,14 +292,14 @@
</simple-method>
<simple-method method-name="updatePayHistory" short-description="Update Pay History">
- <entity-one entity-name="PayHistory" value-name="lookedUpValue"/>
+ <entity-one entity-name="PayHistory" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePayHistory" short-description="Delete Pay History">
<now-timestamp-to-env env-name="nowTimeStamp"/>
- <entity-one entity-name="PayHistory" value-name="lookedUpValue"/>
+ <entity-one entity-name="PayHistory" value-field="lookedUpValue"/>
<set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
<store-value value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -315,13 +315,13 @@
</simple-method>
<simple-method method-name="updatePayrollPreference" short-description="Update Payroll Preference">
- <entity-one entity-name="PayrollPreference" value-name="lookedUpValue"/>
+ <entity-one entity-name="PayrollPreference" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePayrollPreference" short-description="Delete Payroll Preference">
- <entity-one entity-name="PayrollPreference" value-name="lookedUpValue"/>
+ <entity-one entity-name="PayrollPreference" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -335,13 +335,13 @@
</simple-method>
<simple-method method-name="updateSalaryStep" short-description="Update Salary Step">
- <entity-one entity-name="SalaryStep" value-name="lookedUpValue"/>
+ <entity-one entity-name="SalaryStep" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSalaryStep" short-description="Delete Salary Step">
- <entity-one entity-name="SalaryStep" value-name="lookedUpValue"/>
+ <entity-one entity-name="SalaryStep" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -354,13 +354,13 @@
</simple-method>
<simple-method method-name="updateTerminationReason" short-description="Update Termination Reason">
- <entity-one entity-name="TerminationReason" value-name="lookedUpValue"/>
+ <entity-one entity-name="TerminationReason" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTerminationReason" short-description="Delete Termination Reason">
- <entity-one entity-name="TerminationReason" value-name="lookedUpValue"/>
+ <entity-one entity-name="TerminationReason" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -373,14 +373,14 @@
</simple-method>
<simple-method method-name="updateUnemploymentClaim" short-description="Update Unemployment Claim">
- <entity-one entity-name="UnemploymentClaim" value-name="lookedUpValue"/>
+ <entity-one entity-name="UnemploymentClaim" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteUnemploymentClaim" short-description="Delete Unemployment Claim">
<now-timestamp-to-env env-name="nowTimeStamp"/>
- <entity-one entity-name="UnemploymentClaim" value-name="lookedUpValue"/>
+ <entity-one entity-name="UnemploymentClaim" value-field="lookedUpValue"/>
<set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -395,13 +395,13 @@
</simple-method>
<simple-method method-name="updateEmplPosition" short-description="Update Employee Position">
- <entity-one entity-name="EmplPosition" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPosition" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmplPosition" short-description="Delete Employee Position">
- <entity-one entity-name="EmplPosition" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPosition" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -417,13 +417,13 @@
</simple-method>
<simple-method method-name="updateEmplPositionFulfillment" short-description="Update Employee Position Fulfillment">
- <entity-one entity-name="EmplPositionFulfillment" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionFulfillment" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmplPositionFulfillment" short-description="Delete Employee Position Fulfillment">
- <entity-one entity-name="EmplPositionFulfillment" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionFulfillment" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -452,13 +452,13 @@
</simple-method>
<simple-method method-name="updateEmplPositionReportingStruct" short-description="Update Employee Position Reporting Structure">
- <entity-one entity-name="EmplPositionReportingStruct" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionReportingStruct" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmplPositionReportingStruct" short-description="Delete Employee Position Reporting Structure">
- <entity-one entity-name="EmplPositionReportingStruct" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionReportingStruct" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -474,13 +474,13 @@
</simple-method>
<simple-method method-name="updateEmplPositionResponsibility" short-description="Update Employee Position Responsibility">
- <entity-one entity-name="EmplPositionResponsibility" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionResponsibility" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmplPositionResponsibility" short-description="Delete Employee Position Responsibility">
- <entity-one entity-name="EmplPositionResponsibility" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionResponsibility" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -496,13 +496,13 @@
</simple-method>
<simple-method method-name="updateValidResponsibility" short-description="Update Valid Responsibility">
- <entity-one entity-name="ValidResponsibility" value-name="lookedUpValue"/>
+ <entity-one entity-name="ValidResponsibility" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteValidResponsibility" short-description="Delete Valid Responsibility">
- <entity-one entity-name="ValidResponsibility" value-name="lookedUpValue"/>
+ <entity-one entity-name="ValidResponsibility" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- Skill Types -->
@@ -515,13 +515,13 @@
</simple-method>
<simple-method method-name="updateSkillType" short-description="Update SkillType">
- <entity-one entity-name="SkillType" value-name="lookedUpValue"/>
+ <entity-one entity-name="SkillType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSkillType" short-description="Delete SkillType">
- <entity-one entity-name="SkillType" value-name="lookedUpValue"/>
+ <entity-one entity-name="SkillType" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -558,13 +558,13 @@
</simple-method>
<simple-method method-name="updateResponsibilityType" short-description="Update ResponsibilityType">
- <entity-one entity-name="ResponsibilityType" value-name="lookedUpValue"/>
+ <entity-one entity-name="ResponsibilityType" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteResponsibilityType" short-description="Delete ResponsibilityType">
- <entity-one entity-name="ResponsibilityType" value-name="lookedUpValue"/>
+ <entity-one entity-name="ResponsibilityType" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -579,13 +579,13 @@
</simple-method>
<simple-method method-name="updateTerminationType" short-description="Update TerminationType">
- <entity-one entity-name="TerminationType" value-name="lookedUpValue"/>
+ <entity-one entity-name="TerminationType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTerminationType" short-description="Delete TerminationType">
- <entity-one entity-name="TerminationType" value-name="lookedUpValue"/>
+ <entity-one entity-name="TerminationType" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -600,13 +600,13 @@
</simple-method>
<simple-method method-name="updateEmplPositionType" short-description="Update PositionType">
- <entity-one entity-name="EmplPositionType" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="updateEmplPositionTypeRate" short-description="Update/create EmplPositionTypeRate">
- <entity-one entity-name="EmplPositionTypeRate" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
<!-- check if already exist is so expire current record -->
<entity-and entity-name="EmplPositionTypeRate" list-name="emplPositionTypeRates" filter-by-date="true">
<field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
@@ -631,7 +631,7 @@
</simple-method>
<simple-method method-name="deleteEmplPositionTypeRate" short-description="Delete EmplPositionTypeRate">
- <entity-one entity-name="EmplPositionTypeRate" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
<now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
<store-value value-name="lookedUpValue"/>
@@ -649,13 +649,13 @@
</simple-method>
<simple-method method-name="updateAgreementEmploymentAppl" short-description="update an Agreement Employment Appl">
- <entity-one entity-name="AgreementEmploymentAppl" value-name="lookedUpValue"/>
+ <entity-one entity-name="AgreementEmploymentAppl" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteAgreementEmploymentAppl" short-description="Delete Agreement Employment Appl">
- <entity-one entity-name="AgreementEmploymentAppl" value-name="agreementEmploymentAppl"/>
+ <entity-one entity-name="AgreementEmploymentAppl" value-field="agreementEmploymentAppl"/>
<remove-value value-name="agreementEmploymentAppl"/>
</simple-method>
<simple-method method-name="createEmplLeave" short-description="Create Employee Leave">
@@ -667,7 +667,7 @@
</simple-method>
<simple-method method-name="updateEmplLeave" short-description="Update Employee Leave">
- <entity-one entity-name="EmplLeave" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplLeave" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -684,13 +684,13 @@
</simple-method>
<simple-method method-name="updateEmplLeaveType" short-description="Update leaveType">
- <entity-one entity-name="EmplLeaveType" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplLeaveType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteEmplLeaveType" short-description="Delete leaveType">
- <entity-one entity-name="EmplLeaveType" value-name="lookedUpValue"/>
+ <entity-one entity-name="EmplLeaveType" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Tue Dec 30 04:07:14 2008
@@ -23,7 +23,7 @@
<!-- Warehouse -->
<simple-method method-name="issueProductionRunTask" short-description="Issues the Inventory for a Production Run Task" login-required="false">
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<if-empty field="parameters.failIfItemsAreNotAvailable">
<set field="parameters.failIfItemsAreNotAvailable" value="Y"/>
@@ -60,7 +60,7 @@
<set from-field="parameters.productId" field="productId"/>
<set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="Double"/>
<else>
- <entity-one entity-name="WorkEffortGoodStandard" value-name="workEffortGoodStandard" auto-field-map="false">
+ <entity-one entity-name="WorkEffortGoodStandard" value-field="workEffortGoodStandard" auto-field-map="false">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="fromDate" from-field="parameters.fromDate"/>
@@ -81,7 +81,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- NOTE: the inventory will be issued from the WorkEffort.facilityId -->
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<!-- before we do the find, put together the orderBy list based on which reserveOrderEnumId is specified -->
<if-compare value="INVRO_FIFO_EXP" operator="equals" field="parameters.reserveOrderEnumId">
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -130,7 +130,7 @@
<then><add-error><fail-message message="Security Error: to run createMarketingCampaignRole you must run it for yourself or have the MARKETING_CREATE or MARKETING_ADMIN permissions."/></add-error></then>
</if>
- <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
+ <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/>
<!-- okay, now check for all errors -->
<check-errors/>
@@ -155,9 +155,9 @@
</if>
<check-errors/>
- <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
+ <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/>
- <entity-one entity-name="MarketingCampaignRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="MarketingCampaignRole" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -165,7 +165,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteMarketingCampaignRole you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="MarketingCampaignRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="MarketingCampaignRole" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 04:07:14 2008
@@ -40,7 +40,7 @@
<check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateContactList you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ContactList" value-name="lookedUpValue" auto-field-map="true"/>
+ <entity-one entity-name="ContactList" value-field="lookedUpValue" auto-field-map="true"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -48,7 +48,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteContactList you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ContactList" value-name="lookedUpValue" auto-field-map="true"/>
+ <entity-one entity-name="ContactList" value-field="lookedUpValue" auto-field-map="true"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -56,14 +56,14 @@
<simple-method method-name="inlineCheckContactListMechType" short-description="inlineCheckContactListMechType">
<!-- check the preferredContactMechId, make sure it is the right type -->
<if-not-empty field="parameters.preferredContactMechId">
- <entity-one entity-name="ContactMech" value-name="preferredContactMech" auto-field-map="false">
+ <entity-one entity-name="ContactMech" value-field="preferredContactMech" auto-field-map="false">
<field-map field-name="contactMechId" from-field="parameters.preferredContactMechId"/>
</entity-one>
<if-compare-field field="preferredContactMech.contactMechTypeId" to-field="contactList.contactMechTypeId" operator="not-equals">
- <entity-one entity-name="ContactMechType" value-name="preferredContactMechType" auto-field-map="false">
+ <entity-one entity-name="ContactMechType" value-field="preferredContactMechType" auto-field-map="false">
<field-map field-name="contactMechTypeId" from-field="preferredContactMech.contactMechTypeId"/>
</entity-one>
- <entity-one entity-name="ContactMechType" value-name="listContactMechType" auto-field-map="false">
+ <entity-one entity-name="ContactMechType" value-field="listContactMechType" auto-field-map="false">
<field-map field-name="contactMechTypeId" from-field="contactList.contactMechTypeId"/>
</entity-one>
<add-error><fail-message message="The preferred contact mechanism [${preferredContactMechType.description}] was not of the right type for the list [${listContactMechType.description}]."/></add-error>
@@ -96,7 +96,7 @@
<then><add-error><fail-message message="Security Error: to run createContactListParty you must run it for yourself or have the MARKETING_CREATE or MARKETING_ADMIN permissions."/></add-error></then>
</if>
- <entity-one entity-name="ContactList" value-name="contactList"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
<call-simple-method method-name="inlineCheckContactListMechType"/>
<call-simple-method method-name="inlineCheckContactListStatusParameter"/>
@@ -127,11 +127,11 @@
</if>
<check-errors/>
- <entity-one entity-name="ContactList" value-name="contactList"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
<call-simple-method method-name="inlineCheckContactListMechType"/>
<call-simple-method method-name="inlineCheckContactListStatusParameter"/>
- <entity-one entity-name="ContactListParty" value-name="lookedUpValue"/>
+ <entity-one entity-name="ContactListParty" value-field="lookedUpValue"/>
<if-not-empty field="parameters.statusId">
<if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
<!-- NOTE: must be parameters as this will have the new statusId, and it will have additional attributes like optInVerifyCode -->
@@ -155,7 +155,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteContactListParty you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ContactListParty" value-name="lookedUpValue"/>
+ <entity-one entity-name="ContactListParty" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createContactListPartyStatus" short-description="Create ContactListParty Status">
@@ -232,8 +232,8 @@
</if>
<check-errors/>
- <entity-one entity-name="ContactList" value-name="contactList"/>
- <entity-one entity-name="ContactListParty" value-name="contactListParty"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
+ <entity-one entity-name="ContactListParty" value-field="contactListParty"/>
<get-related-one value-name="contactListParty" relation-name="PreferredContactMech" to-value-name="preferredContactMech"/>
<if>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Dec 30 04:07:14 2008
@@ -41,7 +41,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroup" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroup" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -51,7 +51,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroup" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroup" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -68,14 +68,14 @@
<simple-method method-name="updateSegmentGroupClassification" short-description="update a SegmentGroupClassification">
<check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupClassificationPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroupClassification" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSegmentGroupClassification" short-description="delete a SegmentGroupClassification">
<check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupClassificationPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroupClassification" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -91,14 +91,14 @@
<simple-method method-name="updateSegmentGroupGeo" short-description="update a SegmentGroupGeo">
<check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupGeoPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroupGeo" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSegmentGroupGeo" short-description="delete a SegmentGroupGeo">
<check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupGeoPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroupGeo" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -114,14 +114,14 @@
<simple-method method-name="updateSegmentGroupRole" short-description="update a SegmentGroupRole">
<check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupRolePermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroupRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/>
<set-pk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSegmentGroupRole" short-description="delete a SegmentGroupRole">
<check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupRolePermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="SegmentGroupRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/>
<!-- <field-to-result field-name="lookedUpValue.partyId" result-name="partyId"/> -->
<remove-value value-name="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml Tue Dec 30 04:07:14 2008
@@ -46,7 +46,7 @@
<set field="contactListName" value="Announcement List" type="String"/>
<set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
- <entity-one entity-name="UserLogin" value-name="userLogin" auto-field-map="false">
+ <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createServiceCtx.userLogin" from-field="userLogin"/>
@@ -58,7 +58,7 @@
<result-to-field result-name="contactListId"/>
</call-service>
<log level="info" message="======== Created contactListId [${contactListId}] ======="/>
- <entity-one entity-name="ContactList" value-name="contactList"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
<assert>
<not><if-empty field="contactList"/></not>
<if-compare-field field="contactList.contactListTypeId" to-field="contactListTypeId" operator="equals"/>
@@ -80,7 +80,7 @@
<set field="updateServiceCtx.contactListId" from-field="contactListId"/>
<call-service service-name="updateContactList" in-map-name="updateServiceCtx"/>
- <entity-one entity-name="ContactList" value-name="contactList"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
<assert>
<not><if-empty field="contactList"/></not>
<if-compare-field field="contactList.contactListTypeId" to-field="contactListTypeId" operator="equals"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Tue Dec 30 04:07:14 2008
@@ -33,7 +33,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateOpportunity" short-description="Update an opportunity">
- <entity-one entity-name="SalesOpportunity" value-name="lookedUpValue"/>
+ <entity-one entity-name="SalesOpportunity" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml Tue Dec 30 04:07:14 2008
@@ -35,7 +35,7 @@
<fail-property resource="OrderUiLabels" property="OrderRemoveCommunicationEventOrderPermissionError"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="CommunicationEventOrder" value-name="eventOrder"/>
+ <entity-one entity-name="CommunicationEventOrder" value-field="eventOrder"/>
<remove-value value-name="eventOrder"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Tue Dec 30 04:07:14 2008
@@ -50,7 +50,7 @@
<simple-method method-name="updateSalesForecast" short-description="Updates a sales forecast and stores a copy in sales forecast history.">
<!-- get the forecast -->
- <entity-one entity-name="SalesForecast" auto-field-map="true" value-name="salesForecast"/>
+ <entity-one entity-name="SalesForecast" auto-field-map="true" value-field="salesForecast"/>
<!-- set the fields from the parameters -->
<set-nonpk-fields map="parameters" value-field="salesForecast"/>
@@ -92,12 +92,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSalesForecastDetail" short-description="Updates a sales forecast detail">
- <entity-one entity-name="SalesForecastDetail" value-name="lookedUpValue"/>
+ <entity-one entity-name="SalesForecastDetail" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSalesForecastDetail" short-description="Delete a Sales Forecast Detail">
- <entity-one entity-name="SalesForecastDetail" value-name="lookedUpValue"/>
+ <entity-one entity-name="SalesForecastDetail" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
</simple-methods>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -39,7 +39,7 @@
<!-- no toPartyId was specified. use destination facility to determine the party of the return -->
<if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
<if-not-empty field="parameters.destinationFacilityId">
- <entity-one entity-name="Facility" value-name="destinationFacility" auto-field-map="false">
+ <entity-one entity-name="Facility" value-field="destinationFacility" auto-field-map="false">
<field-map field-name="facilityId" from-field="parameters.destinationFacilityId"/>
</entity-one>
<set from-field="destinationFacility.ownerPartyId" field="parameters.toPartyId"/>
@@ -48,7 +48,7 @@
<else>
<!-- make sure that the party to return to is an INTERNAL_ORGANIZATIO for customer return and SUPPLIER for vendor return else stop -->
<if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
- <entity-one entity-name="PartyRole" value-name="partyRole" use-cache="true" auto-field-map="false">
+ <entity-one entity-name="PartyRole" value-field="partyRole" use-cache="true" auto-field-map="false">
<field-map field-name="partyId" from-field="parameters.toPartyId"/>
<field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
</entity-one>
@@ -56,7 +56,7 @@
<add-error><fail-message message="Error: a return must be to a party in the role of internal organization"/></add-error>
</if-empty>
<else>
- <entity-one entity-name="PartyRole" value-name="partyRole" use-cache="true" auto-field-map="false">
+ <entity-one entity-name="PartyRole" value-field="partyRole" use-cache="true" auto-field-map="false">
<field-map field-name="partyId" from-field="parameters.toPartyId"/>
<field-map field-name="roleTypeId" value="SUPPLIER"/>
</entity-one>
@@ -134,7 +134,7 @@
<check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateReturnHeader"/></check-permission>
<check-errors/>
- <entity-one entity-name="ReturnHeader" value-name="returnHeader"/>
+ <entity-one entity-name="ReturnHeader" value-field="returnHeader"/>
<!-- test the total return amount vs the total order amount -->
<if-compare field="parameters.statusId" value="RETURN_ACCEPTED" operator="equals">
@@ -222,7 +222,7 @@
<then>
<set field="statusIdTo" from-field="parameters.statusId"/>
<set field="statusId" from-field="returnHeader.statusId"/>
- <entity-one entity-name="StatusValidChange" value-name="statusValidChange"/>
+ <entity-one entity-name="StatusValidChange" value-field="statusValidChange"/>
<if-empty field="statusValidChange">
<add-error><fail-property resource="OrderErrorUiLabels" property="OrderErrorReturnHeaderItemStatusNotChangedIsNotAValidChange"/></add-error>
</if-empty>
@@ -472,7 +472,7 @@
<check-permission permission="ORDERMGR" action="_DELETE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuoteItem"/></check-permission>
<check-errors/>
- <entity-one entity-name="ReturnHeader" value-name="returnHeader"/>
+ <entity-one entity-name="ReturnHeader" value-field="returnHeader"/>
<if-compare field="returnHeader.returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
<if-compare field="returnHeader.statusId" operator="not-equals" type="String" value="RETURN_REQUESTED">
<add-error><fail-property resource="OrderErrorUiLabels" property="OrderCannotRemoveItemsOnceReturnIsApproved"/></add-error>
@@ -550,7 +550,7 @@
</calcop>
</calculate>
- <entity-one entity-name="ReturnItem" value-name="returnItem">
+ <entity-one entity-name="ReturnItem" value-field="returnItem">
<field-map field-name="returnId" from-field="receipt.returnId"/>
<field-map field-name="returnItemSeqId" from-field="receipt.returnItemSeqId"/>
</entity-one>
@@ -650,7 +650,7 @@
<check-errors/>
<!-- get primary information from the order header -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader">
+ <entity-one entity-name="OrderHeader" value-field="orderHeader">
<field-map from-field="parameters.orderId" field-name="orderId"/>
</entity-one>
<set field="returnHeaderTypeId" from-field="parameters.returnHeaderTypeId"/>
@@ -735,18 +735,18 @@
<set from-field="orderItem.orderItemTypeId" field="orderItemTypeId"/>
<if-compare field="orderItemTypeId" value="PRODUCT_ORDER_ITEM" operator="equals">
<!-- Check if orderItemTypeId equals PRODUCT_ORDER_ITEM, if so, use ProductType and ReturnItemTypeMap to get ReturnItemType-->
- <entity-one entity-name="Product" value-name="product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId" from-field="orderItem.productId"/>
<select-field field-name="productTypeId"/>
</entity-one>
- <entity-one entity-name="ReturnItemTypeMap" value-name="returnItemTypeMapping">
+ <entity-one entity-name="ReturnItemTypeMap" value-field="returnItemTypeMapping">
<field-map from-field="product.productTypeId" field-name="returnItemMapKey"/>
<field-map from-field="returnHeaderTypeId" field-name="returnHeaderTypeId"/>
</entity-one>
<else>
<!-- if not, try the ReturnItemTypeMap, but this may not actually work, so log a warning -->
<log level="warning" message="Trying to find returnItemtype from ReturnItemTypeMap with orderItemtypeId [${orderItem.orderItemTypeId}] for order item [${orderItem}]"/>
- <entity-one entity-name="ReturnItemTypeMap" value-name="returnItemTypeMapping">
+ <entity-one entity-name="ReturnItemTypeMap" value-field="returnItemTypeMapping">
<field-map from-field="orderItemTypeId" field-name="returnItemMapKey"/>
<field-map from-field="returnHeaderTypeId" field-name="returnHeaderTypeId"/>
</entity-one>
@@ -886,7 +886,7 @@
<simple-method method-name="cancelReplacementOrderItems" short-description="Cancel the associated OrderItems of the replacement order, if any.">
<check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCancelReturnItems"/></check-permission>
<check-errors/>
- <entity-one entity-name="ReturnItem" value-name="returnItem"/>
+ <entity-one entity-name="ReturnItem" value-field="returnItem"/>
<if>
<condition>
<or>