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 [7/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/product/script/org/ofbiz/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Tue Dec 30 03:28:24 2008
@@ -26,7 +26,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromo"/>
+ <make-value value-field="newEntity" entity-name="ProductPromo"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="ProductPromo" env-name="newEntity.productPromoId"/>
<field-to-result field-name="productPromoId" map-name="newEntity"/>
@@ -80,7 +80,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoAction"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoAction"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
@@ -93,7 +93,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoAction" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -104,7 +104,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoAction" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -116,7 +116,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoCategory"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoCategory"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -127,7 +127,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCategory" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -138,7 +138,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCategory" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -150,7 +150,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoCode"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoCode"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.productPromoCodeId">
@@ -175,7 +175,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCode" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -191,7 +191,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCode" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -203,7 +203,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoCodeEmail"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoCodeEmail"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -214,7 +214,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCodeEmail" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCodeEmail" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -226,7 +226,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoCodeParty"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoCodeParty"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -237,7 +237,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCodeParty" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCodeParty" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -249,7 +249,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoCond"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoCond"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
@@ -262,7 +262,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCond" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoCond" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -273,7 +273,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoCond" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoCond" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -285,7 +285,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoProduct"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoProduct"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -296,7 +296,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoProduct" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -307,7 +307,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoProduct" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -319,7 +319,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductPromoRule"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoRule"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
@@ -332,7 +332,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoRule" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoRule" map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -343,7 +343,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductPromoRule" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoRule" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -355,7 +355,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStorePromoAppl"/>
+ <make-value value-field="newEntity" entity-name="ProductStorePromoAppl"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -371,7 +371,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductStorePromoAppl" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -382,7 +382,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductStorePromoAppl" value-name="lookupPKMap"/>
+ <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Dec 30 03:28:24 2008
@@ -23,8 +23,8 @@
<simple-method method-name="createFacilityContactMech" short-description="Create a FacilityContactMech">
<check-permission permission="FACILITY" action="_CREATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <make-value entity-name="FacilityContactMech" value-name="newValue"/>
- <make-value entity-name="FacilityContactMech" value-name="newFacilityContactMech"/>
+ <make-value entity-name="FacilityContactMech" value-field="newValue"/>
+ <make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<log level="info" message="contactMechId is ${parameters.contactMechId}"/>
<if-empty field="parameters.contactMechId">
@@ -53,11 +53,11 @@
<check-permission permission="FACILITY" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <make-value entity-name="FacilityContactMech" value-name="newFacilityContactMech"/>
+ <make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<!-- Find old value -->
- <make-value entity-name="FacilityContactMech" value-name="facilityContactMechMap"/>
+ <make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
<set-pk-fields value-name="facilityContactMechMap" map-name="parameters"/>
<find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
<filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
@@ -95,7 +95,7 @@
<if-compare-field to-field="newFacilityContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
<get-related value-name="facilityContactMech" relation-name="FacilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
- <iterate entry="facilityContactMechPurposeOld" list-name="facilityContactMechPurposes">
+ <iterate entry="facilityContactMechPurposeOld" list="facilityContactMechPurposes">
<clone-value value-name="facilityContactMechPurposeOld" new-value-name="facilityContactMechPurpose"/>
<now-timestamp-to-env env-name="facilityContactMechPurposeOld.thruDate"/>
@@ -120,11 +120,11 @@
</simple-method>
<simple-method method-name="deleteFacilityContactMech" short-description="Delete a FacilityContactMech">
- <make-value entity-name="FacilityContactMech" value-name="newFacilityContactMech"/>
+ <make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<check-permission permission="FACILITY" action="_DELETE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <make-value entity-name="FacilityContactMech" value-name="facilityContactMechMap"/>
+ <make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
<set-pk-fields value-name="facilityContactMechMap" map-name="parameters"/>
<find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
<filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
@@ -166,7 +166,7 @@
</simple-method>
<simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility">
- <make-value entity-name="FacilityContactMech" value-name="newFacilityContactMech"/>
+ <make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<check-permission permission="FACILITY" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
@@ -213,7 +213,7 @@
</simple-method>
<simple-method method-name="updateFacilityTelecomNumber" short-description="Update a TelecomNumber for facility">
- <make-value entity-name="FacilityContactMech" value-name="newFacilityContactMech"/>
+ <make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<check-permission permission="FACILITY" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
@@ -282,7 +282,7 @@
<check-permission permission="FACILITY" action="_CREATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <make-value value-name="lookUpMap" entity-name="FacilityContactMechPurpose"/>
+ <make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/>
<set field="lookUpMap.facilityId" from-field="parameters.facilityId" />
<set field="lookUpMap.contactMechId" from-field="parameters.contactMechId" />
<set field="lookUpMap.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
@@ -296,7 +296,7 @@
</if-not-empty>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <make-value value-name="newEntity" entity-name="FacilityContactMechPurpose"/>
+ <make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId" />
<set field="newEntity.contactMechId" from-field="parameters.contactMechId" />
<set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
@@ -311,7 +311,7 @@
<check-permission permission="FACILITY" action="_DELETE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <make-value value-name="lookUpMap" entity-name="FacilityContactMechPurpose"/>
+ <make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/>
<set-pk-fields map-name="parameters" value-name="lookUpMap"/>
<find-by-primary-key value-name="purposeEntity" entity-name="FacilityContactMechPurpose" map-name="lookUpMap"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- Facility Services -->
<simple-method method-name="createFacility" short-description="Create a Facility">
- <make-value value-name="newEntity" entity-name="Facility"/>
+ <make-value value-field="newEntity" entity-name="Facility"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="Facility" env-name="facilityId"/>
@@ -46,7 +46,7 @@
<!-- Facility ContactMech Services -->
<simple-method method-name="addContactMechToFacility" short-description="Add ContactMech To Facility">
- <make-value value-name="newEntity" entity-name="FacilityContactMech"/>
+ <make-value value-field="newEntity" entity-name="FacilityContactMech"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -59,7 +59,7 @@
<!-- Facility Location Services -->
<simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
- <make-value value-name="newEntity" entity-name="FacilityLocation"/>
+ <make-value value-field="newEntity" entity-name="FacilityLocation"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId" />
@@ -105,7 +105,7 @@
<!-- Facility Group Services -->
<simple-method method-name="createFacilityGroup" short-description="Create an Facility Group">
- <make-value value-name="newEntity" entity-name="FacilityGroup"/>
+ <make-value value-field="newEntity" entity-name="FacilityGroup"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="FacilityGroup" env-name="facilityGroupId"/>
@@ -129,7 +129,7 @@
<!-- Facility Member Services -->
<simple-method method-name="addFacilityToGroup" short-description="Add Facility to FacilityGroup">
- <make-value value-name="newEntity" entity-name="FacilityGroupMember"/>
+ <make-value value-field="newEntity" entity-name="FacilityGroupMember"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -141,14 +141,14 @@
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateFacilityToGroup" short-description="Update Facility to FacilityGroup Application">
- <make-value value-name="lookupPKMap" entity-name="FacilityGroupMember"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupMember" 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="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup">
- <make-value value-name="lookupPKMap" entity-name="FacilityGroupMember"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupMember" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -156,7 +156,7 @@
<!-- Facility Group Rollup Services -->
<simple-method method-name="addFacilityGroupToGroup" short-description="Add FacilityGroup to FacilityGroup">
- <make-value value-name="newEntity" entity-name="FacilityGroupRollup"/>
+ <make-value value-field="newEntity" entity-name="FacilityGroupRollup"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -168,14 +168,14 @@
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateFacilityGroupToGroup" short-description="Update FacilityGroup to FacilityGroup Rollup">
- <make-value value-name="lookupPKMap" entity-name="FacilityGroupRollup"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRollup" 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="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup">
- <make-value value-name="lookupPKMap" entity-name="FacilityGroupRollup"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRollup" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -187,11 +187,11 @@
<set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
<find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="partyRole"/>
<if-empty field="partyRole">
- <make-value value-name="partyRole" entity-name="PartyRole"/>
+ <make-value value-field="partyRole" entity-name="PartyRole"/>
<set-pk-fields map-name="lookupPKMap" value-name="partyRole"/>
<create-value value-name="partyRole"/>
</if-empty>
- <make-value value-name="newEntity" entity-name="FacilityParty"/>
+ <make-value value-field="newEntity" entity-name="FacilityParty"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -201,7 +201,7 @@
</simple-method>
<simple-method method-name="addPartyToFacilityGroup" short-description="Add Party to FacilityGroup">
- <make-value value-name="newEntity" entity-name="FacilityGroupRole"/>
+ <make-value value-field="newEntity" entity-name="FacilityGroupRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -215,7 +215,7 @@
</simple-method>
<simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
- <make-value value-name="lookupPKMap" entity-name="FacilityGroupRole"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 03:28:24 2008
@@ -34,7 +34,7 @@
<check-errors/>
</if-compare>
- <make-value value-name="newEntity" entity-name="ProductStore"/>
+ <make-value value-field="newEntity" entity-name="ProductStore"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="ProductStore" env-name="productStoreId" />
@@ -47,7 +47,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
- <make-value value-name="storeFacility" entity-name="ProductStoreFacility"/>
+ <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
<set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
@@ -83,13 +83,13 @@
<set from-field="store.productStoreId" field="lookupPFMap.productStoreId"/>
<find-by-and entity-name="ProductStoreFacility" map-name="lookupPFMap" list-name="storeFacilities"/>
<filter-list-by-date list-name="storeFacilities"/>
- <iterate list-name="storeFacilities" entry-name="facility">
+ <iterate list="storeFacilities" entry="facility">
<set from-field="nowTimestamp" field="facility.thruDate"/>
<store-value value-name="facility"/>
</iterate>
</if-compare>
<!-- create the new entry -->
- <make-value value-name="storeFacility" entity-name="ProductStoreFacility"/>
+ <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
<set from-field="store.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="store.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
@@ -102,7 +102,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreCatalog you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStoreCatalog"/>
+ <make-value value-field="newEntity" entity-name="ProductStoreCatalog"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -117,7 +117,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductStoreCatalog you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreCatalog"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -127,7 +127,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreCatalog you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreCatalog"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -138,7 +138,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStorePaymentSetting you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStorePaymentSetting"/>
+ <make-value value-field="newEntity" entity-name="ProductStorePaymentSetting"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -147,7 +147,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductStorePaymentSetting you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStorePaymentSetting" map-name="lookupPKMap" value-name="setting"/>
<set-nonpk-fields map-name="parameters" value-name="setting"/>
@@ -157,7 +157,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStorePaymentSetting you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStorePaymentSetting" map-name="lookupPKMap" value-name="setting"/>
<set-nonpk-fields map-name="parameters" value-name="setting"/>
@@ -171,7 +171,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStoreEmailSetting"/>
+ <make-value value-field="newEntity" entity-name="ProductStoreEmailSetting"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -183,7 +183,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupKeyValue" entity-name="ProductStoreEmailSetting"/>
+ <make-value value-field="lookupKeyValue" entity-name="ProductStoreEmailSetting"/>
<set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductStoreEmailSetting" map-name="lookupKeyValue" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -195,7 +195,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreEmailSetting"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreEmailSetting"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStoreEmailSetting" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -206,7 +206,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreVendorPayment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductStoreVendorPayment" value-name="newEntity"/>
+ <make-value entity-name="ProductStoreVendorPayment" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -214,7 +214,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreVendorPayment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductStoreVendorPayment" value-name="lookedUpValue"/>
+ <make-value entity-name="ProductStoreVendorPayment" value-field="lookedUpValue"/>
<set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -226,7 +226,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStoreShipmentMeth"/>
+ <make-value value-field="newEntity" entity-name="ProductStoreShipmentMeth"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="ProductStoreShipmentMeth" env-name="newEntity.productStoreShipMethId"/>
@@ -238,7 +238,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupKeyValue" entity-name="ProductStoreShipmentMeth"/>
+ <make-value value-field="lookupKeyValue" entity-name="ProductStoreShipmentMeth"/>
<set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductStoreShipmentMeth" map-name="lookupKeyValue" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -250,7 +250,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreShipmentMeth"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreShipmentMeth"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStoreShipmentMeth" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -261,7 +261,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreRole you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStoreRole"/>
+ <make-value value-field="newEntity" entity-name="ProductStoreRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -276,7 +276,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductStoreRole you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreRole"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -293,7 +293,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreKeywordOvrd you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStoreKeywordOvrd"/>
+ <make-value value-field="newEntity" entity-name="ProductStoreKeywordOvrd"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -311,7 +311,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductStoreKeywordOvrd you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -321,7 +321,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreKeywordOvrd you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -332,7 +332,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreSurveyAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ProductStoreSurveyAppl"/>
+ <make-value value-field="newEntity" entity-name="ProductStoreSurveyAppl"/>
<sequenced-id-to-env sequence-name="ProductStoreSurveyAppl" env-name="productStoreSurveyId"/>
<set from-field="productStoreSurveyId" field="newEntity.productStoreSurveyId"/>
<field-to-result field-name="productStoreSurveyId" result-name="productStoreSurveyId"/>
@@ -349,7 +349,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductStoreSurveyAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="ProductStoreSurveyAppl"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductStoreSurveyAppl"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -366,7 +366,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreFinActSetting you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="finAcctSetting" entity-name="ProductStoreFinActSetting"/>
+ <make-value value-field="finAcctSetting" entity-name="ProductStoreFinActSetting"/>
<set-pk-fields value-name="finAcctSetting" map-name="parameters"/>
<set-nonpk-fields value-name="finAcctSetting" map-name="parameters"/>
<create-value value-name="finAcctSetting"/>
@@ -375,7 +375,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductStoreFinActSetting you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPk" entity-name="ProductStoreFinActSetting"/>
+ <make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/>
<set-pk-fields value-name="lookupPk" map-name="parameters"/>
<find-by-primary-key map-name="lookupPk" value-name="finAccountSetting"/>
@@ -386,7 +386,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductStoreFinActSetting you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPk" entity-name="ProductStoreFinActSetting"/>
+ <make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/>
<set-pk-fields value-name="lookupPk" map-name="parameters"/>
<find-by-primary-key map-name="lookupPk" value-name="finAccountSetting"/>
<remove-value value-name="finAccountSetting"/>
@@ -437,7 +437,7 @@
<field-map from-field="productStore.productStoreId" field-name="productStoreId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
- <iterate list-name="productStoreFacilities" entry-name="productStoreFacility">
+ <iterate list="productStoreFacilities" entry="productStoreFacility">
<!-- in this case quantityNotReserved will always be empty until it finds a facility it can totally reserve from, then it will be 0.0 and we are done -->
<if-empty field="storeFound">
<!-- TODO: must entire quantity be available in one location? -->
@@ -478,7 +478,7 @@
<field-map from-field="facilityId" field-name="facilityId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
- <iterate list-name="productStoreFacilities" entry-name="productStoreFacility">
+ <iterate list="productStoreFacilities" entry="productStoreFacility">
<!-- Search Product Store Facilities to insure the facility passed in is associated to the Product Store passed in -->
<set field="facilityFound" from-field="productStoreFacility"/>
<log level="info" message="ProductStoreService:Facility Found : [${facilityFound}]"/>
@@ -615,7 +615,7 @@
</entity-and>
<set value="N" field="available"/>
- <iterate list-name="productStoreFacilities" entry-name="productStoreFacility">
+ <iterate list="productStoreFacilities" entry="productStoreFacility">
<if-compare value="N" field="available" operator="equals">
<!-- TODO: must entire quantity be available in one location? -->
<!-- Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order. -->
@@ -701,14 +701,14 @@
<simple-method method-name="createProductStoreVendorShipment" short-description="Create a ProductStoreVendorShipment">
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStoreVendorShipment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductStoreVendorShipment" value-name="newEntity"/>
+ <make-value entity-name="ProductStoreVendorShipment" value-field="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="deleteProductStoreVendorShipment" short-description="Remove the ProductStoreVendorShipment">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreVendorShipment you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value entity-name="ProductStoreVendorShipment" value-name="lookedUpValue"/>
+ <make-value entity-name="ProductStoreVendorShipment" value-field="lookedUpValue"/>
<set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Tue Dec 30 03:28:24 2008
@@ -21,7 +21,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createSubscription" short-description="Create a Subscription">
- <make-value entity-name="Subscription" value-name="newEntity"/>
+ <make-value entity-name="Subscription" value-field="newEntity"/>
<if-empty field="parameters.subscriptionId">
<sequenced-id-to-env sequence-name="Subscription" env-name="newEntity.subscriptionId"/> <!-- get the next sequenced ID -->
<else>
@@ -84,7 +84,7 @@
</simple-method>
<simple-method method-name="createSubscriptionResource" short-description="Create a SubscriptionResource">
- <make-value entity-name="SubscriptionResource" value-name="newEntity"/>
+ <make-value entity-name="SubscriptionResource" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="SubscriptionResource" env-name="newEntity.subscriptionResourceId"/>
<field-to-result field-name="newEntity.subscriptionResourceId" result-name="subscriptionResourceId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -97,7 +97,7 @@
</simple-method>
<simple-method method-name="createProductSubscriptionResource" short-description="Create a ProductSubscriptionResource">
- <make-value entity-name="ProductSubscriptionResource" value-name="newEntity"/>
+ <make-value entity-name="ProductSubscriptionResource" value-field="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>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -116,7 +116,7 @@
<field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/>
<entity-one entity-name="SubscriptionAttribute" value-name="lookedUpValue"/>
<if-empty field="lookedUpValue">
- <make-value entity-name="SubscriptionAttribute" value-name="newEntity"/>
+ <make-value entity-name="SubscriptionAttribute" 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"/>
@@ -128,7 +128,7 @@
</simple-method>
<simple-method method-name="createSubscriptionCommEvent" short-description="Create a Subscription Communication Event">
- <make-value value-name="newEntity" entity-name="SubscriptionCommEvent"/>
+ <make-value value-field="newEntity" entity-name="SubscriptionCommEvent"/>
<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/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml Tue Dec 30 03:28:24 2008
@@ -24,7 +24,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createSupplierProduct you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="SupplierProduct"/>
+ <make-value value-field="newEntity" entity-name="SupplierProduct"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -35,7 +35,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateSupplierProduct you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="SupplierProduct"/>
+ <make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="SupplierProduct" map-name="lookupPKMap" value-name="sprod"/>
@@ -47,7 +47,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeSupplierProduct you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="SupplierProduct"/>
+ <make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="SupplierProduct" map-name="lookupPKMap" value-name="sprod"/>
@@ -59,7 +59,7 @@
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createSupplierProductFeature you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="SupplierProductFeature"/>
+ <make-value value-field="newEntity" entity-name="SupplierProductFeature"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 03:28:24 2008
@@ -29,7 +29,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ItemIssuance"/>
+ <make-value value-field="newEntity" entity-name="ItemIssuance"/>
<sequenced-id-to-env sequence-name="ItemIssuance" env-name="newEntity.itemIssuanceId"/>
<field-to-result field-name="itemIssuanceId" map-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -80,7 +80,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-name="newEntity" entity-name="ItemIssuanceRole"/>
+ <make-value value-field="newEntity" entity-name="ItemIssuanceRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -141,13 +141,13 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<!-- get orderItemShipGrpInvRes -->
- <make-value entity-name="OrderItemShipGrpInvRes" value-name="OrderItemShipGrpInvResLookupPk"/>
+ <make-value entity-name="OrderItemShipGrpInvRes" value-field="OrderItemShipGrpInvResLookupPk"/>
<set-pk-fields value-name="OrderItemShipGrpInvResLookupPk" map-name="parameters"/>
<find-by-primary-key map-name="OrderItemShipGrpInvResLookupPk" value-name="orderItemShipGrpInvRes"/>
<log level="info" message="order item ship grp inv res info: ${orderItemShipGrpInvRes}"/>
<!-- get orderHeader -->
- <make-value entity-name="OrderHeader" value-name="orderHeaderLookupPk"/>
+ <make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
<set-pk-fields value-name="orderHeaderLookupPk" map-name="parameters"/>
<find-by-primary-key map-name="orderHeaderLookupPk" value-name="orderHeader"/>
@@ -182,7 +182,7 @@
<!-- get shipment -->
<entity-one entity-name="Shipment" value-name="shipment"/>
<!-- get orderShipment -->
- <make-value entity-name="OrderShipment" value-name="orderShipmentLookupPk"/>
+ <make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-name="orderShipmentLookupPk" map-name="parameters"/>
<find-by-and entity-name="OrderShipment" map-name="orderShipmentLookupPk" list-name="orderShipments"/>
<first-from-list entry="orderShipment" list="orderShipments"/>
@@ -198,7 +198,7 @@
<!-- remove the orderShipment.quantity -->
<if-not-empty field="orderShipment">
<field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
- <make-value entity-name="ShipmentItem" value-name="shipmentItemLookupPk"/>
+ <make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
<set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
<set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
<find-by-primary-key map-name="shipmentItemLookupPk" value-name="shipmentItem"/>
@@ -220,7 +220,7 @@
</calculate>
<store-value value-name="orderShipment"/>
<field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
- <make-value entity-name="ShipmentItem" value-name="shipmentItemLookupPk"/>
+ <make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
<set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
<set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
<find-by-primary-key map-name="shipmentItemLookupPk" value-name="shipmentItem"/>
@@ -332,7 +332,7 @@
</simple-method>
<simple-method method-name="associateIssueRoles" short-description="Associate Roles for ItemIssuance - meant to be called in-line">
<!-- make sure the party is in the PACKER role -->
- <make-value entity-name="PartyRole" value-name="partyRole"/>
+ <make-value entity-name="PartyRole" value-field="partyRole"/>
<set field="partyRole.partyId" from-field="userLogin.partyId"/>
<set field="partyRole.roleTypeId" value="PACKER"/>
<find-by-primary-key entity-name="PartyRole" map-name="partyRole" value-name="checkPartyRole"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 03:28:24 2008
@@ -84,7 +84,7 @@
<set field="maxNumberOfOrders" type="Long" from-field="parameters.maxNumberOfOrders" set-if-empty="true"/>
<set field="numberSoFar" type="Long" value="0"/>
- <iterate entry="orderHeader" list-name="orderHeaderList">
+ <iterate entry="orderHeader" list="orderHeaderList">
<log level="info" message="Checking order #${orderHeader.orderId} to add to picklist"/>
<!-- get all ship groups, and iterate over them for each order -->
<entity-and entity-name="OrderItemShipGroup" list-name="orderItemShipGroupList">
@@ -92,7 +92,7 @@
<order-by field-name="shipGroupSeqId"/>
</entity-and>
- <iterate entry="orderItemShipGroup" list-name="orderItemShipGroupList">
+ <iterate entry="orderItemShipGroup" list="orderItemShipGroupList">
<!-- get the order items and the order item inventory res entries -->
<!-- if a shipmentMethodTypeId was not passed or is the same as the current, then process this order -->
@@ -128,7 +128,7 @@
<set value="N" field="needsStockMove"/>
<set value="Y" field="allPickStarted"/>
<set value="N" field="hasStockToPick"/>
- <iterate entry="orderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList">
+ <iterate entry="orderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
<get-related-one value-name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-name="orderItem"/>
<if-compare field="orderItem.statusId" value="ITEM_APPROVED" operator="not-equals">
<set value="N" field="pickThisOrder"/>
@@ -302,7 +302,7 @@
<order-by field-name="+sequenceNum"/>
</entity-condition>
- <iterate entry="shipmentMethodType" list-name="shipmentMethodTypeList">
+ <iterate entry="shipmentMethodType" list="shipmentMethodTypeList">
<if-not-empty field="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}">
<field-to-list field-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}" list-name="pickMoveByShipmentMethodInfoList"/>
</if-not-empty>
@@ -319,7 +319,7 @@
<!-- if maxNumberOfOrders is passed, get at most that many orders and go over them -->
<!-- moved above in findOrdersToPickMove
<calculate field-name="numberSoFar" type="Long"><number value="0"/></calculate>
- <iterate entry="pickMoveByShipmentMethodInfo" list-name="pickMoveByShipmentMethodInfoList">
+ <iterate entry="pickMoveByShipmentMethodInfo" list="pickMoveByShipmentMethodInfoList">
<if>
<condition>
<or>
@@ -338,15 +338,15 @@
</iterate>
-->
- <iterate entry="pickMoveByShipmentMethodInfo" list-name="pickMoveByShipmentMethodInfoList">
- <iterate entry="orderReadyToPickInfo" list-name="pickMoveByShipmentMethodInfo.orderReadyToPickInfoList">
- <iterate entry="orderItemAndShipGroupAssoc" list-name="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
+ <iterate entry="pickMoveByShipmentMethodInfo" list="pickMoveByShipmentMethodInfoList">
+ <iterate entry="orderReadyToPickInfo" list="pickMoveByShipmentMethodInfo.orderReadyToPickInfoList">
+ <iterate entry="orderItemAndShipGroupAssoc" list="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
<if-compare value="ITEM_APPROVED" operator="equals" field="orderItemAndShipGroupAssoc.statusId">
<calculate field-name="reservedQuantity" type="Double"><number value="0"/></calculate>
<set from-field="orderItemAndShipGroupAssoc.orderItemSeqId" field="itemFilterMap.orderItemSeqId"/>
<filter-list-by-and map-name="itemFilterMap" list-name="orderReadyToPickInfo.orderItemShipGrpInvResList" to-list-name="perItemResList"/>
- <iterate entry="orderItemShipGrpInvRes" list-name="perItemResList">
+ <iterate entry="orderItemShipGrpInvRes" list="perItemResList">
<set from-field="orderItemShipGrpInvRes.inventoryItemId" field="inventoryItemId"/>
<!-- update reserved quantity per inventoryItem, keep track of orderItems this came from -->
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/>
@@ -395,7 +395,7 @@
<!-- must include issued items as well, otherwise can't really do an effective check... -->
<get-related value-name="orderItemAndShipGroupAssoc" relation-name="ItemIssuance" list-name="itemIssuances"/>
<calculate field-name="issuedQuantity" type="Double"><number value="0"/></calculate>
- <iterate entry="itemIssuance" list-name="itemIssuances">
+ <iterate entry="itemIssuance" list="itemIssuances">
<calculate field-name="issuedQuantity" type="Double">
<calcop field-name="issuedQuantity" operator="add">
<calcop field-name="itemIssuance.quantity" operator="get"/>
@@ -498,7 +498,7 @@
<!-- iterate over the orderHeaderInfoList and create a PicklistBin for each order and a PicklistItem for each item -->
<calculate field-name="binLocationNumber" type="Long"><number value="1"/></calculate>
- <iterate entry="orderHeaderInfo" list-name="orderHeaderInfoList">
+ <iterate entry="orderHeaderInfo" list="orderHeaderInfoList">
<clear-field field-name="picklistBinId"/>
<clear-field field-name="createPicklistBinMap"/>
<set from-field="picklistId" field="createPicklistBinMap.picklistId"/>
@@ -512,8 +512,8 @@
<calculate field-name="binLocationNumber" type="Long"><calcop field-name="binLocationNumber" operator="add"/><number value="1"/></calculate>
<set field="itemsInBin" type="Long" value="0"/>
- <iterate entry="orderItemInfo" list-name="orderHeaderInfo.orderItemInfoList">
- <iterate entry="orderItemShipGrpInvRes" list-name="orderItemInfo.orderItemShipGrpInvResList">
+ <iterate entry="orderItemInfo" list="orderHeaderInfo.orderItemInfoList">
+ <iterate entry="orderItemShipGrpInvRes" list="orderItemInfo.orderItemShipGrpInvResList">
<log level="info" message="Getting pick quantity : ${orderItemShipGrpInvRes.quantity} - ${orderItemShipGrpInvRes.quantityNotAvailable}"/>
<set field="quantityToPick" from-field="orderItemShipGrpInvRes.quantity"/>
<!--If a portion of the item is not available, then reduce the quantity to pick. For example,
@@ -578,7 +578,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="Picklist"/>
+ <make-value value-field="newEntity" entity-name="Picklist"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="Picklist" env-name="newEntity.picklistId"/>
@@ -602,7 +602,7 @@
<fail-message message="Security Error: to run updatePicklist you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <make-value value-name="lookupPKMap" entity-name="Picklist"/>
+ <make-value value-field="lookupPKMap" entity-name="Picklist"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -617,7 +617,7 @@
<set value="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." field="error_list[]"/>
</if-empty>
- <make-value entity-name="PicklistStatusHistory" value-name="newStatusValue"/>
+ <make-value entity-name="PicklistStatusHistory" value-field="newStatusValue"/>
<set from-field="parameters.picklistId" field="newStatusValue.picklistId"/>
<set from-field="lookedUpValue.statusId" field="newStatusValue.statusId"/>
<set from-field="parameters.statusId" field="newStatusValue.statusIdTo"/>
@@ -645,7 +645,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="Picklist"/>
+ <make-value value-field="lookupPKMap" entity-name="Picklist"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -658,7 +658,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="PicklistBin"/>
+ <make-value value-field="newEntity" entity-name="PicklistBin"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="PicklistBin" env-name="newEntity.picklistBinId"/>
@@ -671,7 +671,7 @@
<fail-message message="Security Error: to run updatePicklistBin you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <make-value value-name="lookupPKMap" entity-name="PicklistBin"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -684,7 +684,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="PicklistBin"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -697,7 +697,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="PicklistItem"/>
+ <make-value value-field="newEntity" entity-name="PicklistItem"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -712,7 +712,7 @@
<fail-message message="Security Error: to run updatePicklistItem you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <make-value value-name="lookupPKMap" entity-name="PicklistItem"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -747,7 +747,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="PicklistItem"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -769,7 +769,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="newEntity" entity-name="PicklistRole"/>
+ <make-value value-field="newEntity" entity-name="PicklistRole"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -784,7 +784,7 @@
<fail-message message="Security Error: to run updatePicklistRole you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <make-value value-name="lookupPKMap" entity-name="PicklistRole"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -797,7 +797,7 @@
</check-permission>
<check-errors/>
- <make-value value-name="lookupPKMap" entity-name="PicklistRole"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -821,7 +821,7 @@
<order-by field-name="picklistDate"/>
</entity-condition>
- <iterate entry="picklist" list-name="picklistList">
+ <iterate entry="picklist" list="picklistList">
<call-simple-method method-name="getPicklistSingleInfoInline"/>
<field-to-list field-name="picklistInfo" list-name="picklistInfoList"/>
</iterate>
@@ -847,10 +847,10 @@
<field-to-result field-name="picklistInfo"/>
<!-- Assemble the information per facility location for the pick sheet -->
- <iterate entry="picklistBinInfo" list-name="picklistInfo.picklistBinInfoList">
+ <iterate entry="picklistBinInfo" list="picklistInfo.picklistBinInfoList">
<set from-field="picklistBinInfo.picklistBin" field="picklistBinByIdMap.${picklistBinInfo.picklistBin.picklistBinId}"/>
- <iterate entry="picklistItemInfo" list-name="picklistBinInfo.picklistItemInfoList">
+ <iterate entry="picklistItemInfo" list="picklistBinInfo.picklistItemInfoList">
<!--
In this iteration through the items we want 2 things:
1. A Map with all FacilityLocation records by locationSeqId, so that we have one unique of each
@@ -862,7 +862,7 @@
A Map with a List of PicklistItemInfo records keyed by the productId
-->
<if-not-empty field="picklistItemInfo.inventoryItemAndLocation.locationSeqId">
- <make-value value-name="facilityLocation" entity-name="FacilityLocation" map-name="picklistItemInfo.inventoryItemAndLocation"/>
+ <make-value value-field="facilityLocation" entity-name="FacilityLocation" map-name="picklistItemInfo.inventoryItemAndLocation"/>
<set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap.${facilityLocation.locationSeqId}"/>
<clear-field field-name="picklistItemInfoTempList"/>
@@ -918,13 +918,13 @@
<order-value-list list-name="facilityLocationList" order-by-list-name="facilityLocsOrdLst"/>
<!-- Now we have an ordered list of FacilityLocations, create a facilityLocationInfoList -->
- <iterate entry="facilityLocation" list-name="facilityLocationList">
+ <iterate entry="facilityLocation" list="facilityLocationList">
<clear-field field-name="facilityLocationInfo"/>
<set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
<set from-field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}" field="facilityLocationInfo.picklistItemInfoList"/>
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
- <iterate entry="picklistItemInfo" list-name="facilityLocationInfo.picklistItemInfoList">
+ <iterate entry="picklistItemInfo" list="facilityLocationInfo.picklistItemInfoList">
<calculate field-name="facilityLocationInfo.pickQuantity" type="Double">
<calcop field-name="facilityLocationInfo.pickQuantity" operator="add">
<calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
@@ -971,13 +971,13 @@
<order-value-list list-name="productList" order-by-list-name="productsOrdLst"/>
<!-- Now we have an ordered list of Products, create a noLocationProductInfoList -->
- <iterate entry="product" list-name="productList">
+ <iterate entry="product" list="productList">
<clear-field field-name="productInfo"/>
<set from-field="product" field="productInfo.product"/>
<set from-field="picklistItemInfoListByProductIdMap.${product.productId}" field="productInfo.picklistItemInfoList"/>
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
- <iterate entry="picklistItemInfo" list-name="productInfo.picklistItemInfoList">
+ <iterate entry="picklistItemInfo" list="productInfo.picklistItemInfoList">
<calculate field-name="productInfo.pickQuantity" type="Double">
<calcop field-name="productInfo.pickQuantity" operator="add">
<calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
@@ -1026,7 +1026,7 @@
<!-- expects a picklist GenericValue to be in the context, and creates a picklistInfo Map -->
<clear-field field-name="picklistRoleInfoList"/>
<get-related value-name="picklist" relation-name="PicklistRole" list-name="picklistRoleList"/>
- <iterate entry="picklistRole" list-name="picklistRoleList">
+ <iterate entry="picklistRole" list="picklistRoleList">
<clear-field field-name="picklistRoleInfo"/>
<get-related-one value-name="picklistRole" relation-name="PartyNameView" to-value-name="picklistRoleInfo.partyNameView" use-cache="true"/>
<get-related-one value-name="picklistRole" relation-name="RoleType" to-value-name="picklistRoleInfo.roleType" use-cache="true"/>
@@ -1036,7 +1036,7 @@
<clear-field field-name="picklistStatusHistoryInfoList"/>
<get-related value-name="picklist" relation-name="PicklistStatusHistory" list-name="picklistStatusHistoryList"/>
- <iterate entry="picklistStatusHistory" list-name="picklistStatusHistoryList">
+ <iterate entry="picklistStatusHistory" list="picklistStatusHistoryList">
<clear-field field-name="picklistStatusHistoryInfo"/>
<get-related-one value-name="picklistStatusHistory" relation-name="StatusItem" to-value-name="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
<get-related-one value-name="picklistStatusHistory" relation-name="ToStatusItem" to-value-name="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
@@ -1049,14 +1049,14 @@
<set value="+binLocationNumber" field="picklistBinOrderList[]"/>
<get-related value-name="picklist" relation-name="PicklistBin" list-name="picklistBinList" order-by-list-name="picklistBinOrderList"/>
- <iterate entry="picklistBin" list-name="picklistBinList">
+ <iterate entry="picklistBin" list="picklistBinList">
<clear-field field-name="picklistBinInfo"/>
<get-related-one value-name="picklistBin" relation-name="PrimaryOrderHeader" to-value-name="picklistBinInfo.primaryOrderHeader"/>
<get-related-one value-name="picklistBin" relation-name="PrimaryOrderItemShipGroup" to-value-name="picklistBinInfo.primaryOrderItemShipGroup"/>
<clear-field field-name="picklistItemInfoList"/>
<get-related value-name="picklistBin" relation-name="PicklistItem" list-name="picklistItemList" use-cache="true"/>
- <iterate entry="picklistItem" list-name="picklistItemList">
+ <iterate entry="picklistItem" list="picklistItemList">
<clear-field field-name="picklistItemInfo"/>
<get-related-one value-name="picklistItem" relation-name="OrderItem" to-value-name="picklistItemInfo.orderItem"/>
<get-related-one value-name="picklistItemInfo.orderItem" relation-name="Product" to-value-name="picklistItemInfo.product"/>
@@ -1171,14 +1171,14 @@
<order-value-list list-name="facilityLocations" order-by-list-name="facilityLocsOrdLst"/>
<!-- for each facility location add an entry to the inventoryItemInfoList -->
- <iterate entry="facilityLocation" list-name="facilityLocations">
+ <iterate entry="facilityLocation" list="facilityLocations">
<!-- facilityLocationInfoList: facilityLocation, productInfoList (product, quantity, inventoryItemList, orderItemList) -->
<clear-field field-name="facilityLocationInfo"/>
<set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
<!-- inventoryItemInfoList: facilityLocation, inventoryItem, orderItems, quantity, product, statusItems -->
<set from-field="inventoryItemsByLocation.${facilityLocation.locationSeqId}" field="inventoryItemIdList"/>
- <iterate entry="inventoryItemId" list-name="inventoryItemIdList">
+ <iterate entry="inventoryItemId" list="inventoryItemIdList">
<clear-field field-name="inventoryItemInfo"/>
<set from-field="facilityLocation" field="inventoryItemInfo.facilityLocation"/>
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
@@ -1197,7 +1197,7 @@
</calculate>
<set from-field="inventoryItemInfo.inventoryItem" field="productInfoMap.${inventoryItemInfo.product.productId}.inventoryItemList[]"/>
<!-- put orderItems in Map by orderId:orderItemSeqId to make sure they are unique -->
- <iterate entry="orderItem" list-name="inventoryItemInfo.orderItems">
+ <iterate entry="orderItem" list="inventoryItemInfo.orderItems">
<set from-field="orderItem" field="orderItemMap.${orderItem.orderId}:${orderItem.orderItemSeqId}"/>
</iterate>
</iterate>
@@ -1217,7 +1217,7 @@
</iterate>
<!-- add all noLocationInventoryItemIds to inventoryItemInfoList with all entries except facilityLocation -->
- <iterate entry="inventoryItemId" list-name="noLocationInventoryItemIds">
+ <iterate entry="inventoryItemId" list="noLocationInventoryItemIds">
<set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
<set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/>
@@ -1236,12 +1236,12 @@
</check-permission>
<!-- find the picklist bin -->
- <make-value value-name="binLookup" entity-name="PicklistBin"/>
+ <make-value value-field="binLookup" entity-name="PicklistBin"/>
<set-pk-fields map-name="parameters" value-name="binLookup"/>
<find-by-primary-key map-name="binLookup" value-name="picklistBin"/>
<!-- find the pick list -->
- <make-value value-name="plLookup" entity-name="Picklist"/>
+ <make-value value-field="plLookup" entity-name="Picklist"/>
<set-pk-fields map-name="picklistBin" value-name="plLookup"/>
<find-by-primary-key map-name="plLookup" value-name="picklist"/>
@@ -1254,7 +1254,7 @@
<set field="allCancelled" type="Boolean" value="true"/>
<!-- determine if all the items are completed and/or cancelled -->
- <iterate entry="item" list-name="picklistItem">
+ <iterate entry="item" list="picklistItem">
<log level="info" message="checking status for item: ${item}"/>
<if-compare field="item.itemStatusId" value="PICKITEM_CANCELLED" operator="not-equals">
<log level="info" message="item is not cancelled; all cancelled set to false"/>