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:55:28 UTC
svn commit: r730104 [4/5] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accountin...
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730104&r1=730103&r2=730104&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 03:55:26 2008
@@ -318,7 +318,7 @@
<!-- Product Keyword Services -->
<simple-method method-name="createProductKeyword" short-description="create a ProductKeyword">
<make-value entity-name="ProductKeyword" value-field="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -462,7 +462,7 @@
<make-value value-field="newEntity" entity-name="GoodIdentification"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateGoodIdentification" short-description="Update an GoodIdentification">
@@ -472,7 +472,7 @@
<check-errors/>
<make-value entity-name="GoodIdentification" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -484,7 +484,7 @@
<check-errors/>
<make-value entity-name="GoodIdentification" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -498,7 +498,7 @@
<make-value value-field="newEntity" entity-name="ProductGlAccount"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateProductGlAccount" short-description="Update an ProductGlAccount">
@@ -508,7 +508,7 @@
<check-errors/>
<make-value entity-name="ProductGlAccount" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductGlAccount" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -520,7 +520,7 @@
<check-errors/>
<make-value entity-name="ProductGlAccount" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductGlAccount" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -566,7 +566,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductReview"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -726,7 +726,7 @@
<make-value value-field="newEntity" entity-name="ProductAssoc"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -737,7 +737,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductAssoc"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductAssoc" map="lookupPKMap" value-field="productAssocInstance"/>
<set-nonpk-fields map-name="parameters" value-name="productAssocInstance"/>
<store-value value-name="productAssocInstance"/>
@@ -749,7 +749,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductAssoc"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductAssoc" map="lookupPKMap" value-field="productAssocInstance"/>
<remove-value value-name="productAssocInstance"/>
</simple-method>
@@ -763,7 +763,7 @@
<make-value value-field="newEntity" entity-name="ProductMaint"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productMaintSeqId"/> <!-- this finds the next sub-sequence ID -->
<field-to-result field-name="newEntity.productMaintSeqId" result-name="productMaintSeqId"/>
<create-value value-name="newEntity"/>
@@ -796,7 +796,7 @@
<make-value value-field="newEntity" entity-name="ProductMeter"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateProductMeter" short-description="Update an existing Product Meter">
@@ -823,7 +823,7 @@
<simple-method method-name="createProductGeo" short-description="Create an Product Geo">
<make-value value-field="newEntity" entity-name="ProductGeo"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateProductGeo" short-description="Update an existing Product Geo">
@@ -907,7 +907,7 @@
<!-- Product Attribute Services -->
<simple-method method-name="createProductAttribute" short-description="create a ProductAttribute">
<make-value entity-name="ProductAttribute" value-field="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -932,7 +932,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -948,7 +948,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -960,20 +960,20 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createVendorProduct" short-description="Create a VendorProduct">
<make-value entity-name="VendorProduct" value-field="newEntity"/>
- <set-pk-fields value-name="newEntity" map-name="parameters"/>
+ <set-pk-fields value-field="newEntity" map="parameters"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="deleteVendorProduct" short-description="Remove the VendorProduct">
<make-value entity-name="VendorProduct" value-field="lookedUpValue"/>
- <set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-pk-fields value-field="lookedUpValue" map="parameters"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -986,7 +986,7 @@
<make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -82,7 +82,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
<field-to-result field-name="productPromoActionSeqId" map-name="newEntity"/>
@@ -94,7 +94,7 @@
<check-errors/>
<make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -105,7 +105,7 @@
<check-errors/>
<make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -118,7 +118,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -128,7 +128,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -139,7 +139,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -152,7 +152,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.productPromoCodeId">
<sequenced-id-to-env sequence-name="ProductPromoCode" env-name="newEntity.productPromoCodeId" stagger-max="100"/>
</if-empty>
@@ -176,7 +176,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -192,7 +192,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -205,7 +205,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -215,7 +215,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCodeEmail" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -228,7 +228,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -238,7 +238,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCodeParty" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -251,7 +251,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
<field-to-result field-name="productPromoCondSeqId" map-name="newEntity"/>
@@ -263,7 +263,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -274,7 +274,7 @@
<check-errors/>
<make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -287,7 +287,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -297,7 +297,7 @@
<check-errors/>
<make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -308,7 +308,7 @@
<check-errors/>
<make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -321,7 +321,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
<field-to-result field-name="productPromoRuleId" map-name="newEntity"/>
@@ -333,7 +333,7 @@
<check-errors/>
<make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -344,7 +344,7 @@
<check-errors/>
<make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -356,7 +356,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductStorePromoAppl"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -372,7 +372,7 @@
<check-errors/>
<make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -383,7 +383,7 @@
<check-errors/>
<make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -58,7 +58,7 @@
<!-- Find old value -->
<make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
- <set-pk-fields value-name="facilityContactMechMap" map-name="parameters"/>
+ <set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
<find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
<filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
<first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
@@ -125,7 +125,7 @@
<check-errors/>
<make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
- <set-pk-fields value-name="facilityContactMechMap" map-name="parameters"/>
+ <set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
<find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
<filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
@@ -313,7 +313,7 @@
<make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/>
- <set-pk-fields map-name="parameters" value-name="lookUpMap"/>
+ <set-pk-fields map="parameters" value-field="lookUpMap"/>
<find-by-primary-key value-field="purposeEntity" entity-name="FacilityContactMechPurpose" map="lookUpMap"/>
<if-empty field="purposeEntity">
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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -47,7 +47,7 @@
<!-- Facility ContactMech Services -->
<simple-method method-name="addContactMechToFacility" short-description="Add ContactMech To Facility">
<make-value value-field="newEntity" entity-name="FacilityContactMech"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="removeContactMechFromFacility" short-description="Remove ContactMech From Facility">
@@ -130,7 +130,7 @@
<!-- Facility Member Services -->
<simple-method method-name="addFacilityToGroup" short-description="Add Facility to FacilityGroup">
<make-value value-field="newEntity" entity-name="FacilityGroupMember"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -142,14 +142,14 @@
</simple-method>
<simple-method method-name="updateFacilityToGroup" short-description="Update Facility to FacilityGroup Application">
<make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup">
<make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -157,7 +157,7 @@
<!-- Facility Group Rollup Services -->
<simple-method method-name="addFacilityGroupToGroup" short-description="Add FacilityGroup to FacilityGroup">
<make-value value-field="newEntity" entity-name="FacilityGroupRollup"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -169,14 +169,14 @@
</simple-method>
<simple-method method-name="updateFacilityGroupToGroup" short-description="Update FacilityGroup to FacilityGroup Rollup">
<make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup">
<make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -188,11 +188,11 @@
<find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="partyRole"/>
<if-empty field="partyRole">
<make-value value-field="partyRole" entity-name="PartyRole"/>
- <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/>
+ <set-pk-fields map="lookupPKMap" value-field="partyRole"/>
<create-value value-name="partyRole"/>
</if-empty>
<make-value value-field="newEntity" entity-name="FacilityParty"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -202,7 +202,7 @@
<simple-method method-name="addPartyToFacilityGroup" short-description="Add Party to FacilityGroup">
<make-value value-field="newEntity" entity-name="FacilityGroupRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -216,7 +216,7 @@
<simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
<make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -103,7 +103,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductStoreCatalog"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -118,7 +118,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -128,7 +128,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -139,7 +139,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductStorePaymentSetting"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -148,7 +148,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
<set-nonpk-fields map-name="parameters" value-name="setting"/>
<store-value value-name="setting"/>
@@ -158,7 +158,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
<set-nonpk-fields map-name="parameters" value-name="setting"/>
<remove-value value-name="setting"/>
@@ -173,7 +173,7 @@
<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"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -184,7 +184,7 @@
<check-errors/>
<make-value value-field="lookupKeyValue" entity-name="ProductStoreEmailSetting"/>
- <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
+ <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -196,7 +196,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreEmailSetting"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -207,7 +207,7 @@
<check-errors/>
<make-value entity-name="ProductStoreVendorPayment" value-field="newEntity"/>
- <set-pk-fields value-name="newEntity" map-name="parameters"/>
+ <set-pk-fields value-field="newEntity" map="parameters"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="deleteProductStoreVendorPayment" short-description="Remove the ProductStoreVendorPayment">
@@ -215,7 +215,7 @@
<check-errors/>
<make-value entity-name="ProductStoreVendorPayment" value-field="lookedUpValue"/>
- <set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-pk-fields value-field="lookedUpValue" map="parameters"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -239,7 +239,7 @@
<check-errors/>
<make-value value-field="lookupKeyValue" entity-name="ProductStoreShipmentMeth"/>
- <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
+ <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -251,7 +251,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreShipmentMeth"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -262,7 +262,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductStoreRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -277,7 +277,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -294,7 +294,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductStoreKeywordOvrd"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -312,7 +312,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -322,7 +322,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -350,7 +350,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ProductStoreSurveyAppl"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -367,7 +367,7 @@
<check-errors/>
<make-value value-field="finAcctSetting" entity-name="ProductStoreFinActSetting"/>
- <set-pk-fields value-name="finAcctSetting" map-name="parameters"/>
+ <set-pk-fields value-field="finAcctSetting" map="parameters"/>
<set-nonpk-fields value-name="finAcctSetting" map-name="parameters"/>
<create-value value-name="finAcctSetting"/>
</simple-method>
@@ -376,7 +376,7 @@
<check-errors/>
<make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/>
- <set-pk-fields value-name="lookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="lookupPk" map="parameters"/>
<find-by-primary-key map="lookupPk" value-field="finAccountSetting"/>
<set-nonpk-fields value-name="finAccountSetting" map-name="parameters"/>
@@ -387,7 +387,7 @@
<check-errors/>
<make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/>
- <set-pk-fields value-name="lookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="lookupPk" map="parameters"/>
<find-by-primary-key map="lookupPk" value-field="finAccountSetting"/>
<remove-value value-name="finAccountSetting"/>
</simple-method>
@@ -702,14 +702,14 @@
<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-field="newEntity"/>
- <set-pk-fields value-name="newEntity" map-name="parameters"/>
+ <set-pk-fields value-field="newEntity" map="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-field="lookedUpValue"/>
- <set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <set-pk-fields value-field="lookedUpValue" map="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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -98,7 +98,7 @@
<simple-method method-name="createProductSubscriptionResource" short-description="Create a ProductSubscriptionResource">
<make-value entity-name="ProductSubscriptionResource" value-field="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -117,7 +117,7 @@
<entity-one entity-name="SubscriptionAttribute" value-name="lookedUpValue"/>
<if-empty field="lookedUpValue">
<make-value entity-name="SubscriptionAttribute" value-field="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
<else>
@@ -129,7 +129,7 @@
<simple-method method-name="createSubscriptionCommEvent" short-description="Create a Subscription Communication Event">
<make-value value-field="newEntity" entity-name="SubscriptionCommEvent"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=730104&r1=730103&r2=730104&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:55:26 2008
@@ -25,7 +25,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="SupplierProduct"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -36,7 +36,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>
<set-nonpk-fields map-name="parameters" value-name="sprod"/>
@@ -48,7 +48,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>
<remove-value value-name="sprod"/>
@@ -60,7 +60,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="SupplierProductFeature"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -81,7 +81,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ItemIssuanceRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -142,13 +142,13 @@
<!-- get orderItemShipGrpInvRes -->
<make-value entity-name="OrderItemShipGrpInvRes" value-field="OrderItemShipGrpInvResLookupPk"/>
- <set-pk-fields value-name="OrderItemShipGrpInvResLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="OrderItemShipGrpInvResLookupPk" map="parameters"/>
<find-by-primary-key map="OrderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
<log level="info" message="order item ship grp inv res info: ${orderItemShipGrpInvRes}"/>
<!-- get orderHeader -->
<make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
- <set-pk-fields value-name="orderHeaderLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="orderHeaderLookupPk" map="parameters"/>
<find-by-primary-key map="orderHeaderLookupPk" value-field="orderHeader"/>
<!-- make sure the order is of orderTypeId: SALES_ORDER -->
@@ -183,7 +183,7 @@
<entity-one entity-name="Shipment" value-name="shipment"/>
<!-- get orderShipment -->
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
- <set-pk-fields value-name="orderShipmentLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="orderShipmentLookupPk" map="parameters"/>
<find-by-and entity-name="OrderShipment" map-name="orderShipmentLookupPk" list-name="orderShipments"/>
<first-from-list entry="orderShipment" list="orderShipments"/>
<!-- qtyForShipmentItem is the quantity we will add to the ShipmentItem -->
@@ -199,7 +199,7 @@
<if-not-empty field="orderShipment">
<field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
<make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
- <set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="shipmentItemLookupPk" map="parameters"/>
<set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
<find-by-primary-key map="shipmentItemLookupPk" value-field="shipmentItem"/>
<remove-value value-name="orderShipment"/>
@@ -221,7 +221,7 @@
<store-value value-name="orderShipment"/>
<field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
<make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
- <set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="shipmentItemLookupPk" map="parameters"/>
<set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
<find-by-primary-key map="shipmentItemLookupPk" value-field="shipmentItem"/>
</else>
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=730104&r1=730103&r2=730104&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:55:26 2008
@@ -603,7 +603,7 @@
</check-permission>
<make-value value-field="lookupPKMap" entity-name="Picklist"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="parameters.statusId">
@@ -646,7 +646,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="Picklist"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -672,7 +672,7 @@
</check-permission>
<make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -685,7 +685,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -698,7 +698,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="PicklistItem"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.itemStatusId">
@@ -713,7 +713,7 @@
</check-permission>
<make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="parameters.itemStatusId">
@@ -748,7 +748,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -770,7 +770,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="PicklistRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -785,7 +785,7 @@
</check-permission>
<make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -798,7 +798,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -1237,12 +1237,12 @@
<!-- find the picklist bin -->
<make-value value-field="binLookup" entity-name="PicklistBin"/>
- <set-pk-fields map-name="parameters" value-name="binLookup"/>
+ <set-pk-fields map="parameters" value-field="binLookup"/>
<find-by-primary-key map="binLookup" value-field="picklistBin"/>
<!-- find the pick list -->
<make-value value-field="plLookup" entity-name="Picklist"/>
- <set-pk-fields map-name="picklistBin" value-name="plLookup"/>
+ <set-pk-fields map="picklistBin" value-field="plLookup"/>
<find-by-primary-key map="plLookup" value-field="picklist"/>
<!-- find all related picklist items -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730104&r1=730103&r2=730104&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 03:55:26 2008
@@ -55,7 +55,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -66,7 +66,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentReceiptRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730104&r1=730103&r2=730104&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 03:55:26 2008
@@ -31,7 +31,7 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-not-empty field="parameters.shipmentId">
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<else>
<sequenced-id-to-env sequence-name="Shipment" env-name="newEntity.shipmentId"/>
</else>
@@ -110,7 +110,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
<make-value value-field="lookupPKMap" entity-name="Shipment"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<!-- put the type in return map so that service consumer knows what type of shipment was updated -->
@@ -787,7 +787,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentItem"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- if no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
<make-next-seq-id value-name="newEntity" seq-field-name="shipmentItemSeqId"/>
@@ -803,7 +803,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -817,7 +817,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -912,7 +912,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentPackage"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-compare value="New" operator="equals" field="newEntity.shipmentPackageSeqId">
@@ -940,7 +940,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -992,7 +992,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -1007,7 +1007,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -1021,7 +1021,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -1033,7 +1033,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<find-by-primary-key value-field="shipmentPackageContent" map="newEntity"/>
<log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
<if-empty field="shipmentPackageContent">
@@ -1062,7 +1062,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -1074,7 +1074,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -1088,7 +1088,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -1101,7 +1101,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentContactMech"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
@@ -1113,7 +1113,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentContactMech" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -1127,7 +1127,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentContactMech" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -1142,7 +1142,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- if no shipmentRouteSegmentSeqId, generate one based on existing items, ie one greater than the current higher number -->
@@ -1266,7 +1266,7 @@
<!-- shipment method type services -->
<simple-method method-name="createCarrierShipmentMethod" short-description="Creates a CarrierShipmentMethod">
<make-value value-field="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/>
- <set-pk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
+ <set-pk-fields map="parameters" value-field="carrierShipmentMethod"/>
<set-nonpk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
<create-value value-name="carrierShipmentMethod"/>
</simple-method>
@@ -1282,7 +1282,7 @@
<simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType">
<make-value value-field="shipmentMethodType" entity-name="ShipmentMethodType"/>
- <set-pk-fields map-name="parameters" value-name="shipmentMethodType"/>
+ <set-pk-fields map="parameters" value-field="shipmentMethodType"/>
<set-nonpk-fields map-name="parameters" value-name="shipmentMethodType"/>
<create-value value-name="shipmentMethodType"/>
</simple-method>
@@ -1618,7 +1618,7 @@
-->
<if-not-empty field="parameters.serialNumber">
<make-value entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvResLookupPk"/>
- <set-pk-fields value-name="orderItemShipGrpInvResLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="orderItemShipGrpInvResLookupPk" map="parameters"/>
<find-by-primary-key entity-name="OrderItemShipGrpInvRes" map="orderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
<get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-name="orderItemShipGrpInvRes"/>
<if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
@@ -1653,7 +1653,7 @@
</if-empty>
<log level="info" message="Package SeqID : ${shipItemContext.shipmentPackageSeqId}"/>
<make-value entity-name="ShipmentPackage" value-field="shipmentPackageLookupPk"/>
- <set-pk-fields value-name="shipmentPackageLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="shipmentPackageLookupPk" map="parameters"/>
<find-by-primary-key entity-name="ShipmentPackage" map="shipmentPackageLookupPk" value-field="shipmentPackage"/>
<if-empty field="shipmentPackage">
<set from-field="itemIssuance.shipmentId" field="shipPackageContext.shipmentId"/>
@@ -1841,11 +1841,11 @@
<fail-message message="Security Error: to run ${operationName} you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
<make-value entity-name="OrderShipment" value-field="lookupPk"/>
- <set-pk-fields value-name="lookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="lookupPk" map="parameters"/>
<find-by-primary-key entity-name="OrderShipment" map="lookupPk" value-field="orderShipment"/>
<clear-field field-name="lookupPk"/>
<make-value entity-name="ShipmentItem" value-field="lookupPk"/>
- <set-pk-fields value-name="lookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="lookupPk" map="parameters"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPk" value-field="shipmentItem"/>
<set from-field="parameters.userLogin" field="inMap.userLogin"/>
@@ -1892,7 +1892,7 @@
<!-- get orderHeader -->
<make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
- <set-pk-fields value-name="orderHeaderLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="orderHeaderLookupPk" map="parameters"/>
<find-by-primary-key map="orderHeaderLookupPk" value-field="orderHeader"/>
<!-- make sure the order is of orderTypeId: SALES_ORDER -->
@@ -1902,12 +1902,12 @@
<!-- get orderItem -->
<make-value entity-name="OrderItem" value-field="orderItemLookupPk"/>
- <set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="orderItemLookupPk" map="parameters"/>
<find-by-primary-key map="orderItemLookupPk" value-field="orderItem"/>
<!-- make sure the orderItem is not already present in this shipment -->
<make-value entity-name="OrderShipment" value-field="orderShipmentLookup"/>
- <set-pk-fields value-name="orderShipmentLookup" map-name="parameters"/>
+ <set-pk-fields value-field="orderShipmentLookup" map="parameters"/>
<find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
<if-not-empty field="existingOrderShipments">
<string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the order item is already in the shipment (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list-name="error_list"/>
@@ -1944,7 +1944,7 @@
<simple-method method-name="getQuantityForShipment" short-description="get the order item quantity still not put in shipments">
<!-- get orderItem -->
<make-value entity-name="OrderItem" value-field="orderItemLookupPk"/>
- <set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
+ <set-pk-fields value-field="orderItemLookupPk" map="parameters"/>
<find-by-primary-key map="orderItemLookupPk" value-field="orderItem"/>
<set from-field="parameters.orderId" field="orderShipmentLookup.orderId"/>
Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=730104&r1=730103&r2=730104&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Tue Dec 30 03:55:26 2008
@@ -27,7 +27,7 @@
<make-value value-field="newEntity" entity-name="SecurityGroup"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -36,7 +36,7 @@
<check-errors/>
<make-value entity-name="SecurityGroup" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="SecurityGroup" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -49,7 +49,7 @@
<make-value value-field="newEntity" entity-name="SecurityPermission"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -58,7 +58,7 @@
<check-errors/>
<make-value entity-name="SecurityPermission" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="SecurityPermission" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -70,7 +70,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="SecurityGroupPermission"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<!-- clear the org.ofbiz.security.Security object's custom cache by newEntity -->
<call-bsh><![CDATA[ org.ofbiz.security.Security.securityGroupPermissionCache.remove(newEntity); ]]></call-bsh>
@@ -82,7 +82,7 @@
<check-errors/>
<make-value entity-name="SecurityGroupPermission" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="SecurityGroupPermission" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -96,7 +96,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="UserLoginSecurityGroup"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -114,7 +114,7 @@
<check-errors/>
<make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="UserLoginSecurityGroup" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -127,7 +127,7 @@
<check-errors/>
<make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="UserLoginSecurityGroup" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
@@ -141,7 +141,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProtectedView"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- clear the org.ofbiz.security.Security object's custom cache by newEntity -->
@@ -153,7 +153,7 @@
<check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateProtectedViewToSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
<check-errors/>
<make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProtectedView" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -166,7 +166,7 @@
<check-errors/>
<make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
+ <set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProtectedView" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730104&r1=730103&r2=730104&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 03:55:26 2008
@@ -282,7 +282,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="TimesheetRole"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="deleteTimesheetRole" short-description="Delete TimesheetRole">