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 12:28:28 UTC
svn commit: r730098 [3/9] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/scr...
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -464,7 +464,7 @@
<call-simple-method method-name="findAllContentPurposes"/>
<!-- find defined purpose/operation mappings -->
- <iterate entry="currentPurpose" list-name="contentPurposes">
+ <iterate entry="currentPurpose" list="contentPurposes">
<entity-condition entity-name="ContentPurposeOperation" list-name="currentOperations">
<condition-list combine="and">
<condition-expr field-name="contentPurposeTypeId" operator="equals" env-name="currentPurpose.contentPurposeTypeId"/>
@@ -507,7 +507,7 @@
<call-simple-method method-name="findAllAssociatedPartyIds"/>
<!-- check each operation security -->
- <iterate entry="operation" list-name="operations">
+ <iterate entry="operation" list="operations">
<if-compare field="hasPermission" value="false" type="Boolean" operator="equals">
<!-- reset the checkId if needed -->
<if>
@@ -543,7 +543,7 @@
<log level="verbose" message="Passed status check; now checking role(s)"/>
<!-- first check passed; now we test for the role membership(s) -->
- <iterate entry="thisPartyId" list-name="partyIdList">
+ <iterate entry="thisPartyId" list="partyIdList">
<if-compare field="hasPermission" value="false" type="Boolean" operator="equals">
<set field="checkRoleTypeId" from-field="operation.roleTypeId"/>
<set field="checkPartyId" from-field="thisPartyId"/>
@@ -639,7 +639,7 @@
<set field="checkRoleTypeId" value="OWNER"/>
<!-- check to see if any of the parties are owner of the content -->
- <iterate entry="thisPartyId" list-name="partyIdList">
+ <iterate entry="thisPartyId" list="partyIdList">
<if>
<condition>
<not>
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -23,7 +23,7 @@
<!-- WebSite Services -->
<simple-method method-name="createWebSite" short-description="Create a WebSite">
- <make-value value-name="newEntity" entity-name="WebSite"/>
+ <make-value value-field="newEntity" entity-name="WebSite"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -35,7 +35,7 @@
<store-value value-name="webSite"/>
</simple-method>
<simple-method method-name="removeWebSite" short-description="Remove a WebSite">
- <make-value value-name="lookupKeyValue" entity-name="WebSite"/>
+ <make-value value-field="lookupKeyValue" entity-name="WebSite"/>
<set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
<find-by-primary-key entity-name="WebSite" map-name="lookupKeyValue" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -44,7 +44,7 @@
<!-- WebSite Content -->
<simple-method method-name="createWebSiteContent" short-description="Create WebSite Content">
- <make-value value-name="newEntity" entity-name="WebSiteContent"/>
+ <make-value value-field="newEntity" entity-name="WebSiteContent"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields value-name="newEntity" map-name="parameters"/>
<if-empty field="newEntity.fromDate">
@@ -54,14 +54,14 @@
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateWebSiteContent" short-description="Update WebSite Content">
- <make-value value-name="lookupPKMap" entity-name="WebSiteContent"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSiteContent" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWebSiteContent" short-description="Remove WebSite Content">
- <make-value value-name="lookupPKMap" entity-name="WebSiteContent"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSiteContent" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -69,7 +69,7 @@
<!-- WebSite Content Type Services -->
<simple-method method-name="createWebSiteContentType" short-description="Create WebSite Content Type">
- <make-value value-name="newEntity" entity-name="WebSiteContentType"/>
+ <make-value value-field="newEntity" entity-name="WebSiteContentType"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields value-name="newEntity" map-name="parameters"/>
<if-empty field="newEntity.webSiteContentTypeId">
@@ -79,14 +79,14 @@
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateWebSiteContentType" short-description="Update WebSite Content Type">
- <make-value value-name="lookupPKMap" entity-name="WebSiteContentType"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSiteContentType"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWebSiteContentType" short-description="Remove WebSite Content Type">
- <make-value value-name="lookupPKMap" entity-name="WebSiteContentType"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSiteContentType"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -94,26 +94,26 @@
<!-- WebSite Path Alias -->
<simple-method method-name="createWebSitePathAlias" short-description="Create WebSite Path Alias">
- <make-value value-name="newEntity" entity-name="WebSitePathAlias"/>
+ <make-value value-field="newEntity" entity-name="WebSitePathAlias"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields value-name="newEntity" map-name="parameters"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateWebSitePathAlias" short-description="Update WebSite Path Alias">
- <make-value value-name="lookupPKMap" entity-name="WebSitePathAlias"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWebSitePathAlias" short-description="Remove WebSite Path Alias">
- <make-value value-name="lookupPKMap" entity-name="WebSitePathAlias"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="getWebSitePathAlias" short-description="Returns a WebSite Path Alias">
- <make-value value-name="lookupPKMap" entity-name="WebSitePathAlias"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-name="alias" use-cache="true"/>
<field-to-result field-name="alias.pathTo" result-name="pathTo"/>
@@ -121,7 +121,7 @@
<!-- WebSite Role Services -->
<simple-method method-name="createWebSiteRole" short-description="Create WebSite Role">
- <make-value value-name="newEntity" entity-name="WebSiteRole"/>
+ <make-value value-field="newEntity" entity-name="WebSiteRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -133,14 +133,14 @@
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateWebSiteRole" short-description="Update WebSite Role">
- <make-value value-name="lookupPKMap" entity-name="WebSiteRole"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSiteRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWebSiteRole" short-description="Remove WebSite Role">
- <make-value value-name="lookupPKMap" entity-name="WebSiteRole"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="WebSiteRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -173,7 +173,7 @@
<else>
<!-- multi-checked -->
- <iterate entry="thisType" list-name="parameters.webSiteContentTypeId">
+ <iterate entry="thisType" list="parameters.webSiteContentTypeId">
<entity-one entity-name="WebSiteContentType" value-name="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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -81,7 +81,7 @@
</if-not-empty>
</if-not-empty>
- <make-value entity-name="UserLogin" value-name="newUserLogin"/>
+ <make-value entity-name="UserLogin" value-field="newUserLogin"/>
<set from-field="userLoginContext.userLoginId" field="newUserLogin.userLoginId"/>
<set from-field="userLoginContext.currentPassword" field="newUserLogin.currentPassword"/>
<set from-field="userLoginContext.passwordHint" field="newUserLogin.passwordHint"/>
@@ -273,7 +273,7 @@
</if-compare>
<!-- create the PartyDataSource entry to track where this info came from... -->
- <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
+ <make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
<set value="ECOMMERCE_SITE" field="partyDataSource.dataSourceId"/>
<set from-field="nowStamp" field="partyDataSource.fromDate"/>
<set value="Y" field="partyDataSource.isCreate"/>
@@ -959,7 +959,7 @@
<add-error error-list-name="error_list"><fail-message message="Username in use, please choose another."/></add-error>
</if-not-empty>
</if-not-empty>
- <make-value entity-name="UserLogin" value-name="newUserLogin"/>
+ <make-value entity-name="UserLogin" value-field="newUserLogin"/>
<set field="newUserLogin.userLoginId" from-field="userLoginMap.userLoginId"/>
<set field="newUserLogin.currentPassword" from-field="userLoginMap.currentPassword"/>
<set field="newUserLogin.passwordHint" from-field="userLoginMap.passwordHint"/>
@@ -1052,7 +1052,7 @@
<set field="chosenShippingMethod" value="${shipmentMethodTypeId}@${carrierPartyId}"/>
</if-not-empty>
</if-not-empty>
- <iterate list-name="carrierShipmentMethodList" entry-name="carrierShipmentMethod">
+ <iterate list="carrierShipmentMethodList" entry="carrierShipmentMethod">
<call-object-method obj-field-name="shippingEstWpr" method-name="getShippingEstimate" ret-field-name="shippingEst">
<field field-name="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/>
</call-object-method>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Tue Dec 30 03:28:24 2008
@@ -70,7 +70,7 @@
</if-not-empty>
</if-not-empty>
- <make-value entity-name="UserLogin" value-name="newUserLogin"/>
+ <make-value entity-name="UserLogin" value-field="newUserLogin"/>
<set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/>
<set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" />
<set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" />
@@ -281,7 +281,7 @@
</if-compare>
<!-- create the PartyDataSource entry to track where this info came from... -->
- <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
+ <make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
<set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
<set field="partyDataSource.fromDate" from-field="nowStamp" />
<set field="partyDataSource.isCreate" value="Y" />
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Tue Dec 30 03:28:24 2008
@@ -33,7 +33,7 @@
<set from-field="ul_context.currentPassword" field="newUserLoginMap.currentPassword"/>
<set from-field="ul_context.passwordHint" field="newUserLoginMap.passwordHint"/>
<set from-field="ul_context.partyId" field="newUserLoginMap.partyId"/>
- <make-value entity-name="UserLogin" map-name="newUserLoginMap" value-name="newUserLogin"/>
+ <make-value entity-name="UserLogin" map-name="newUserLoginMap" value-field="newUserLogin"/>
<set-current-user-login value-name="newUserLogin"/>
<!-- Create the Party/PartyGroup -->
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -23,7 +23,7 @@
<!-- Party Qualification -->
<simple-method method-name="createPartyQual" short-description="Create a Party Qualification">
- <make-value entity-name="PartyQual" value-name="newEntity"/>
+ <make-value entity-name="PartyQual" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="nowTimeStamp"/>
@@ -49,7 +49,7 @@
</simple-method>
<simple-method method-name="createPartyResume" short-description="Create Resume for Party">
- <make-value entity-name="PartyResume" value-name="newEntity"/>
+ <make-value entity-name="PartyResume" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="PartyResume" env-name="newEntity.resumeId"/>
<field-to-result field-name="resumeId" result-name="resumeId"/>
@@ -68,7 +68,7 @@
</simple-method>
<simple-method method-name="createPartySkill" short-description="Create Party Skills">
- <make-value entity-name="PartySkill" value-name="newEntity"/>
+ <make-value entity-name="PartySkill" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<entity-one entity-name="PartySkill" value-name="partySkill" auto-field-map="true"/>
@@ -103,7 +103,7 @@
</simple-method>
<simple-method method-name="createPerfReview" short-description="Create a Performance Review">
- <make-value entity-name="PerfReview" value-name="newEntity"/>
+ <make-value entity-name="PerfReview" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="PerfReview" env-name="newEntity.perfReviewId"/>
@@ -123,7 +123,7 @@
</simple-method>
<simple-method method-name="createPerfReviewItem" short-description="Create Performance Review Items">
- <make-value entity-name="PerfReviewItem" value-name="newEntity"/>
+ <make-value entity-name="PerfReviewItem" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="PerfReviewItem" env-name="newEntity.perfReviewItemSeqId"/>
@@ -143,7 +143,7 @@
</simple-method>
<simple-method method-name="createPerformanceNote" short-description="Create Performance Note">
- <make-value entity-name="PerformanceNote" value-name="newEntity"/>
+ <make-value entity-name="PerformanceNote" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -165,7 +165,7 @@
</simple-method>
<simple-method method-name="createPersonTraining" short-description="Create Person Training">
- <make-value entity-name="PersonTraining" value-name="newEntity"/>
+ <make-value entity-name="PersonTraining" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -188,7 +188,7 @@
<!-- Employment Group -->
<simple-method method-name="createEmployment" short-description="Create Employment">
- <make-value entity-name="Employment" value-name="newEntity"/>
+ <make-value entity-name="Employment" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -213,7 +213,7 @@
</simple-method>
<simple-method method-name="createEmploymentApp" short-description="Create an Employment Application">
- <make-value entity-name="EmploymentApp" value-name="newEntity"/>
+ <make-value entity-name="EmploymentApp" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="EmploymentApp" env-name="newEntity.applicationId"/>
<field-to-result field-name="newEntity.applicationId" result-name="applicationId"/>
@@ -232,7 +232,7 @@
</simple-method>
<simple-method method-name="createPartyBenefit" short-description="Create Party Benefit">
- <make-value entity-name="PartyBenefit" value-name="newEntity"/>
+ <make-value entity-name="PartyBenefit" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -257,7 +257,7 @@
</simple-method>
<simple-method method-name="createPayGrade" short-description="Create a Pay Grade">
- <make-value entity-name="PayGrade" value-name="newEntity"/>
+ <make-value entity-name="PayGrade" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-not-empty field="parameters.payGradeId">
<set field="newEntity.payGradeId" from-field="parameters.payGradeId"/>
@@ -281,7 +281,7 @@
</simple-method>
<simple-method method-name="createPayHistory" short-description="Create Pay History">
- <make-value entity-name="PayHistory" value-name="newEntity"/>
+ <make-value entity-name="PayHistory" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -306,7 +306,7 @@
</simple-method>
<simple-method method-name="createPayrollPreference" short-description="Create a Payroll Preference">
- <make-value entity-name="PayrollPreference" value-name="newEntity"/>
+ <make-value entity-name="PayrollPreference" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="PayrollPreference" env-name="newEntity.payrollPreferenceSeqId"/>
@@ -326,7 +326,7 @@
</simple-method>
<simple-method method-name="createSalaryStep" short-description="Create a Salary Step">
- <make-value entity-name="SalaryStep" value-name="newEntity"/>
+ <make-value entity-name="SalaryStep" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="SalaryStep" env-name="newEntity.salaryStepSeqId"/>
@@ -346,7 +346,7 @@
</simple-method>
<simple-method method-name="createTerminationReason" short-description="Create a Termination Reason">
- <make-value entity-name="TerminationReason" value-name="newEntity"/>
+ <make-value entity-name="TerminationReason" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="TerminationReason" env-name="newEntity.terminationReasonId"/>
<field-to-result field-name="newEntity.terminationReasonId" result-name="terminationReasonId"/>
@@ -365,7 +365,7 @@
</simple-method>
<simple-method method-name="createUnemploymentClaim" short-description="Create a Unemployment Claim">
- <make-value entity-name="UnemploymentClaim" value-name="newEntity"/>
+ <make-value entity-name="UnemploymentClaim" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="UnemploymentClaim" env-name="newEntity.unemploymentClaimId"/>
<field-to-result field-name="newEntity.unemploymentClaimId" result-name="unemploymentClaimId"/>
@@ -387,7 +387,7 @@
<!-- Employee Position Group -->
<simple-method method-name="createEmplPosition" short-description="Create a Employee Position">
- <make-value entity-name="EmplPosition" value-name="newEntity"/>
+ <make-value entity-name="EmplPosition" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="EmplPosition" env-name="newEntity.emplPositionId"/>
<field-to-result field-name="newEntity.emplPositionId" result-name="emplPositionId"/>
@@ -406,7 +406,7 @@
</simple-method>
<simple-method method-name="createEmplPositionFulfillment" short-description="Create a Emplyoee Position Fulfillment">
- <make-value entity-name="EmplPositionFulfillment" value-name="newEntity"/>
+ <make-value entity-name="EmplPositionFulfillment" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -428,7 +428,7 @@
</simple-method>
<simple-method method-name="createEmplPositionReportingStruct" short-description="Create a Employee Position Reporting Structure">
- <make-value entity-name="EmplPositionReportingStruct" value-name="newEntity"/>
+ <make-value entity-name="EmplPositionReportingStruct" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -463,7 +463,7 @@
</simple-method>
<simple-method method-name="createEmplPositionResponsibility" short-description="Create a Employee Position Responsibility">
- <make-value entity-name="EmplPositionResponsibility" value-name="newEntity"/>
+ <make-value entity-name="EmplPositionResponsibility" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -485,7 +485,7 @@
</simple-method>
<simple-method method-name="createValidResponsibility" short-description="Create a Valid Responsibility">
- <make-value entity-name="ValidResponsibility" value-name="newEntity"/>
+ <make-value entity-name="ValidResponsibility" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -507,7 +507,7 @@
</simple-method>
<!-- Skill Types -->
<simple-method method-name="createSkillType" short-description="Create a SkillType">
- <make-value entity-name="SkillType" value-name="newEntity"/>
+ <make-value entity-name="SkillType" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="SkillType" env-name="newEntity.skillTypeId"/>
<field-to-result field-name="newEntity.skillTypeId" result-name="skillTypeId"/>
@@ -547,7 +547,7 @@
<!-- Responsibility Types -->
<simple-method method-name="createResponsibilityType" short-description="Create a ResponsibilityType">
- <make-value entity-name="ResponsibilityType" value-name="newEntity"/>
+ <make-value entity-name="ResponsibilityType" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.responsibilityTypeId">
@@ -569,7 +569,7 @@
</simple-method>
<simple-method method-name="createTerminationType" short-description="Create a TerminationType">
- <make-value entity-name="TerminationType" value-name="newEntity"/>
+ <make-value entity-name="TerminationType" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.terminationTypeId">
<sequenced-id-to-env sequence-name="TerminationType" env-name="newEntity.terminationTypeId"/>
@@ -590,7 +590,7 @@
</simple-method>
<simple-method method-name="createEmplPositionType" short-description="Create a PositionType">
- <make-value entity-name="EmplPositionType" value-name="newEntity"/>
+ <make-value entity-name="EmplPositionType" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.emplPositionTypeId">
<sequenced-id-to-env sequence-name="EmplPositionType" env-name="newEntity.emplPositionTypeId"/>
@@ -618,7 +618,7 @@
<store-value value-name="emplPositionTypeRate"/>
</if-not-empty>
- <make-value value-name="newEntity" entity-name="EmplPositionTypeRate"/>
+ <make-value value-field="newEntity" entity-name="EmplPositionTypeRate"/>
<set-pk-fields map-name="parameters" value-name="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"/>
@@ -641,7 +641,7 @@
</simple-method>
<simple-method method-name="createAgreementEmploymentAppl" short-description="Create Agreement Employment Appl">
- <make-value entity-name="AgreementEmploymentAppl" value-name="agreementEmploymentAppl"/>
+ <make-value entity-name="AgreementEmploymentAppl" value-field="agreementEmploymentAppl"/>
<set-pk-fields value-name="agreementEmploymentAppl" map-name="parameters"/>
<set-nonpk-fields value-name="agreementEmploymentAppl" map-name="parameters"/>
<create-value value-name="agreementEmploymentAppl"/>
@@ -659,7 +659,7 @@
<remove-value value-name="agreementEmploymentAppl"/>
</simple-method>
<simple-method method-name="createEmplLeave" short-description="Create Employee Leave">
- <make-value entity-name="EmplLeave" value-name="newEntity"/>
+ <make-value entity-name="EmplLeave" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields value-name="newEntity" map-name="parameters"/>
<create-value value-name="newEntity"/>
@@ -673,7 +673,7 @@
</simple-method>
<simple-method method-name="createEmplLeaveType" short-description="Create a LeaveType">
- <make-value entity-name="EmplLeaveType" value-name="newEntity"/>
+ <make-value entity-name="EmplLeaveType" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.leaveTypeId">
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -40,7 +40,7 @@
<find-by-and entity-name="WorkEffortGoodStandard" list-name="components" map-name="lookupComponentsMap"/>
<filter-list-by-date list-name="components"/>
<!-- now go through each work effort good standard and call a service to issue the inventory -->
- <iterate list-name="components" entry-name="component">
+ <iterate list="components" entry="component">
<if-not-empty field="component.productId">
<clear-field field-name="callSvcMap"/>
<set-service-fields to-map-name="callSvcMap" service-name="issueProductionRunTaskComponent" map-name="component"/>
@@ -123,7 +123,7 @@
<set from-field="estimatedQuantity" field="parameters.quantityNotIssued"/>
<set field="parameters.useReservedItems" value="N"/>
- <iterate entry="inventoryItem" list-name="inventoryItemList">
+ <iterate entry="inventoryItem" list="inventoryItemList">
<!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
<call-simple-method method-name="issueProductionRunTaskComponentInline"/>
</iterate>
@@ -137,7 +137,7 @@
</condition>
<then>
<set field="parameters.useReservedItems" value="Y"/>
- <iterate entry="inventoryItem" list-name="inventoryItemList">
+ <iterate entry="inventoryItem" list="inventoryItemList">
<if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double">
<refresh-value value-name="inventoryItem"/>
<!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
@@ -226,7 +226,7 @@
<field-map field-name="workEffortId" from-field="workEffortGoodStandard.workEffortId"/>
<field-map field-name="productId" from-field="workEffortGoodStandard.productId"/>
</entity-and>
- <iterate list-name="issuances" entry-name="issuance">
+ <iterate list="issuances" entry="issuance">
<calculate field-name="totalIssuance">
<calcop operator="add">
<calcop field-name="issuance.quantity" operator="get"/>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Tue Dec 30 03:28:24 2008
@@ -23,7 +23,7 @@
<simple-method method-name="addRoutingTaskAssoc"
short-description="If copyTask field = Y create a copy of the routingTask, in all the case add a RoutingTaskAssociation">
<if-compare field="parameters.copyTask" operator="equals" value="Y">
- <make-value value-name="lookupPKMap" entity-name="WorkEffort"/>
+ <make-value value-field="lookupPKMap" entity-name="WorkEffort"/>
<set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/>
<find-by-primary-key entity-name="WorkEffort" map-name="lookupPKMap" value-name="lookedUpValue"/>
<call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml Tue Dec 30 03:28:24 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createCalendar" short-description="Create Calendar">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendar"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="newEntity"/>
<if-not-empty field="newEntity.calendarId">
@@ -32,7 +32,7 @@
</add-error>
<check-errors/>
<else>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="newEntity"/>
<if-empty field="newEntity.calendarWeekId">
@@ -41,7 +41,7 @@
</add-error>
<check-errors/>
<else>
- <make-value value-name="newEntity" entity-name="TechDataCalendar"/>
+ <make-value value-field="newEntity" entity-name="TechDataCalendar"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -54,7 +54,7 @@
<simple-method method-name="updateCalendar" short-description="Update Calendar">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendar"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -64,7 +64,7 @@
<simple-method method-name="removeCalendar" short-description="Remove Calendar">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendar"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcDay" list-name="relatedResultList" />
<first-from-list entry="relatedResult" list="relatedResultList"/>
@@ -91,7 +91,7 @@
<simple-method method-name="createCalendarWeek" short-description="Create Calendar Week">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="newEntity"/>
<if-not-empty field="newEntity.calendarWeekId">
@@ -100,7 +100,7 @@
</add-error>
<check-errors/>
<else>
- <make-value value-name="newEntity" entity-name="TechDataCalendarWeek"/>
+ <make-value value-field="newEntity" entity-name="TechDataCalendarWeek"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -111,7 +111,7 @@
<simple-method method-name="updateCalendarWeek" short-description="Update CalendarWeek">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -121,7 +121,7 @@
<simple-method method-name="removeCalendarWeek" short-description="Remove CalendarWeek">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<get-related value-name="lookupPKMap" relation-name="TechDataCalendar" list-name="relatedResultList" />
<first-from-list entry="relatedResult" list="relatedResultList"/>
@@ -148,7 +148,7 @@
<simple-method method-name="createCalendarExceptionDay" short-description="Create Calendar Exception Day">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="newEntity"/>
<if-not-empty field="newEntity.calendarId">
@@ -157,7 +157,7 @@
</add-error>
<check-errors/>
<else>
- <make-value value-name="newEntity" entity-name="TechDataCalendarExcDay"/>
+ <make-value value-field="newEntity" entity-name="TechDataCalendarExcDay"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -168,7 +168,7 @@
<simple-method method-name="updateCalendarExceptionDay" short-description="Update CalendarExceptionDay">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -178,7 +178,7 @@
<simple-method method-name="removeCalendarExceptionDay" short-description="Remove CalendarExceptionDay">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="lookedUpValue"/>
<if-not-empty field="lookedUpValue.calendarId">
@@ -189,7 +189,7 @@
<simple-method method-name="createCalendarExceptionWeek" short-description="Create Calendar Exception Week">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="newEntity"/>
<if-not-empty field="newEntity.calendarId">
@@ -198,7 +198,7 @@
</add-error>
<check-errors/>
<else>
- <make-value value-name="newEntity" entity-name="TechDataCalendarExcWeek"/>
+ <make-value value-field="newEntity" entity-name="TechDataCalendarExcWeek"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -209,7 +209,7 @@
<simple-method method-name="updateCalendarExceptionWeek" short-description="Update Calendar Exception Week">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -219,7 +219,7 @@
<simple-method method-name="removeCalendarExceptionWeek" short-description="Remove CalendarExceptionWeek">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
+ <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="lookedUpValue"/>
<if-not-empty field="lookedUpValue.calendarId">
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=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Tue Dec 30 03:28:24 2008
@@ -25,7 +25,7 @@
<check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaign" value-name="newEntity"/>
+ <make-value entity-name="MarketingCampaign" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- MarketingCampaign uses a sequenced id, so get the next one now and set it... -->
@@ -39,7 +39,7 @@
<check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateMarketingCampaign you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaign" value-name="lookupPKMap"/>
+ <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="MarketingCampaign" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -50,7 +50,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaign" value-name="lookupPKMap"/>
+ <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="MarketingCampaign" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -61,7 +61,7 @@
<check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run addPriceRuleToMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaignPrice" value-name="newEntity"/>
+ <make-value entity-name="MarketingCampaignPrice" value-field="newEntity"/>
<!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map-name="parameters" value-name="newEntity"/> -->
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -71,7 +71,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run removePriceRuleFromMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaignPrice" value-name="lookupPKMap"/>
+ <make-value entity-name="MarketingCampaignPrice" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="MarketingCampaignPrice" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -82,7 +82,7 @@
<check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run addPromoToMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaignPromo" value-name="newEntity"/>
+ <make-value entity-name="MarketingCampaignPromo" value-field="newEntity"/>
<!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map-name="parameters" value-name="newEntity"/> -->
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -92,7 +92,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run removePromoFromMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaignPromo" value-name="lookupPKMap"/>
+ <make-value entity-name="MarketingCampaignPromo" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="MarketingCampaignPromo" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -103,7 +103,7 @@
<check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run addRoleToMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaignRole" value-name="newEntity"/>
+ <make-value entity-name="MarketingCampaignRole" value-field="newEntity"/>
<!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map-name="parameters" value-name="newEntity"/> -->
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -113,7 +113,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run removeRoleFromMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="MarketingCampaignRole" value-name="lookupPKMap"/>
+ <make-value entity-name="MarketingCampaignRole" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="MarketingCampaignRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -136,7 +136,7 @@
<check-errors/>
- <make-value entity-name="MarketingCampaignRole" value-name="newEntity"/>
+ <make-value entity-name="MarketingCampaignRole" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -25,7 +25,7 @@
<check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createContactList you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ContactList" value-name="newEntity"/>
+ <make-value entity-name="ContactList" value-field="newEntity"/>
<if-empty field="parameters.contactListId">
<sequenced-id-to-env sequence-name="ContactList" env-name="newEntity.contactListId"/>
<else>
@@ -104,7 +104,7 @@
<check-errors/>
- <make-value entity-name="ContactListParty" value-name="newEntity"/>
+ <make-value entity-name="ContactListParty" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
@@ -145,7 +145,7 @@
<simple-method method-name="updatePartyEmailContactListParty" short-description="Update ContactList Party Contact Mech">
<set field="lookupMap.preferredContactMechId" from-field="parameters.oldContactMechId"/>
<find-by-and entity-name="ContactListParty" map-name="lookupMap" list-name="ContactListParties"/>
- <iterate entry="contactlistparty" list-name="ContactListParties">
+ <iterate entry="contactlistparty" list="ContactListParties">
<set field="contactlistparty.preferredContactMechId" from-field="parameters.contactMechId"/>
<log level="info" message="Replacing preferredContactMechId: ${parameters.oldContactMechId} of the ContactList: ${contactlistparty.contactListId} with new preferredContactMechId: ${parameters.contactMechId}"/>
<store-value value-name="contactlistparty"/>
@@ -172,7 +172,7 @@
</if>
<check-errors/>
- <make-value entity-name="ContactListPartyStatus" value-name="newEntity"/>
+ <make-value entity-name="ContactListPartyStatus" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -28,7 +28,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="SegmentGroup"/>
+ <make-value value-field="newEntity" entity-name="SegmentGroup"/>
<sequenced-id-to-env sequence-name="SegmentGroup" env-name="newEntity.segmentGroupId"/>
<field-to-result field-name="newEntity.segmentGroupId" result-name="segmentGroupId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -60,7 +60,7 @@
<simple-method method-name="createSegmentGroupClassification" short-description="create a SegmentGroupClassification">
<check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupCreateSegmentGroupClassificationPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="SegmentGroupClassification" value-name="newEntity"/>
+ <make-value entity-name="SegmentGroupClassification" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -83,7 +83,7 @@
<simple-method method-name="createSegmentGroupGeo" short-description="create a SegmentGroupGeo">
<check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupCreateSegmentGroupGeoPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="SegmentGroupGeo" value-name="newEntity"/>
+ <make-value entity-name="SegmentGroupGeo" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -106,7 +106,7 @@
<simple-method method-name="createSegmentGroupRole" short-description="create a SegmentGroupRole">
<check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupCreateSegmentGroupRolePermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="SegmentGroupRole" value-name="newEntity"/>
+ <make-value entity-name="SegmentGroupRole" value-field="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Tue Dec 30 03:28:24 2008
@@ -27,7 +27,7 @@
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value value-name="newEntity" entity-name="TrackingCode"/>
+ <make-value value-field="newEntity" entity-name="TrackingCode"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -45,7 +45,7 @@
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value entity-name="TrackingCode" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCode" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCode" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -60,7 +60,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteTrackingCode you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="TrackingCode" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCode" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCode" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -72,7 +72,7 @@
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value value-name="newEntity" entity-name="TrackingCodeType"/>
+ <make-value value-field="newEntity" entity-name="TrackingCodeType"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -87,7 +87,7 @@
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value entity-name="TrackingCodeType" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCodeType" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -98,7 +98,7 @@
<check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteTrackingCodeType you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="TrackingCodeType" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCodeType" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -106,7 +106,7 @@
<simple-method method-name="createTrackingCodeOrder" short-description="Create an TrackingCodeOrder">
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value value-name="newEntity" entity-name="TrackingCodeOrder"/>
+ <make-value value-field="newEntity" entity-name="TrackingCodeOrder"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -118,7 +118,7 @@
<simple-method method-name="updateTrackingCodeOrder" short-description="Update an TrackingCodeOrder">
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value entity-name="TrackingCodeOrder" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCodeOrder" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCodeOrder" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -132,7 +132,7 @@
<!-- add service for tracking code return -->
<simple-method method-name="createTrackingCodeOrderReturn" short-description="Create an TrackingCodeOrderReturn">
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value value-name="newEntity" entity-name="TrackingCodeOrderReturn"/>
+ <make-value value-field="newEntity" entity-name="TrackingCodeOrderReturn"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -148,7 +148,7 @@
<find-by-primary-key entity-name="ReturnHeader" value-name="returnHeader" map-name="returnHeaderFindContext"/>
<get-related list-name="returnItems" relation-name="ReturnItem" value-name="returnHeader"/>
<log level="info" message="Return items lists are : ${returnItems}"/>
- <iterate list-name="returnItems" entry-name="returnItem">
+ <iterate list="returnItems" entry="returnItem">
<get-related-one relation-name="OrderHeader" value-name="returnItem" to-value-name="orderHeader"/>
<set field="trackingCodeOrderFindContext.orderId" from-field="orderHeader.orderId"/>
<!-- set field="trackingCodeOrderFindContext.trackingCodeTypeId" value="PARTNER_MGD"/-->
@@ -172,7 +172,7 @@
<simple-method method-name="updateTrackingCodeOrderReturn" short-description="update an TrackingCodeOrderReturn">
<now-timestamp-to-env env-name="nowStamp"/>
- <make-value entity-name="TrackingCodeOrderReturn" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCodeOrderReturn" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -183,7 +183,7 @@
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTrackingCodeOrderReturn" short-description="delete an TrackingCodeOrderReturn">
- <make-value entity-name="TrackingCodeOrderReturn" value-name="lookupPKMap"/>
+ <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCodeOrderReturn" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 03:28:24 2008
@@ -99,14 +99,14 @@
<log level="verbose" message=" ${partyGroupPartyId}"></log>
<if-not-empty field="parameters.leadSource">
- <make-value entity-name="DataSource" value-name="dataSource"/>
+ <make-value entity-name="DataSource" value-field="dataSource"/>
<sequenced-id-to-env sequence-name="DataSource" env-name="dataSourceId"/>
<set field="dataSource.dataSourceId" from-field="dataSourceId"/>
<set field="dataSource.dataSourceTypeId" value="LEAD_SOURCE"/>
<set field="dataSource.description" from-field="parameters.leadSource"/>
<create-value value-name="dataSource"/>
- <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
+ <make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
<set field="partyDataSource.partyId" from-field="partyId"/>
<set field="partyDataSource.dataSourceId" from-field="dataSourceId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createOpportunity" short-description="Create Opportunity for SFA">
- <make-value entity-name="SalesOpportunity" value-name="newEntity"/>
+ <make-value entity-name="SalesOpportunity" value-field="newEntity"/>
<if-empty field="parameters.salesOpportunityId">
<sequenced-id-to-env sequence-name="SalesOpportunity" env-name="parameters.salesOpportunityId"/>
</if-empty>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml Tue Dec 30 03:28:24 2008
@@ -23,8 +23,8 @@
<simple-method method-name="migrateOrderItemAssociation" short-description="Migrate data from OldOrderItemAssociation to OrderItemAssoc">
<entity-condition entity-name="OldOrderItemAssociation" list-name="oldOrderItemAssociations"/>
- <iterate list-name="oldOrderItemAssociations" entry-name="oldOrderItemAssociation">
- <make-value entity-name="OrderItemAssoc" value-name="orderItemAssoc"/>
+ <iterate list="oldOrderItemAssociations" entry="oldOrderItemAssociation">
+ <make-value entity-name="OrderItemAssoc" value-field="orderItemAssoc"/>
<set field="orderItemAssoc.orderId" from-field="oldOrderItemAssociation.salesOrderId"/>
<set field="orderItemAssoc.orderItemSeqId" from-field="oldOrderItemAssociation.soItemSeqId"/>
<set field="orderItemAssoc.toOrderId" from-field="oldOrderItemAssociation.purchaseOrderId"/>
@@ -39,8 +39,8 @@
<simple-method method-name="migrateCustRequestRole" short-description="Migrate data from OldCustRequestRole to CustRequestParty">
<entity-condition entity-name="OldCustRequestRole" list-name="oldCustRequestRoles"/>
<now-timestamp-to-env env-name="fromDate"/>
- <iterate list-name="oldCustRequestRoles" entry-name="oldCustRequestRole">
- <make-value entity-name="CustRequestParty" value-name="custRequestParty"/>
+ <iterate list="oldCustRequestRoles" entry="oldCustRequestRole">
+ <make-value entity-name="CustRequestParty" value-field="custRequestParty"/>
<set field="custRequestParty.custRequestId" from-field="oldCustRequestRole.custRequestId"/>
<set field="custRequestParty.partyId" from-field="oldCustRequestRole.partyId"/>
<set field="custRequestParty.roleTypeId" from-field="oldCustRequestRole.roleTypeId"/>
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -25,7 +25,7 @@
<fail-property resource="OrderUiLabels" property="OrderCreateCommunicationEventProductPermissionError"/>
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="CommunicationEventOrder"/>
+ <make-value value-field="newEntity" entity-name="CommunicationEventOrder"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
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=730098&r1=730097&r2=730098&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 03:28:24 2008
@@ -28,7 +28,7 @@
<simple-method method-name="createSalesForecast" short-description="Creates a sales forecast and stores a copy in sales forecast history.">
<!-- make the value and set the fields from the parameters -->
- <make-value value-name="salesForecast" entity-name="SalesForecast"/>
+ <make-value value-field="salesForecast" entity-name="SalesForecast"/>
<sequenced-id-to-env sequence-name="SalesForecast" env-name="salesForecastId"/>
<set field="salesForecast.salesForecastId" from-field="salesForecastId"/>
<set-nonpk-fields map-name="parameters" value-name="salesForecast"/>
@@ -65,7 +65,7 @@
<simple-method method-name="saveSalesForecastHistory" short-description="Given a salesForecast map, saves the data in the history.">
<!-- make the value and set the fields from the salesForecast map -->
- <make-value value-name="salesForecastHistory" entity-name="SalesForecastHistory"/>
+ <make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/>
<sequenced-id-to-env sequence-name="SalesForecastHistory" env-name="salesForecastHistoryId"/>
<set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/>
<set-nonpk-fields value-name="salesForecastHistory" map-name="salesForecast"/>
@@ -84,7 +84,7 @@
<!-- Sales Forecast Detail -->
<simple-method method-name="createSalesForecastDetail" short-description="Creates a sales forecast detail">
- <make-value entity-name="SalesForecastDetail" value-name="newEntity"/>
+ <make-value entity-name="SalesForecastDetail" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="SalesForecastDetail" env-name="newEntity.salesForecastDetailId"/>
<field-to-result field-name="newEntity.salesForecastDetailId" result-name="salesForecastDetailId"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 03:28:24 2008
@@ -27,7 +27,7 @@
<call-simple-method method-name="checkSupplierRelatedPermission"/>
<check-errors/>
- <make-value entity-name="OrderDeliverySchedule" value-name="schedule"/>
+ <make-value entity-name="OrderDeliverySchedule" value-field="schedule"/>
<set-pk-fields map-name="parameters" value-name="schedule"/>
<if-empty field="schedule.orderItemSeqId">
<set value="_NA_" field="schedule.orderItemSeqId"/>
@@ -52,7 +52,7 @@
<check-errors/>
<!-- Lookup the existing schedule to modify -->
- <make-value entity-name="OrderDeliverySchedule" value-name="lookupPkMap"/>
+ <make-value entity-name="OrderDeliverySchedule" value-field="lookupPkMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPkMap"/>
<find-by-primary-key entity-name="OrderDeliverySchedule" map-name="lookupPkMap" value-name="schedule"/>
@@ -79,7 +79,7 @@
<set field="parameters.orderItemSeqId" value="_NA_"/>
</if-empty>
- <make-value entity-name="OrderDeliverySchedule" value-name="orderDeliverySchedule"/>
+ <make-value entity-name="OrderDeliverySchedule" value-field="orderDeliverySchedule"/>
<set-pk-fields value-name="orderDeliverySchedule" map-name="parameters"/>
<find-by-primary-key map-name="orderDeliverySchedule" value-name="orderDeliverySchedule"/>
@@ -93,7 +93,7 @@
<!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo -->
<set value="SHIPMENT_CLERK" field="shipmentClerkFindMap.roleTypeId"/>
<find-by-and entity-name="PartyRole" map-name="shipmentClerkFindMap" list-name="shipmentClerkRoles"/>
- <iterate entry="shipmentClerkRole" list-name="shipmentClerkRoles">
+ <iterate entry="shipmentClerkRole" list="shipmentClerkRoles">
<set field="sendToPartyIdMap.${shipmentClerkRole.partyId}" from-field="shipmentClerkRole.partyId"/>
</iterate>
@@ -102,7 +102,7 @@
<set field="sendToPartyPcmFindMap.partyId" from-field="sendToPartyId"/>
<set field="sendToPartyPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
<find-by-and entity-name="PartyAndContactMech" map-name="sendToPartyPcmFindMap" list-name="sendToPartyPartyAndContactMechs"/>
- <iterate entry="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs">
+ <iterate entry="sendToPartyPartyAndContactMech" list="sendToPartyPartyAndContactMechs">
<string-append field-name="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/>
</iterate>
</iterate-map>