You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:14:25 UTC
svn commit: r730116 [3/4] - 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/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 04:14:23 2008
@@ -44,7 +44,7 @@
<check-errors/>
</else>
</if-empty>
- <field-to-result field-name="newEntity.productCategoryId" result-name="productCategoryId"/>
+ <field-to-result field="newEntity.productCategoryId" result-name="productCategoryId"/>
<create-value value-field="newEntity"/>
@@ -498,7 +498,7 @@
<call-service service-name="createProduct" in-map-name="callCreateProductMap">
<result-to-field result-name="productId"/>
</call-service>
- <field-to-result field-name="productId"/>
+ <field-to-result field="productId"/>
<!-- create ProductCategoryMember -->
<set field="callCreateProductCategoryMemberMap.productId" from-field="productId"/>
@@ -763,13 +763,13 @@
<if-empty field="error_list">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<else>
<property-to-field resource="ProductUiLabels" property="ProductPermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</else>
</if-empty>
</simple-method>
@@ -781,8 +781,8 @@
<results-to-map map-name="genericResult"/>
</call-service>
<if-compare field="genericResult.hasPermission" operator="equals" value="false" type="Boolean">
- <field-to-result field-name="genericResult.hasPermission" result-name="hasPermission"/>
- <field-to-result field-name="genericResult.failMessage" map-name="failMessage"/>
+ <field-to-result field="genericResult.hasPermission" result-name="hasPermission"/>
+ <field-to-result field="genericResult.failMessage" map-name="failMessage"/>
<return/>
</if-compare>
@@ -835,7 +835,7 @@
</if>
</iterate>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Dec 30 04:14:23 2008
@@ -37,7 +37,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field-name="fromDate" map-name="newEntity"/>
+ <field-to-result field="fromDate" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -80,7 +80,7 @@
<sequenced-id-to-env sequence-name="ProductConfigItem" env-name="newEntity.configItemId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
- <field-to-result field-name="configItemId" map-name="newEntity"/>
+ <field-to-result field="configItemId" map-name="newEntity"/>
</simple-method>
<simple-method method-name="updateProductConfigItem" short-description="Update a Config Item">
<check-permission action="_UPDATE" permission="CATALOG">
@@ -114,8 +114,8 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="ProductConfigOption" env-name="newEntity.configOptionId"/>
<create-value value-field="newEntity"/>
- <field-to-result field-name="newEntity.configItemId" result-name="configItemId"/>
- <field-to-result field-name="newEntity.configOptionId" result-name="configOptionId"/>
+ <field-to-result field="newEntity.configItemId" result-name="configItemId"/>
+ <field-to-result field="newEntity.configOptionId" result-name="configOptionId"/>
</simple-method>
<simple-method method-name="updateProductConfigOption" short-description="Update a Config Option">
<check-permission action="_UPDATE" permission="CATALOG">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Tue Dec 30 04:14:23 2008
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field-name="contentId"/>
- <field-to-result map-name="newEntity" field-name="configItemId"/>
- <field-to-result map-name="newEntity" field-name="confItemContentTypeId"/>
+ <field-to-result map-name="newEntity" field="contentId"/>
+ <field-to-result map-name="newEntity" field="configItemId"/>
+ <field-to-result map-name="newEntity" field="confItemContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
<make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Tue Dec 30 04:14:23 2008
@@ -25,7 +25,7 @@
<make-value value-field="newEntity" entity-name="CostComponent"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/>
- <field-to-result field-name="costComponentId" map-name="newEntity"/>
+ <field-to-result field="costComponentId" map-name="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
@@ -71,7 +71,7 @@
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
<create-value value-field="newEntity"/>
- <field-to-result field-name="newEntity.costComponentId" result-name="costComponentId"/>
+ <field-to-result field="newEntity.costComponentId" result-name="costComponentId"/>
</simple-method>
<!-- Services to get the product and tasks costs -->
@@ -173,7 +173,7 @@
</if-not-empty>
</if-compare>
-->
- <field-to-result field-name="productCost"/>
+ <field-to-result field="productCost"/>
</simple-method>
<simple-method method-name="getTaskCost" short-description="Gets the production run task's costs">
<!-- First of all, the estimated task time is computed -->
@@ -222,7 +222,7 @@
</calcop>
</calculate>
- <field-to-result field-name="taskCost"/>
+ <field-to-result field="taskCost"/>
</simple-method>
<!-- services to automatically generate cost information -->
@@ -332,6 +332,6 @@
</if-compare>
</if-not-empty>
- <field-to-result field-name="totalCost"/>
+ <field-to-result field="totalCost"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 04:14:23 2008
@@ -28,7 +28,7 @@
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<sequenced-id-to-env sequence-name="ProductFeatureCategory" env-name="newEntity.productFeatureCategoryId"/>
- <field-to-result field-name="newEntity.productFeatureCategoryId" result-name="productFeatureCategoryId"/>
+ <field-to-result field="newEntity.productFeatureCategoryId" result-name="productFeatureCategoryId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -53,7 +53,7 @@
<set field="newEntity.productFeatureId" from-field="parameters.productFeatureId"/>
</else>
</if-empty>
- <field-to-result field-name="newEntity.productFeatureId" result-name="productFeatureId"/>
+ <field-to-result field="newEntity.productFeatureId" result-name="productFeatureId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -211,7 +211,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="ProductFeatureGroup" env-name="newEntity.productFeatureGroupId"/>
- <field-to-result field-name="newEntity.productFeatureGroupId" result-name="productFeatureGroupId"/>
+ <field-to-result field="newEntity.productFeatureGroupId" result-name="productFeatureGroupId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -383,7 +383,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field-name="fromDate" map-name="newEntity"/>
+ <field-to-result field="fromDate" map-name="newEntity"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
<set field="newEntity.createdDate" from-field="nowTimestamp" />
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 04:14:23 2008
@@ -278,7 +278,7 @@
</else>
</if-compare>
- <field-to-result field-name="quantityNotReserved" map-name="parameters"/>
+ <field-to-result field="quantityNotReserved" map-name="parameters"/>
</simple-method>
<simple-method method-name="reserveAnInventoryItem" short-description="Reserve a Specific Serialized InventoryItem">
@@ -372,7 +372,7 @@
<!-- store OrderItemShipGrpInvRes record -->
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field="reserveOisgirMap"/>
- <field-to-result field-name="inventoryItemId" map-name="inventoryItem"/>
+ <field-to-result field="inventoryItemId" map-name="inventoryItem"/>
</simple-method>
<simple-method method-name="reserveForInventoryItemInline" short-description="Does a reservation for one InventoryItem, meant to be called in-line">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 04:14:23 2008
@@ -64,13 +64,13 @@
<if-empty field="error_list">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<else>
<property-to-field resource="ProductUiLabels" property="ProductFacilityPermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</else>
</if-empty>
</simple-method>
@@ -92,13 +92,13 @@
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<if-empty field="error_list">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<else>
<property-to-field resource="ProductUiLabels" property="ProductFacilityPermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</else>
</if-empty>
</simple-method>
@@ -115,7 +115,7 @@
<sequenced-id-to-env sequence-name="InventoryItem" env-name="inventoryItem.inventoryItemId"/>
<create-value value-field="inventoryItem"/>
- <field-to-result field-name="inventoryItem.inventoryItemId" result-name="inventoryItemId"/>
+ <field-to-result field="inventoryItem.inventoryItemId" result-name="inventoryItemId"/>
</simple-method>
<simple-method method-name="createInventoryItemCheckSetAtpQoh" short-description="createInventoryItemCheckSetAtpQoh" login-required="false">
<if>
@@ -231,8 +231,8 @@
<get-related-one value-name="lookedUpValue" relation-name="Facility" to-value-name="oldFacility"/>
<set field="lookedUpValue.ownerPartyId" from-field="oldFacility.ownerPartyId"/>
</if-empty>
- <field-to-result field-name="lookedUpValue.ownerPartyId" result-name="oldOwnerPartyId"/>
- <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/>
+ <field-to-result field="lookedUpValue.ownerPartyId" result-name="oldOwnerPartyId"/>
+ <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
<!-- special handling for the unitCost -->
<if-not-empty field="parameters.unitCost">
<if-compare field="parameters.unitCost" operator="less" value="0.0" type="Double">
@@ -287,7 +287,7 @@
<set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/>
<!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-name="newEntity" increment-by="1" numeric-padding="4"/> -->
<sequenced-id-to-env sequence-name="InventoryItemDetail" env-name="newEntity.inventoryItemDetailSeqId"/>
- <field-to-result field-name="newEntity.inventoryItemDetailSeqId" result-name="inventoryItemDetailSeqId"/>
+ <field-to-result field="newEntity.inventoryItemDetailSeqId" result-name="inventoryItemDetailSeqId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -509,7 +509,7 @@
<sequenced-id-to-env sequence-name="PhysicalInventory" env-name="physicalInventoryId"/>
<set from-field="physicalInventoryId" field="newEntity.physicalInventoryId"/>
- <field-to-result field-name="physicalInventoryId" result-name="physicalInventoryId"/>
+ <field-to-result field="physicalInventoryId" result-name="physicalInventoryId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -672,8 +672,8 @@
</if-compare>
</iterate>
- <field-to-result field-name="availableToPromiseTotal" map-name="parameters"/>
- <field-to-result field-name="quantityOnHandTotal" map-name="parameters"/>
+ <field-to-result field="availableToPromiseTotal" map-name="parameters"/>
+ <field-to-result field="quantityOnHandTotal" map-name="parameters"/>
</simple-method>
<simple-method method-name="getMktgPackagesAvailable" short-description="Get Marketing Packages Available From Components In Inventory" login-required="false" use-transaction="false">
@@ -701,8 +701,8 @@
<result-to-field result-name="availableToPromiseTotal"/>
</call-service>
</if-not-empty>
- <field-to-result field-name="availableToPromiseTotal"/>
- <field-to-result field-name="quantityOnHandTotal"/>
+ <field-to-result field="availableToPromiseTotal"/>
+ <field-to-result field="quantityOnHandTotal"/>
</simple-method>
<simple-method method-name="balanceInventoryItems" short-description="Balances available-to-promise on inventory items">
@@ -834,7 +834,7 @@
</iterate-map>
<if-not-empty field="noLongerOnBackOrderIdMap">
<call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field-name="noLongerOnBackOrderIdSet"/>
- <field-to-result field-name="noLongerOnBackOrderIdSet"/>
+ <field-to-result field="noLongerOnBackOrderIdSet"/>
</if-not-empty>
</simple-method>
@@ -945,7 +945,7 @@
</iterate-map>
<if-not-empty field="noLongerOnBackOrderIdMap">
<call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field-name="noLongerOnBackOrderIdSet"/>
- <field-to-result field-name="noLongerOnBackOrderIdSet"/>
+ <field-to-result field="noLongerOnBackOrderIdSet"/>
</if-not-empty>
</simple-method>
@@ -988,7 +988,7 @@
<make-value value-field="newEntity" entity-name="InventoryTransfer"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="InventoryTransfer" env-name="newEntity.inventoryTransferId"/>
- <field-to-result field-name="newEntity.inventoryTransferId" result-name="inventoryTransferId"/>
+ <field-to-result field="newEntity.inventoryTransferId" result-name="inventoryTransferId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -1182,7 +1182,7 @@
</else>
</if-compare>
- <field-to-result field-name="quantityNotTransferred"/>
+ <field-to-result field="quantityNotTransferred"/>
</simple-method>
<!-- Inventory Label Services -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 04:14:23 2008
@@ -184,12 +184,12 @@
</if-empty>
</iterate-map>
</iterate-map>
- <field-to-result field-name="moveByOisgirInfoList"/>
- <field-to-result field-name="stockMoveHandled"/>
+ <field-to-result field="moveByOisgirInfoList"/>
+ <field-to-result field="stockMoveHandled"/>
<!-- TODO: go through targetLocationSimpleMoveQuantity Map and if any item is not zero, add a warning message -->
- <field-to-result field-name="warningMessageList"/>
+ <field-to-result field="warningMessageList"/>
</simple-method>
<simple-method method-name="findStockMovesRecommended" short-description="Find all Stock Moves recommended to be done based on ProductFacilityLocation settings">
<!-- TODO: make this method aware of serialized inventory in addition to non-serialized inventory -->
@@ -342,8 +342,8 @@
</if>
</iterate>
- <field-to-result field-name="moveByPflInfoList"/>
- <field-to-result field-name="warningMessageList"/>
+ <field-to-result field="moveByPflInfoList"/>
+ <field-to-result field="warningMessageList"/>
</simple-method>
<simple-method method-name="processPhysicalStockMove" short-description="Process a Physical Stock Move from one FacilityLocation to another, in the same Facility">
@@ -427,7 +427,7 @@
<string-to-list string="ERROR: Not enough available inventory found in location [${parameters.locationSeqId}] in facility [${parameters.facilityId}], did not reallocate ${quantityLeftToProcess} of the ${parameters.quantityMoved} reported as physically moved." list-name="warningMessageList"/>
</if-compare>
- <field-to-result field-name="warningMessageList"/>
+ <field-to-result field="warningMessageList"/>
</simple-method>
<simple-method method-name="processOisgirMoveByStatusInline" short-description="Inline method to process OISGIR stock move for a specific OrderItem.statusId">
<entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml Tue Dec 30 04:14:23 2008
@@ -33,7 +33,7 @@
<get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/>
<set field="productDimension.productType" from-field="productType.description"/>
- <field-to-result field-name="productDimension"/>
+ <field-to-result field="productDimension"/>
</simple-method>
<simple-method method-name="loadProductInProductDimension" short-description="">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Dec 30 04:14:23 2008
@@ -37,7 +37,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field-name="fromDate" map-name="newEntity"/>
+ <field-to-result field="fromDate" map-name="newEntity"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
<set field="newEntity.createdDate" from-field="nowTimestamp" />
@@ -56,7 +56,7 @@
<entity-one entity-name="ProductPrice" value-field="lookedUpValue"/>
<!-- grab the old price value before setting nonpk parameter fields -->
- <field-to-result map-name="lookedUpValue" field-name="price" result-name="oldPrice"/>
+ <field-to-result map-name="lookedUpValue" field="price" result-name="oldPrice"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -78,7 +78,7 @@
<find-by-primary-key entity-name="ProductPrice" map="lookupPKMap" value-field="lookedUpValue"/>
<!-- grab the old price value before setting nonpk parameter fields -->
- <field-to-result map-name="lookedUpValue" field-name="price" result-name="oldPrice"/>
+ <field-to-result map-name="lookedUpValue" field="price" result-name="oldPrice"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -146,7 +146,7 @@
<make-value value-field="newEntity" entity-name="ProductPriceRule"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="ProductPriceRule" env-name="newEntity.productPriceRuleId"/>
- <field-to-result field-name="productPriceRuleId" map-name="newEntity"/>
+ <field-to-result field="productPriceRuleId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -182,7 +182,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
- <field-to-result field-name="productPriceCondSeqId" map-name="newEntity"/>
+ <field-to-result field="productPriceCondSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -218,7 +218,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-name="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
- <field-to-result field-name="productPriceActionSeqId" map-name="newEntity"/>
+ <field-to-result field="productPriceActionSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Tue Dec 30 04:14:23 2008
@@ -51,10 +51,10 @@
<set field="createProductSupplierMap.availableFromDate" from-field="nowTimestamp"/>
<create-value value-field="createProductSupplierMap"/>
- <field-to-result field-name="productId"/>
- <field-to-result field-name="createProductSupplierMap.currencyUomId" result-name="currencyUomId"/>
- <field-to-result field-name="createProductSupplierMap.minimumOrderQuantity" result-name="minimumOrderQuantity"/>
- <field-to-result field-name="createProductSupplierMap.availableFromDate" result-name="availableFromDate"/>
+ <field-to-result field="productId"/>
+ <field-to-result field="createProductSupplierMap.currencyUomId" result-name="currencyUomId"/>
+ <field-to-result field="createProductSupplierMap.minimumOrderQuantity" result-name="minimumOrderQuantity"/>
+ <field-to-result field="createProductSupplierMap.availableFromDate" result-name="availableFromDate"/>
<!-- create association with ProductStore.digProdUploadCategoryId -->
<entity-one entity-name="ProductStore" value-field="productStore"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Dec 30 04:14:23 2008
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field-name="contentId"/>
- <field-to-result map-name="newEntity" field-name="productId"/>
- <field-to-result map-name="newEntity" field-name="productContentTypeId"/>
+ <field-to-result map-name="newEntity" field="contentId"/>
+ <field-to-result map-name="newEntity" field="productId"/>
+ <field-to-result map-name="newEntity" field="productContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductContent" short-description="Update Content For Product">
<make-value value-field="lookupPKMap" entity-name="ProductContent"/>
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -38,7 +38,7 @@
<check-errors/>
</else>
</if-empty>
- <field-to-result field-name="productId" map-name="newEntity" result-name="productId"/>
+ <field-to-result field="productId" map-name="newEntity" result-name="productId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.createdDate"/>
@@ -547,7 +547,7 @@
<!-- create the new ProductReview -->
<sequenced-id-to-env sequence-name="ProductReview" env-name="newEntity.productReviewId"/>
- <field-to-result field-name="newEntity.productReviewId" result-name="productReviewId"/>
+ <field-to-result field="newEntity.productReviewId" result-name="productReviewId"/>
<if-empty field="newEntity.postedDateTime">
<now-timestamp-to-env env-name="newEntity.postedDateTime"/>
@@ -765,7 +765,7 @@
<set-nonpk-fields map="parameters" value-field="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"/>
+ <field-to-result field="newEntity.productMaintSeqId" result-name="productMaintSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductMaint" short-description="Update an existing Product Maintenance">
@@ -894,13 +894,13 @@
<if-empty field="error_list">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<else>
<property-to-field resource="ProductUiLabels" property="ProductPermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</else>
</if-empty>
</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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -29,7 +29,7 @@
<make-value value-field="newEntity" entity-name="ProductPromo"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="ProductPromo" env-name="newEntity.productPromoId"/>
- <field-to-result field-name="productPromoId" map-name="newEntity"/>
+ <field-to-result field="productPromoId" map-name="newEntity"/>
<if-empty field="newEntity.userEntered">
<set value="Y" set-if-empty="true" field="newEntity.userEntered"/>
@@ -84,7 +84,7 @@
<set-nonpk-fields map="parameters" value-field="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"/>
+ <field-to-result field="productPromoActionSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -157,7 +157,7 @@
<sequenced-id-to-env sequence-name="ProductPromoCode" env-name="newEntity.productPromoCodeId" stagger-max="100"/>
</if-empty>
- <field-to-result field-name="productPromoCodeId" map-name="newEntity"/>
+ <field-to-result field="productPromoCodeId" map-name="newEntity"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
<if-empty field="newEntity.fromDate">
@@ -253,7 +253,7 @@
<set-nonpk-fields map="parameters" value-field="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"/>
+ <field-to-result field="productPromoCondSeqId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -323,7 +323,7 @@
<set-nonpk-fields map="parameters" value-field="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"/>
+ <field-to-result field="productPromoRuleId" map-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml Tue Dec 30 04:14:23 2008
@@ -59,9 +59,9 @@
<get-related relation-name="FixedAssetProduct" value-name="product" list-name="productFixedAssets"/>
<if-not-empty field="productFixedAssets">
<first-from-list list="productFixedAssets" entry="productFixedAsset"/>
- <field-to-result field-name="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/>
+ <field-to-result field="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/>
</if-not-empty>
- <field-to-result field-name="parameters.productId" result-name="productId"/>
+ <field-to-result field="parameters.productId" result-name="productId"/>
</simple-method>
</simple-methods>
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -41,7 +41,7 @@
</if-empty>
<log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.facilityId" from-field="parameters.facilityId" />
- <field-to-result field-name="contactMechId" map-name="newValue"/>
+ <field-to-result field="contactMechId" map-name="newValue"/>
<field-to-request field-name="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp-to-env env-name="newValue.fromDate"/>
@@ -115,7 +115,7 @@
</if-compare-field>
<log level="info" message="Setting id to result: ${newFacilityContactMech.contactMechId}"/>
- <field-to-result field-name="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
+ <field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
<field-to-request field-name="newFacilityContactMech.contactMechId" request-name="contactMechId"/>
</simple-method>
@@ -162,7 +162,7 @@
</call-service>
<field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
<simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility">
@@ -185,7 +185,7 @@
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
<field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
<simple-method method-name="createFacilityTelecomNumber" short-description="Create a TelecomNumber for facility">
@@ -209,7 +209,7 @@
</call-service>
<field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
<simple-method method-name="updateFacilityTelecomNumber" short-description="Update a TelecomNumber for facility">
@@ -234,7 +234,7 @@
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
<field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -304,7 +304,7 @@
<create-value value-field="newEntity"/>
- <field-to-result field-name="fromDate" map-name="newEntity" result-name="fromDate"/>
+ <field-to-result field="fromDate" map-name="newEntity" result-name="fromDate"/>
</simple-method>
<simple-method method-name="deleteFacilityContactMechPurpose" short-description="Delete a facility/contact mech purpose">
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -28,7 +28,7 @@
<sequenced-id-to-env sequence-name="Facility" env-name="facilityId"/>
<to-string field-name="facilityId"/>
<set field="newEntity.facilityId" from-field="facilityId" />
- <field-to-result field-name="facilityId" result-name="facilityId"/>
+ <field-to-result field="facilityId" result-name="facilityId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -85,7 +85,7 @@
<to-string field-name="locationSeqId"/>
</if-empty>
<set field="newEntity.locationSeqId" from-field="locationSeqId" />
- <field-to-result field-name="locationSeqId" result-name="locationSeqId"/>
+ <field-to-result field="locationSeqId" result-name="locationSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -111,7 +111,7 @@
<sequenced-id-to-env sequence-name="FacilityGroup" env-name="facilityGroupId"/>
<to-string field-name="facilityGroupId"/>
<set field="newEntity.facilityGroupId" from-field="facilityGroupId" />
- <field-to-result field-name="facilityGroupId" result-name="facilityGroupId"/>
+ <field-to-result field="facilityGroupId" result-name="facilityGroupId"/>
<create-value value-field="newEntity"/>
</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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -40,7 +40,7 @@
<sequenced-id-to-env sequence-name="ProductStore" env-name="productStoreId" />
<set from-field="productStoreId" field="newEntity.productStoreId"/>
- <field-to-result field-name="productStoreId" result-name="productStoreId"/>
+ <field-to-result field="productStoreId" result-name="productStoreId"/>
<create-value value-field="newEntity"/>
<!-- create the ProductStoreFacility record -->
@@ -335,7 +335,7 @@
<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"/>
+ <field-to-result field="productStoreSurveyId" result-name="productStoreSurveyId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -405,7 +405,7 @@
<if-compare value="N" operator="equals" field="productStore.reserveInventory">
<!-- note: if not set, defaults to yes, reserve inventory -->
<log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is set to NOT reserve inventory, not reserving inventory"/>
- <field-to-result field-name="parameters.quantity" result-name="quantityNotReserved"/>
+ <field-to-result field="parameters.quantity" result-name="quantityNotReserved"/>
<return response-code="success"/>
</if-compare>
@@ -502,7 +502,7 @@
</if-compare>
</else>
</if-empty>
- <field-to-result field-name="quantityNotReserved"/>
+ <field-to-result field="quantityNotReserved"/>
</simple-method>
<simple-method method-name="isStoreInventoryRequired" short-description="Is Store Inventory Required" login-required="false">
@@ -520,7 +520,7 @@
</if-empty>
<call-simple-method method-name="isStoreInventoryRequiredInline"/>
- <field-to-result field-name="requireInventory"/>
+ <field-to-result field="requireInventory"/>
</simple-method>
<simple-method method-name="isStoreInventoryRequiredInline" short-description="Is Store Inventory Required" login-required="false">
<set from-field="product.requireInventory" field="requireInventory"/>
@@ -557,7 +557,7 @@
<then>
<log level="verbose" message="Product with id ${product.productId}, is of type ${product.productTypeId}, returning true for inventory available check"/>
<set value="Y" field="available"/>
- <field-to-result field-name="available"/>
+ <field-to-result field="available"/>
<return/>
</then>
</if>
@@ -569,7 +569,7 @@
<!-- note: if not set, defaults to yes, check inventory -->
<log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is set to NOT check inventory, returning true for inventory available check"/>
<set value="Y" field="available"/>
- <field-to-result field-name="available"/>
+ <field-to-result field="available"/>
<return/>
</if-compare>
@@ -652,7 +652,7 @@
</else>
</if-compare>
- <field-to-result field-name="available"/>
+ <field-to-result field="available"/>
<!--
/* TODO: must entire quantity be available in one location?
@@ -687,7 +687,7 @@
<if-compare field="requireInventory" operator="not-equals" value="Y">
<set value="Y" field="availableOrNotRequired"/>
- <field-to-result field-name="availableOrNotRequired"/>
+ <field-to-result field="availableOrNotRequired"/>
<else>
<set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="isStoreInventoryAvailable"/>
<call-service service-name="isStoreInventoryAvailable" in-map-name="callServiceMap">
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -28,7 +28,7 @@
<set field="newEntity.subscriptionId" from-field="parameters.subscriptionId"/>
</else>
</if-empty>
- <field-to-result field-name="newEntity.subscriptionId" result-name="subscriptionId"/>
+ <field-to-result field="newEntity.subscriptionId" result-name="subscriptionId"/>
<!-- lookup the product subscription resource (if exists) -->
<if-not-empty field="parameters.subscriptionResourceId">
@@ -68,25 +68,25 @@
<else>
<set field="found" value="true" type="Boolean"/>
<first-from-list entry="subscription" list="pfResultList"/>
- <field-to-result field-name="subscription.subscriptionId" result-name="subscriptionId"/>
+ <field-to-result field="subscription.subscriptionId" result-name="subscriptionId"/>
</else>
</if-empty>
- <field-to-result field-name="found" result-name="isSubscribed"/>
+ <field-to-result field="found" result-name="isSubscribed"/>
</simple-method>
<simple-method method-name="getSubscription" short-description="Get Subscription data">
<entity-one entity-name="Subscription" value-field="subscription"/>
- <field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/>
+ <field-to-result field="parameters.subscriptionId" result-name="subscriptionId"/>
<if-not-empty field="subscription">
- <field-to-result field-name="subscription" result-name="subscription"/>
+ <field-to-result field="subscription" result-name="subscription"/>
</if-not-empty>
</simple-method>
<simple-method method-name="createSubscriptionResource" short-description="Create a SubscriptionResource">
<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"/>
+ <field-to-result field="newEntity.subscriptionResourceId" result-name="subscriptionResourceId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -113,7 +113,7 @@
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="updateSubscriptionAttribute" short-description="Create (when not exist) or update (when exist) a Subscription attribute">
- <field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/>
+ <field-to-result field="parameters.subscriptionId" result-name="subscriptionId"/>
<entity-one entity-name="SubscriptionAttribute" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue">
<make-value entity-name="SubscriptionAttribute" value-field="newEntity"/>
@@ -153,7 +153,7 @@
<then>
<if-has-permission permission="CATALOG_READ">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
</if-has-permission>
</then>
</if>
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -85,6 +85,6 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
</entity-and>
- <field-to-result field-name="supplierProductFeatures"/>
+ <field-to-result field="supplierProductFeatures"/>
</simple-method>
</simple-methods>
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -31,7 +31,7 @@
<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"/>
+ <field-to-result field="itemIssuanceId" map-name="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<now-timestamp-to-env env-name="newEntity.issuedDateTime"/>
@@ -197,7 +197,7 @@
<if-compare value="0" operator="greater-equals" field="qtyForShipmentItem" type="Double">
<!-- remove the orderShipment.quantity -->
<if-not-empty field="orderShipment">
- <field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
+ <field-to-result field="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
<make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
<set-pk-fields value-field="shipmentItemLookupPk" map="parameters"/>
<set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
@@ -219,7 +219,7 @@
</calcop>
</calculate>
<store-value value-name="orderShipment"/>
- <field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
+ <field-to-result field="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/>
<make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
<set-pk-fields value-field="shipmentItemLookupPk" map="parameters"/>
<set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
@@ -304,7 +304,7 @@
<store-value value-name="shipmentItem"/>
</else>
</if-empty>
- <field-to-result field-name="shipmentItemSeqId" map-name="shipmentItem" result-name="shipmentItemSeqId"/>
+ <field-to-result field="shipmentItemSeqId" map-name="shipmentItem" result-name="shipmentItemSeqId"/>
</simple-method>
<simple-method method-name="callCreateItemIssuance" short-description="Call Create ItemIssuance - meant to be called in-line">
<!-- create the ItemIssuance -->
@@ -328,7 +328,7 @@
<call-service service-name="createItemIssuance" in-map-name="itemIssuanceCreate">
<result-to-field result-name="itemIssuanceId"/>
</call-service>
- <field-to-result field-name="itemIssuanceId"/>
+ <field-to-result field="itemIssuanceId"/>
</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 -->
@@ -371,7 +371,7 @@
<call-service service-name="createItemIssuance" in-map-name="itemIssuanceCreate">
<result-to-field result-name="itemIssuanceId"/>
</call-service>
- <field-to-result field-name="itemIssuanceId"/>
+ <field-to-result field="itemIssuanceId"/>
<!-- Decrement InventoryItem quantityOnHand AND availableToPromise since there was no reservation -->
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
@@ -502,7 +502,7 @@
</else>
</if-compare>
- <field-to-result field-name="toCancelQuantity" result-name="canceledQuantity"/>
+ <field-to-result field="toCancelQuantity" result-name="canceledQuantity"/>
</simple-method>
<simple-method method-name="issueInventoryItemToShipment" short-description="Issue InventoryItem To Shipment">
@@ -542,7 +542,7 @@
<call-service service-name="createItemIssuance" in-map-name="itemIssuanceCreate">
<result-to-field result-name="itemIssuanceId"/>
</call-service>
- <field-to-result field-name="itemIssuanceId"/>
+ <field-to-result field="itemIssuanceId"/>
<set field="createDetailMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -308,8 +308,8 @@
</if-not-empty>
</iterate>
- <field-to-result field-name="pickMoveByShipmentMethodInfoList"/>
- <field-to-result field-name="rushOrderInfo"/>
+ <field-to-result field="pickMoveByShipmentMethodInfoList"/>
+ <field-to-result field="rushOrderInfo"/>
</simple-method>
<simple-method method-name="assembleOrderHeaderInfoInline" short-description="assembleOrderHeaderInfoInline">
@@ -493,7 +493,7 @@
<call-service service-name="createPicklist" in-map-name="createPicklistMap">
<result-to-field result-name="picklistId"/>
</call-service>
- <field-to-result field-name="picklistId"/>
+ <field-to-result field="picklistId"/>
<log level="info" message="Created Picklist with ID ${picklistId}"/>
<!-- iterate over the orderHeaderInfoList and create a PicklistBin for each order and a PicklistItem for each item -->
@@ -582,7 +582,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="Picklist" env-name="newEntity.picklistId"/>
- <field-to-result field-name="newEntity.picklistId" result-name="picklistId"/>
+ <field-to-result field="newEntity.picklistId" result-name="picklistId"/>
<if-empty field="newEntity.statusId">
<set value="PICKLIST_INPUT" field="newEntity.statusId"/>
@@ -631,7 +631,7 @@
<check-errors/>
<!-- finally before setting nonpk fields, set the oldStatusId -->
- <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/>
+ <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
<!-- now that all changes have been checked, set the nonpks -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -662,7 +662,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id-to-env sequence-name="PicklistBin" env-name="newEntity.picklistBinId"/>
- <field-to-result field-name="newEntity.picklistBinId" result-name="picklistBinId"/>
+ <field-to-result field="newEntity.picklistBinId" result-name="picklistBinId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -733,7 +733,7 @@
<check-errors/>
<!-- finally before setting nonpk fields, set the oldItemStatusId -->
- <field-to-result field-name="lookedUpValue.itemStatusId" result-name="oldItemStatusId"/>
+ <field-to-result field="lookedUpValue.itemStatusId" result-name="oldItemStatusId"/>
<!-- now that all changes have been checked, set the nonpks -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -826,7 +826,7 @@
<field-to-list field-name="picklistInfo" list-name="picklistInfoList"/>
</iterate>
- <field-to-result field-name="picklistInfoList"/>
+ <field-to-result field="picklistInfoList"/>
</simple-method>
<simple-method method-name="getPickAndPackReportInfo" short-description="getPickAndPackReportInfo">
@@ -844,7 +844,7 @@
<!-- Get the general information for the picklist, this will be used for the pack sheets -->
<entity-one entity-name="Picklist" value-field="picklist" auto-field-map="true"/>
<call-simple-method method-name="getPicklistSingleInfoInline"/>
- <field-to-result field-name="picklistInfo"/>
+ <field-to-result field="picklistInfo"/>
<!-- Assemble the information per facility location for the pick sheet -->
<iterate entry="picklistBinInfo" list="picklistInfo.picklistBinInfoList">
@@ -1003,8 +1003,8 @@
<set from-field="productInfo" field="noLocationProductInfoList[]"/>
</iterate>
- <field-to-result field-name="facilityLocationInfoList"/>
- <field-to-result field-name="noLocationProductInfoList"/>
+ <field-to-result field="facilityLocationInfoList"/>
+ <field-to-result field="noLocationProductInfoList"/>
</simple-method>
<simple-method method-name="getPicklistSingleInfoInline" short-description="getPicklistSingleInfoInline">
@@ -1126,12 +1126,12 @@
<!-- This creates facilityLocationInfoList and inventoryItemInfoList -->
<call-simple-method method-name="assembleFacilityLocationInfoInline"/>
- <field-to-result field-name="orderHeaderInfoList"/>
- <field-to-result field-name="wrongQuantityReservedList"/>
- <field-to-result field-name="insufficientQohList"/>
+ <field-to-result field="orderHeaderInfoList"/>
+ <field-to-result field="wrongQuantityReservedList"/>
+ <field-to-result field="insufficientQohList"/>
- <field-to-result field-name="facilityLocationInfoList"/>
- <field-to-result field-name="inventoryItemInfoList"/>
+ <field-to-result field="facilityLocationInfoList"/>
+ <field-to-result field="inventoryItemInfoList"/>
</simple-method>
<simple-method method-name="assembleFacilityLocationInfoInline" short-description="assembleFacilityLocationInfoInline">
<!-- This uses inventoryItems, inventoryItemOrderItems, inventoryItemQuantities -->
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -30,7 +30,7 @@
<sequenced-id-to-env sequence-name="ShipmentReceipt" env-name="receiptId"/>
<to-string field-name="receiptId"/>
<set field="newEntity.receiptId" from-field="receiptId"/>
- <field-to-result field-name="receiptId" result-name="receiptId"/>
+ <field-to-result field="receiptId" result-name="receiptId"/>
<if-empty field="newEntity.datetimeReceived">
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -184,7 +184,7 @@
<set field="successMessageList[]" value="Received ${parameters.quantityAccepted} of ${parameters.productId} in inventory item ${currentInventoryItemId}"/>
</loop>
<!-- return the last inventory item received -->
- <field-to-result field-name="currentInventoryItemId" result-name="inventoryItemId"/>
+ <field-to-result field="currentInventoryItemId" result-name="inventoryItemId"/>
</simple-method>
<simple-method method-name="quickReceiveReturn" short-description="Quick Receive Entire Return">
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -36,7 +36,7 @@
<sequenced-id-to-env sequence-name="Shipment" env-name="newEntity.shipmentId"/>
</else>
</if-not-empty>
- <field-to-result field-name="newEntity.shipmentId" result-name="shipmentId"/>
+ <field-to-result field="newEntity.shipmentId" result-name="shipmentId"/>
<!-- set the created and lastModified info -->
<now-timestamp-to-env env-name="newEntity.createdDate"/>
@@ -114,7 +114,7 @@
<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 -->
- <field-to-result field-name="lookedUpValue.shipmentTypeId" result-name="shipmentTypeId"/>
+ <field-to-result field="lookedUpValue.shipmentTypeId" result-name="shipmentTypeId"/>
<if-not-empty field="parameters.statusId">
<if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
@@ -232,16 +232,16 @@
</if>
<!-- finally before setting nonpk fields, set the oldStatusId, oldPrimaryOrderId, oldOriginFacilityId, oldDestinationFacilityId -->
- <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/>
- <field-to-result field-name="lookedUpValue.primaryOrderId" result-name="oldPrimaryOrderId"/>
- <field-to-result field-name="lookedUpValue.originFacilityId" result-name="oldOriginFacilityId"/>
- <field-to-result field-name="lookedUpValue.destinationFacilityId" result-name="oldDestinationFacilityId"/>
+ <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
+ <field-to-result field="lookedUpValue.primaryOrderId" result-name="oldPrimaryOrderId"/>
+ <field-to-result field="lookedUpValue.originFacilityId" result-name="oldOriginFacilityId"/>
+ <field-to-result field="lookedUpValue.destinationFacilityId" result-name="oldDestinationFacilityId"/>
<!-- now that all changes have been checked, set the nonpks -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<now-timestamp-to-env env-name="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
- <field-to-result field-name="lookedUpValue.shipmentId" result-name="shipmentId"/>
+ <field-to-result field="lookedUpValue.shipmentId" result-name="shipmentId"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteShipment" short-description="Delete Shipment">
@@ -296,7 +296,7 @@
<result-to-field result-name="shipmentId"/>
</call-service>
- <field-to-result field-name="shipmentId"/>
+ <field-to-result field="shipmentId"/>
</simple-method>
<simple-method method-name="createShipmentAndItemsForReturn" short-description="Create Shipment and ShipmentItems based on ReturnHeader and ReturnItems">
@@ -328,7 +328,7 @@
<call-service service-name="createReturnItemShipment" in-map-name="shipItemCtx"/>
</iterate>
- <field-to-result field-name="shipmentId"/>
+ <field-to-result field="shipmentId"/>
</simple-method>
<simple-method method-name="createShipmentAndItemsForVendorReturn" short-description="Create Shipment and ShipmentItems based on primaryReturnId for Vendor return">
@@ -360,7 +360,7 @@
<call-service service-name="createReturnItemShipment" in-map-name="shipItemCtx"/>
</iterate>
- <field-to-result field-name="shipmentId"/>
+ <field-to-result field="shipmentId"/>
</simple-method>
<simple-method method-name="setShipmentSettingsFromPrimaryOrder" short-description="Set Shipment Settings From Primary Order">
@@ -791,7 +791,7 @@
<set-nonpk-fields map="parameters" value-field="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"/>
- <field-to-result field-name="shipmentItemSeqId" map-name="newEntity" result-name="shipmentItemSeqId"/>
+ <field-to-result field="shipmentItemSeqId" map-name="newEntity" result-name="shipmentItemSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateShipmentItem" short-description="Update ShipmentItem">
@@ -899,7 +899,7 @@
</if-compare>
</iterate>
- <field-to-result field-name="newShipmentItemSeqId"/>
+ <field-to-result field="newShipmentItemSeqId"/>
</simple-method>
<!-- ShipmentPackage services -->
@@ -921,7 +921,7 @@
<!-- if no shipmentPackageSeqId, generate one based on existing items, ie one greater than the current higher number -->
<make-next-seq-id value-name="newEntity" seq-field-name="shipmentPackageSeqId"/>
- <field-to-result field-name="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
+ <field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
<now-timestamp-to-env env-name="newEntity.dateCreated"/>
@@ -996,7 +996,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
- <field-to-result field-name="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
+ <field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
</simple-method>
<simple-method method-name="updateShipmentPackageContent" short-description="Update ShipmentPackageContent">
<check-permission permission="FACILITY" action="_UPDATE">
@@ -1051,7 +1051,7 @@
</else>
</if-empty>
<log level="info" message="Shipment package: ${newEntity}"/>
- <field-to-result field-name="newEntity.shipmentPackageSeqId" result-name="shipmentPackageSeqId"/>
+ <field-to-result field="newEntity.shipmentPackageSeqId" result-name="shipmentPackageSeqId"/>
</simple-method>
<!-- ShipmentPackageRouteSeg services -->
@@ -1147,7 +1147,7 @@
<!-- if no shipmentRouteSegmentSeqId, generate one based on existing items, ie one greater than the current higher number -->
<make-next-seq-id value-name="newEntity" seq-field-name="shipmentRouteSegmentId"/>
- <field-to-result field-name="shipmentRouteSegmentId" map-name="newEntity" result-name="shipmentRouteSegmentId"/>
+ <field-to-result field="shipmentRouteSegmentId" map-name="newEntity" result-name="shipmentRouteSegmentId"/>
<if-empty field="newEntity.carrierServiceStatusId">
<set value="SHRSCS_NOT_STARTED" field="newEntity.carrierServiceStatusId"/>
@@ -1349,8 +1349,8 @@
</iterate>
<log level="info" message="Finished quickShipEntireOrder:\nshipmentShipGroupFacilityList=${shipmentShipGroupFacilityList}\nsuccessMessageList=${successMessageList}"/>
- <field-to-result field-name="shipmentShipGroupFacilityList"/>
- <field-to-result field-name="successMessageList"/>
+ <field-to-result field="shipmentShipGroupFacilityList"/>
+ <field-to-result field="successMessageList"/>
<if-empty field="shipmentShipGroupFacilityList">
<add-error><fail-message message="Warning: no shipments created; could not find anything ready and needing to be shipped."/></add-error>
@@ -1374,7 +1374,7 @@
<set value="PURCH_SHIP_RECEIVED" field="updateShipmentContext.statusId"/>
<call-service service-name="updateShipment" in-map-name="updateShipmentContext"/>
<check-errors/>
- <field-to-result field-name="shipmentId" result-name="shipmentId"/>
+ <field-to-result field="shipmentId" result-name="shipmentId"/>
<!-- Iterate through the order items in the ship group -->
<entity-and entity-name="OrderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
@@ -1606,7 +1606,7 @@
</if-compare>
</if-not-empty>
</iterate>
- <field-to-result field-name="shipmentId" map-name="parameters"/>
+ <field-to-result field="shipmentId" map-name="parameters"/>
</iterate>
</simple-method>
@@ -1829,7 +1829,7 @@
<call-service service-name="updateShipment" in-map-name="packedContext"/>
</if-empty>
- <field-to-result field-name="shipment.shipmentId" result-name="shipmentId"/>
+ <field-to-result field="shipment.shipmentId" result-name="shipmentId"/>
</simple-method>
<simple-method method-name="removeOrderShipmentFromShipment" short-description="Delete an OrderShipment and updates the ShipmentItem">
@@ -1979,7 +1979,7 @@
<calcop field-name="totPlannedOrIssuedQuantity" operator="get"/>
</calcop>
</calculate>
- <field-to-result field-name="remainingQuantity"/>
+ <field-to-result field="remainingQuantity"/>
</simple-method>
<simple-method method-name="checkCancelItemIssuanceAndOrderShipmentFromShipment" short-description="Check Shipment Items and Cancel Item Issuance and Order Shipment">
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Tue Dec 30 04:14:23 2008
@@ -151,7 +151,7 @@
<if-not-empty field="roleParties">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<log level="info" message="Party ${userLogin.partyId} is in ${lookupRoleWorkEffortMap.roleTypeId} role with workEffort: ${workEffortId}"/>
<clear-field field="workEffortId"/>
@@ -159,8 +159,8 @@
<log level="info" message="Party ${userLogin.partyId} is not in ${roleTypeId} role with workEffort: ${workEffortId}"/>
<property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
<!-- recurse through all parents -->
<set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
@@ -192,7 +192,7 @@
<if-not-empty field="roleParties">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<log level="info" message="Party ${userLogin.partyId} is associated with workEffort: ${workEffortId}"/>
<clear-field field="workEffortId"/>
@@ -200,8 +200,8 @@
<log level="info" message="Party ${userLogin.partyId} is not associated with workEffort: ${workEffortId}"/>
<property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
<!-- recurse through all parents -->
<set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
@@ -224,8 +224,8 @@
<if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
<property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</if-compare-field>
<if-not-empty field="workEffortId">
<set from-field="workEffortId" field="lookupRoleWorkEffortMap.workEffortId"/>
@@ -235,8 +235,8 @@
<if-empty field="roleParties">
<property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
</if-empty>
</if-not-empty>
</simple-method>
@@ -279,7 +279,7 @@
<log level="always" message="Found role parties relations: ${partyGroupRelationships}"/>
<if-not-empty field="partyGroupRelationships">
<set field="hasPermission" type="Boolean" value="true"/>
- <field-to-result field-name="hasPermission"/>
+ <field-to-result field="hasPermission"/>
<log level="info" message="Party ${userLogin.partyId} is associated with workEffort: ${workEffortId}"/>
</if-not-empty>
</iterate>
@@ -288,8 +288,8 @@
<log level="info" message="Party ${userLogin.partyId} is not associated with workEffort: ${workEffortId}"/>
<property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
- <field-to-result field-name="hasPermission"/>
- <field-to-result field-name="failMessage"/>
+ <field-to-result field="hasPermission"/>
+ <field-to-result field="failMessage"/>
<!-- recurse through all parents -->
<set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
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=730116&r1=730115&r2=730116&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 04:14:23 2008
@@ -25,7 +25,7 @@
<simple-method method-name="createTimesheet" short-description="Create Timesheet">
<make-value value-field="newEntity" entity-name="Timesheet"/>
<sequenced-id-to-env sequence-name="Timesheet" env-name="newEntity.timesheetId"/>
- <field-to-result field-name="newEntity.timesheetId" result-name="timesheetId"/>
+ <field-to-result field="newEntity.timesheetId" result-name="timesheetId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusId">
@@ -95,7 +95,7 @@
<call-service service-name="createInvoice" in-map-name="createInvoiceMap">
<result-to-field result-name="invoiceId"/>
</call-service>
- <field-to-result field-name="invoiceId"/>
+ <field-to-result field="invoiceId"/>
<else>
<set field="invoiceId" from-field="parameters.invoiceId"/>
</else>
@@ -120,7 +120,7 @@
<call-service service-name="createInvoice" in-map-name="createInvoiceMap">
<result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/>
</call-service>
- <field-to-result field-name="parameters.invoiceId" result-name="invoiceId"/>
+ <field-to-result field="parameters.invoiceId" result-name="invoiceId"/>
</if-empty>
<entity-one entity-name="Invoice" value-field="invoice"/>
<if-empty field="invoice">
@@ -300,7 +300,7 @@
<make-value value-field="newEntity" entity-name="TimeEntry"/>
<sequenced-id-to-env sequence-name="TimeEntry" env-name="newEntity.timeEntryId"/>
- <field-to-result field-name="newEntity.timeEntryId" result-name="timeEntryId"/>
+ <field-to-result field="newEntity.timeEntryId" result-name="timeEntryId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -332,7 +332,7 @@
</simple-method>
<simple-method method-name="unlinkInvoiceFromTimeEntry" short-description="Delete TimeEntry">
<entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
- <field-to-result field-name="invoiceId" map-name="lookedUpValue"/>
+ <field-to-result field="invoiceId" map-name="lookedUpValue"/>
<clear-field field="lookedUpValue.invoiceId"/>
<store-value value-name="lookedUpValue"/>
</simple-method>