You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:07:17 UTC
svn commit: r730111 [4/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accountin...
Modified: ofbiz/trunk/applications/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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -32,12 +32,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateCostComponent" short-description="Update a CostComponent">
- <entity-one entity-name="CostComponent" value-name="costComponent"/>
+ <entity-one entity-name="CostComponent" value-field="costComponent"/>
<set-nonpk-fields map="parameters" value-field="costComponent"/>
<store-value value-name="costComponent"/>
</simple-method>
<simple-method method-name="deleteCostComponent" short-description="Delete a CostComponent">
- <entity-one entity-name="CostComponent" value-name="costComponent"/>
+ <entity-one entity-name="CostComponent" value-field="costComponent"/>
<remove-value value-name="costComponent"/>
</simple-method>
<simple-method method-name="cancelCostComponents" short-description="Cancels CostComponents">
@@ -109,7 +109,7 @@
</calculate>
<!-- if the cost is zero, and the product is a variant, get the cost of the virtual -->
<if-compare field="productCost" operator="equals" value="0" type="Double">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set from-field="product.productId" field="assocAndMap.productIdTo"/>
<set value="PRODUCT_VARIANT" field="assocAndMap.productAssocTypeId"/>
<find-by-and entity-name="ProductAssoc" map-name="assocAndMap" list-name="virtualAssocs"/>
@@ -190,7 +190,7 @@
</calcop>
</calculate>
- <entity-one entity-name="WorkEffort" value-name="task"/>
+ <entity-one entity-name="WorkEffort" value-field="task"/>
<if-not-empty field="task">
<get-related-one value-name="task" relation-name="FixedAsset" to-value-name="fixedAsset"/>
<set from-field="parameters.currencyUomId" field="costsAndMap.amountUomId"/>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -36,7 +36,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureCategory you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ProductFeatureCategory" value-name="productFeatureCategory"/>
+ <entity-one entity-name="ProductFeatureCategory" value-field="productFeatureCategory"/>
<set-nonpk-fields value-field="productFeatureCategory" map="parameters"/>
<store-value value-name="productFeatureCategory"/>
</simple-method>
@@ -61,7 +61,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeature you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ProductFeature" value-name="productFeature"/>
+ <entity-one entity-name="ProductFeature" value-field="productFeature"/>
<set-nonpk-fields map="parameters" value-field="productFeature"/>
<store-value value-name="productFeature"/>
</simple-method>
@@ -86,7 +86,7 @@
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
- <entity-one entity-name="ProductFeatureAppl" value-name="productFeatureAppl"/>
+ <entity-one entity-name="ProductFeatureAppl" value-field="productFeatureAppl"/>
<set-nonpk-fields map="parameters" value-field="productFeatureAppl"/>
<store-value value-name="productFeatureAppl"/>
</simple-method>
@@ -96,7 +96,7 @@
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
- <entity-one entity-name="ProductFeatureAppl" value-name="productFeatureAppl"/>
+ <entity-one entity-name="ProductFeatureAppl" value-field="productFeatureAppl"/>
<!-- This is old code that just sets the thru date; the current codes actually removes the db row
<if-empty field="parameters.thruDate">
<now-timestamp-to-env env-name="nowStamp"/>
@@ -219,7 +219,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureGroup you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ProductFeatureGroup" value-name="productFeatureGroup"/>
+ <entity-one entity-name="ProductFeatureGroup" value-field="productFeatureGroup"/>
<set-nonpk-fields map="parameters" value-field="productFeatureGroup"/>
<store-value value-name="productFeatureGroup"/>
</simple-method>
@@ -350,7 +350,7 @@
<fail-message message="Security Error: to run updateProductFeatureApplAttr you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="ProductFeatureApplAttr" value-name="productFeatureApplAttr" auto-field-map="true"/>
+ <entity-one entity-name="ProductFeatureApplAttr" value-field="productFeatureApplAttr" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="productFeatureApplAttr"/>
<store-value value-name="productFeatureApplAttr"/>
@@ -363,7 +363,7 @@
<fail-message message="Security Error: to run removeProductFeatureApplAttr you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/>
</check-permission>
<check-errors/>
- <entity-one entity-name="ProductFeatureApplAttr" value-name="productFeatureApplAttr" auto-field-map="true"/>
+ <entity-one entity-name="ProductFeatureApplAttr" value-field="productFeatureApplAttr" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="productFeatureApplAttr"/>
<check-errors/>
@@ -393,7 +393,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFeaturePrice" short-description="Update a feature price">
- <entity-one entity-name="ProductFeaturePrice" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductFeaturePrice" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Dec 30 04:07:14 2008
@@ -21,9 +21,9 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="issueImmediatelyFulfilledOrder" short-description="Issues the Inventory for an Order that was Immediately Fulfilled" login-required="false">
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
- <entity-one entity-name="ProductStore" value-name="productStore">
+ <entity-one entity-name="ProductStore" value-field="productStore">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
@@ -62,7 +62,7 @@
</simple-method>
<simple-method method-name="issueImmediatelyFulfilledOrderItem" short-description="Issues the Inventory for an Order Item that was Immediately Fulfilled" login-required="false">
<if-empty field="parameters.orderItem">
- <entity-one entity-name="OrderItem" value-name="orderItem"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem"/>
<else>
<set field="orderItem" from-field="parameters.orderItem" />
</else>
@@ -74,7 +74,7 @@
<!-- NOTE: the inventory will be issued from the OrderHeader.originFacilityId -->
<if-empty field="parameters.orderHeader">
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<else>
<set field="orderHeader" from-field="parameters.orderHeader" />
</else>
@@ -82,7 +82,7 @@
<!-- get the ProductStore to fund the reserveOrderEnumId -->
<if-empty field="parameters.productStore">
- <entity-one entity-name="ProductStore" value-name="productStore">
+ <entity-one entity-name="ProductStore" value-field="productStore">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<else>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -37,13 +37,13 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- check the product; make sure its a physical item -->
- <entity-one entity-name="Product" value-name="product"/>
- <entity-one entity-name="Facility" value-name="facility" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product"/>
+ <entity-one entity-name="Facility" value-field="facility" use-cache="true"/>
<get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/>
<if-compare field="productType.isPhysical" operator="equals" value="N">
<set field="parameters.quantityNotReserved" value="0" type="Double"/>
<else>
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<!-- before we do the find, put together the orderBy list based on which reserveOrderEnumId is specified -->
<!-- FIFO=first in first out, so it should be order by ASCending receive or expire date
@@ -208,7 +208,7 @@
<clear-field field="createInventoryItemInMap"/>
<clear-field field="createInventoryItemOutMap"/>
<!-- the createInventoryItem service is run by the the system user here -->
- <entity-one entity-name="UserLogin" value-name="permUserLogin">
+ <entity-one entity-name="UserLogin" value-field="permUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set from-field="parameters.productId" field="createInventoryItemInMap.productId"/>
@@ -219,7 +219,7 @@
<call-service service-name="createInventoryItem" in-map-name="createInventoryItemInMap" include-user-login="false">
<result-to-field result-name="inventoryItemId" field-name="createInventoryItemOutMap.inventoryItemId"/>
</call-service>
- <entity-one entity-name="InventoryItem" value-name="newNonSerInventoryItem">
+ <entity-one entity-name="InventoryItem" value-field="newNonSerInventoryItem">
<field-map field-name="inventoryItemId" from-field="createInventoryItemOutMap.inventoryItemId"/>
</entity-one>
@@ -287,7 +287,7 @@
Let me find the reservation on this inventory, cancel it and re-reserve something else for the other order.
This way I'll get what I want and the other orderItem will also have a similar thing to issue.
-->
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<set field="facilityId" from-field="inventoryItem.facilityId"/>
<set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId">
@@ -485,9 +485,9 @@
</simple-method>
<simple-method method-name="reserveOrderItemInventory" short-description="Reserve Order Item Inventory">
- <entity-one entity-name="OrderItemShipGrpInvRes" value-name="checkOisgirEntity"/>
+ <entity-one entity-name="OrderItemShipGrpInvRes" value-field="checkOisgirEntity"/>
- <entity-one entity-name="OrderItem" value-name="orderItem"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem"/>
<set field="parameters.promisedDatetime" from-field="orderItem.shipBeforeDate"/>
<set field="parameters.currentPromisedDate" from-field="orderItem.shipBeforeDate"/>
@@ -591,7 +591,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="cancelOrderItemShipGrpInvRes" short-description="Cancel An Inventory Reservation">
- <entity-one entity-name="OrderItemShipGrpInvRes" value-name="orderItemShipGrpInvRes"/>
+ <entity-one entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvRes"/>
<get-related-one relation-name="InventoryItem" value-name="orderItemShipGrpInvRes" to-value-name="inventoryItem"/>
<if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId">
<log level="verbose" message="Serialized inventory re-enabled."/>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -136,7 +136,7 @@
</simple-method>
<simple-method method-name="inventoryItemCheckSetDefaultValues" short-description="Check and, if empty, fills with default values ownerPartyId, currencyUomId, unitCost" login-required="false">
<if-empty field="inventoryItem">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<set field="updateInventoryItem" value="Y"/>
</if-empty>
<!-- if all the inventoryItem's fields are already filled, return with success -->
@@ -274,7 +274,7 @@
<!-- make sure the current productId is set, if not passed in look up the current value -->
<if-empty field="inventoryItemStatus.productId">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<set field="inventoryItemStatus.productId" from-field="inventoryItem.productId"/>
</if-empty>
@@ -293,7 +293,7 @@
<!-- set the effectiveDate; if from an ItemIssuance lookup the issuedDateTime -->
<if-not-empty field="parameters.itemIssuanceId">
- <entity-one entity-name="ItemIssuance" value-name="itemIssuance"/>
+ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
<set field="newEntity.effectiveDate" from-field="itemIssuance.issuedDateTime"/>
<else>
<now-timestamp-to-env env-name="newEntity.effectiveDate"/>
@@ -307,8 +307,8 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateInventoryItemFromDetail" short-description="Update an InventoryItem From the Associated Detail Records" login-required="false">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
- <entity-one entity-name="InventoryItemDetailSummary" value-name="inventoryItemDetailSummary"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
+ <entity-one entity-name="InventoryItemDetailSummary" value-field="inventoryItemDetailSummary"/>
<set field="inventoryItem.availableToPromiseTotal" from-field="inventoryItemDetailSummary.availableToPromiseTotal"/>
<set field="inventoryItem.quantityOnHandTotal" from-field="inventoryItemDetailSummary.quantityOnHandTotal"/>
@@ -316,7 +316,7 @@
</simple-method>
<simple-method method-name="updateSerializedInventoryTotals" short-description="Update the totals on serialized inventory">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<if-compare field="inventoryItem.inventoryItemTypeId" value="SERIALIZED_INV_ITEM" operator="equals">
<if>
<!-- available -->
@@ -680,7 +680,7 @@
<set field="availableToPromiseTotal" value="0" type="Double"/>
<set field="quantityOnHandTotal" value="0" type="Double"/>
<set from-field="parameters.productId" field="lookupMktgPkgParams.productId"/>
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<if-compare field="product.productTypeId" operator="equals" value="MARKETING_PKG_AUTO">
<set value="MANUF_COMPONENT" field="lookupMktgPkgParams.type"/>
<else>
@@ -706,7 +706,7 @@
</simple-method>
<simple-method method-name="balanceInventoryItems" short-description="Balances available-to-promise on inventory items">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<!-- find all items which have a negative ATP -->
<entity-condition entity-name="BalanceInventoryItemsView" list-name="inventoryItems">
@@ -950,7 +950,7 @@
</simple-method>
<simple-method method-name="balanceOrderItemsWithNegativeReservations" short-description="To balance order items with negative reservations">
- <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="true"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/>
<get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-name="productStore"/>
<if-compare field="productStore.balanceResOnOrderCreation" operator="equals" value="Y">
<entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list-name="oisgirais">
@@ -1000,7 +1000,7 @@
<if-not-empty field="parameters.statusId">
<if-compare-field field="parameters.statusId" to-field="inventoryTransfer.statusId" operator="not-equals">
<!-- make sure a StatusValidChange record exists, if not return error -->
- <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
<field-map from-field="inventoryTransfer.statusId" field-name="statusId"/>
<field-map from-field="parameters.statusId" field-name="statusIdTo"/>
</entity-one>
@@ -1023,8 +1023,8 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- check the product; make sure its a physical item -->
- <entity-one entity-name="Product" value-name="product"/>
- <entity-one entity-name="Facility" value-name="facility" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product"/>
+ <entity-one entity-name="Facility" value-field="facility" use-cache="true"/>
<get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/>
<if-compare field="productType.isPhysical" operator="equals" value="N">
<set field="quantityNotTransferred" value="0" type="Double"/>
@@ -1193,12 +1193,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateInventoryItemLabelType" short-description="Update an InventoryItemLabelType">
- <entity-one entity-name="InventoryItemLabelType" value-name="lookedUpValue"/>
+ <entity-one entity-name="InventoryItemLabelType" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteInventoryItemLabelType" short-description="Delete an InventoryItemLabelType">
- <entity-one entity-name="InventoryItemLabelType" value-name="lookedUpValue"/>
+ <entity-one entity-name="InventoryItemLabelType" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createInventoryItemLabel" short-description="Create an InventoryItemLabel">
@@ -1208,29 +1208,29 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateInventoryItemLabel" short-description="Update an InventoryItemLabel">
- <entity-one entity-name="InventoryItemLabel" value-name="lookedUpValue"/>
+ <entity-one entity-name="InventoryItemLabel" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteInventoryItemLabel" short-description="Delete an InventoryItemLabel">
- <entity-one entity-name="InventoryItemLabel" value-name="lookedUpValue"/>
+ <entity-one entity-name="InventoryItemLabel" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createInventoryItemLabelAppl" short-description="Create an InventoryItemLabelAppl">
<make-value entity-name="InventoryItemLabelAppl" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/>
+ <entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/>
<set field="newEntity.inventoryItemLabelTypeId" from-field="inventoryItemLabel.inventoryItemLabelTypeId"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateInventoryItemLabelAppl" short-description="Update an InventoryItemLabel">
- <entity-one entity-name="InventoryItemLabelAppl" value-name="lookedUpValue"/>
+ <entity-one entity-name="InventoryItemLabelAppl" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteInventoryItemLabelAppl" short-description="Delete an InventoryItemLabel">
- <entity-one entity-name="InventoryItemLabelAppl" value-name="lookedUpValue"/>
+ <entity-one entity-name="InventoryItemLabelAppl" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -1239,7 +1239,7 @@
<log level="info" message="====================Create physical inventory and variance test case================================"/>
<set field="createPhysicalInventoryAndVarianceMap.inventoryItemId" value="9024"/>
<set field="createPhysicalInventoryAndVarianceMap.varianceReasonId" value="VAR_LOST"/>
- <entity-one entity-name="UserLogin" value-name="createPhysicalInventoryAndVarianceMap.userLogin">
+ <entity-one entity-name="UserLogin" value-field="createPhysicalInventoryAndVarianceMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createPhysicalInventoryAndVariance" in-map-name="createPhysicalInventoryAndVarianceMap">
@@ -1255,7 +1255,7 @@
<check-errors/>
</simple-method>
<simple-method method-name="changeOwnerUponIssuance" short-description="If product store setOwnerUponIssuance is Y or empty, set the inventory item owner upon issuance.">
- <entity-one entity-name="ItemIssuance" value-name="itemIssuance"/>
+ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
<get-related-one value-name="itemIssuance" relation-name="InventoryItem" to-value-name="inventoryItem"/>
<if-not-empty field="inventoryItem">
<if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
@@ -1265,7 +1265,7 @@
<set field="orderRoleAndMap.roleTypeId" value="END_USER_CUSTOMER"/>
<find-by-and entity-name="OrderRole" list-name="orderRoles" map-name="orderRoleAndMap"/>
<first-from-list list="orderRoles" entry="orderRole"/>
- <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
+ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<if>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -69,10 +69,10 @@
<clear-field field="productId"/>
<iterate-map key-name="productId" value-name="perProductOiirailList" map-name="oiirailByProdMap">
<!-- get product -->
- <entity-one entity-name="Product" value-name="moveInfo.product"/>
+ <entity-one entity-name="Product" value-field="moveInfo.product"/>
<!-- get facilityLocationFrom -->
- <entity-one entity-name="FacilityLocation" value-name="moveInfo.facilityLocationFrom">
+ <entity-one entity-name="FacilityLocation" value-field="moveInfo.facilityLocationFrom">
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="locationSeqId" from-field="locationSeqId"/>
</entity-one>
@@ -445,7 +445,7 @@
</iterate>
<iterate-map key-name="inventoryItemId" value-name="orderItemShipGrpInvResAndItemLocationList" map-name="oiirailByInvItemMap">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<!-- if this is a serialized InventoryItem, then just update the location -->
<if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="prepareProductDimensionData" short-description="">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<if-empty field="product">
<add-error><fail-message message="Product with id [${productId}] doesn't exist."/></add-error>
</if-empty>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -53,7 +53,7 @@
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="ProductPrice" value-name="lookedUpValue"/>
+ <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"/>
@@ -124,7 +124,7 @@
<set field="checkAction" value="UPDATE" />
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
- <entity-one entity-name="ProductPaymentMethodType" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -133,7 +133,7 @@
<set field="checkAction" value="DELETE" />
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
- <entity-one entity-name="ProductPaymentMethodType" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -57,7 +57,7 @@
<field-to-result field-name="createProductSupplierMap.availableFromDate" result-name="availableFromDate"/>
<!-- create association with ProductStore.digProdUploadCategoryId -->
- <entity-one entity-name="ProductStore" value-name="productStore"/>
+ <entity-one entity-name="ProductStore" value-field="productStore"/>
<if-not-empty field="productStore.digProdUploadCategoryId">
<make-value value-field="addProductToCategoryMap" entity-name="ProductCategoryMember"/>
<set field="addProductToCategoryMap.productId" from-field="productId"/>
@@ -70,7 +70,7 @@
<!-- make sure SupplierProduct exists for userLogin.partyId -->
<set field="parameters.partyId" from-field="userLogin.partyId"/>
- <entity-one entity-name="SupplierProduct" value-name="supplierProduct"/>
+ <entity-one entity-name="SupplierProduct" value-field="supplierProduct"/>
<if-empty field="supplierProduct">
<add-error><fail-message message="Cannot update this Product: you are not associated with it as the Supplier"/></add-error>
@@ -86,7 +86,7 @@
</or>
</condition>
<then>
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set field="product.productName" from-field="parameters.productName" set-if-empty="false"/>
<set field="product.description" from-field="parameters.description" set-if-empty="false"/>
<store-value value-name="product"/>
@@ -181,7 +181,7 @@
</if-empty>
<check-errors/>
- <entity-one entity-name="ProductContent" value-name="productContent"/>
+ <entity-one entity-name="ProductContent" value-field="productContent"/>
<set field="productContent.thruDate" from-field="nowTimestamp"/>
<store-value value-name="productContent"/>
</simple-method>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -92,7 +92,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="Product" value-name="lookedUpValue"/>
+ <entity-one entity-name="Product" value-field="lookedUpValue"/>
<!-- save this value before overwriting it so we can compare it later -->
<set from-field="lookedUpValue.primaryProductCategoryId" field="saveIdMap.primaryProductCategoryId"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -123,7 +123,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="Product" value-name="lookedUpValue"/>
+ <entity-one entity-name="Product" value-field="lookedUpValue"/>
<set from-field="parameters.productName" field="lookedUpValue.productName"/>
<if-compare field="lookedUpValue.isVirtual" operator="equals" value="Y">
<set from-field="lookedUpValue.productName" field="lookedUpValue.internalName"/>
@@ -144,7 +144,7 @@
<filter-list-by-date list-name="variantProductAssocs"/>
<iterate entry="variantProductAssoc" list="variantProductAssocs">
<clear-field field="variantProduct"/>
- <entity-one entity-name="Product" value-name="variantProduct" auto-field-map="false">
+ <entity-one entity-name="Product" value-field="variantProduct" auto-field-map="false">
<field-map field-name="productId" from-field="variantProductAssoc.productIdTo"/>
</entity-one>
@@ -165,7 +165,7 @@
<check-errors/>
<!-- look up the old product and clone it -->
- <entity-one entity-name="Product" value-name="oldProduct" auto-field-map="false">
+ <entity-one entity-name="Product" value-field="oldProduct" auto-field-map="false">
<field-map field-name="productId" from-field="parameters.oldProductId"/>
</entity-one>
<clone-value value-name="oldProduct" new-value-name="newProduct"/>
@@ -323,22 +323,22 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductKeyword" short-description="update a ProductKeyword">
- <entity-one entity-name="ProductKeyword" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductKeyword" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductKeyword" short-description="delete a ProductKeyword">
- <entity-one entity-name="ProductKeyword" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductKeyword" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="forceIndexProductKeywords" short-description="induce all the keywords of a product">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<call-class-method class-name="org.ofbiz.product.product.KeywordIndex" method-name="forceIndexKeywords">
<field field-name="product" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
</simple-method>
<simple-method method-name="deleteProductKeywords" short-description="delete all the keywords of a product">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<remove-related value-name="product" relation-name="ProductKeyword"/>
</simple-method>
@@ -371,7 +371,7 @@
<simple-method method-name="discontinueProductSales" short-description="Discontinue Product Sales" login-required="false">
<!-- set sales discontinuation date to now -->
<now-timestamp-to-env env-name="nowTimestamp"/>
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set from-field="nowTimestamp" field="product.salesDiscontinuationDate"/>
<store-value value-name="product"/>
<!-- expire product from all categories -->
@@ -396,7 +396,7 @@
<if-empty field="parameters.weight">
<calculate field-name="parameters.weight" type="Long"><number value="1"/></calculate>
</if-empty>
- <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/>
+ <entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
<!-- go ahead and create it -->
<make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
@@ -414,7 +414,7 @@
</if-empty>
<!-- do the same for the virtual product... -->
- <entity-one entity-name="Product" value-name="product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
<call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field-name="virtualProductId">
<field field-name="product" type="GenericValue"/>
</call-class-method>
@@ -428,7 +428,7 @@
<if-empty field="parameters.quantity">
<calculate field-name="parameters.quantity" type="BigDecimal"><number value="1"/></calculate>
</if-empty>
- <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/>
+ <entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
<!-- go ahead and create it -->
<make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
@@ -442,7 +442,7 @@
</if-empty>
<!-- do the same for the virtual product... -->
- <entity-one entity-name="Product" value-name="product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
<call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field-name="virtualProductId">
<field field-name="product" type="GenericValue"/>
</call-class-method>
@@ -532,7 +532,7 @@
<set value="PRR_PENDING" field="newEntity.statusId"/>
<!-- code to check for auto-approved reviews (store setting) -->
- <entity-one entity-name="ProductStore" value-name="productStore"/>
+ <entity-one entity-name="ProductStore" value-field="productStore"/>
<if-not-empty field="productStore">
<if-compare field="productStore.autoApproveReviews" operator="equals" value="Y">
@@ -585,7 +585,7 @@
<return/>
</if-compare>
<!-- update the review average on the ProductCalculatedInfo entity -->
- <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/>
+ <entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
<!-- go ahead and create it -->
<make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
@@ -774,7 +774,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductMaint" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductMaint" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -784,7 +784,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductMaint" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductMaint" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- Create/Update/Delete Product Meter Record -->
@@ -805,7 +805,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductMeter" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductMeter" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -815,7 +815,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductMeter" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductMeter" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -827,12 +827,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductGeo" short-description="Update an existing Product Geo">
- <entity-one entity-name="ProductGeo" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductGeo" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductGeo" short-description="Delete an existing Product Geo">
- <entity-one entity-name="ProductGeo" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductGeo" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -912,12 +912,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductAttribute" short-description="update a ProductAttribute">
- <entity-one entity-name="ProductAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductAttribute" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductAttribute" short-description="delete a ProductAttribute">
- <entity-one entity-name="ProductAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductAttribute" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -996,7 +996,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductCategoryGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductCategoryGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -1007,7 +1007,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one entity-name="ProductCategoryGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductCategoryGlAccount" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
</simple-methods>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -55,7 +55,7 @@
<check-permission permission="CATALOG" action="_VIEW"><fail-message message="Security Error: to run getProductFirstRelatedFixedAsset you must have the CATALOG_VIEW or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<get-related relation-name="FixedAssetProduct" value-name="product" list-name="productFixedAssets"/>
<if-not-empty field="productFixedAssets">
<first-from-list list="productFixedAssets" entry="productFixedAsset"/>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -208,7 +208,7 @@
</simple-method>
<simple-method method-name="removePartyFromFacility" short-description="Remove Party From Facility">
- <entity-one entity-name="FacilityParty" value-name="lookedUpValue"/>
+ <entity-one entity-name="FacilityParty" value-field="lookedUpValue"/>
<now-timestamp-to-env env-name="thruDate"/>
<set field="lookedUpValue.thruDate" from-field="thruDate"/>
<store-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730111&r1=730110&r2=730111&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:07:14 2008
@@ -394,8 +394,8 @@
<!-- Store Inventory Services -->
<simple-method method-name="reserveStoreInventory" short-description="Reserve Store Inventory">
- <entity-one entity-name="Product" value-name="product" use-cache="true"/>
- <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
+ <entity-one entity-name="ProductStore" value-field="productStore" use-cache="true"/>
<if-empty field="productStore">
<add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}, not reserving inventory."/></add-error>
<check-errors/>
@@ -507,13 +507,13 @@
<simple-method method-name="isStoreInventoryRequired" short-description="Is Store Inventory Required" login-required="false">
<if-empty field="parameters.productStore">
- <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/>
+ <entity-one entity-name="ProductStore" value-field="productStore" use-cache="true"/>
<else>
<set from-field="parameters.productStore" field="productStore"/>
</else>
</if-empty>
<if-empty field="parameters.product">
- <entity-one entity-name="Product" value-name="product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
<else>
<set from-field="parameters.product" field="product"/>
</else>
@@ -534,13 +534,13 @@
<simple-method method-name="isStoreInventoryAvailable" short-description="Is Store Inventory Available" login-required="false">
<if-empty field="parameters.productStore">
- <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/>
+ <entity-one entity-name="ProductStore" value-field="productStore" use-cache="true"/>
<else>
<set from-field="parameters.productStore" field="productStore"/>
</else>
</if-empty>
<if-empty field="parameters.product">
- <entity-one entity-name="Product" value-name="product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
<else>
<set from-field="parameters.product" field="product"/>
</else>
@@ -671,13 +671,13 @@
<simple-method method-name="isStoreInventoryAvailableOrNotRequired" short-description="Is Store Inventory Available or Not Required" login-required="false">
<if-empty field="parameters.productStore">
- <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/>
+ <entity-one entity-name="ProductStore" value-field="productStore" use-cache="true"/>
<else>
<set from-field="parameters.productStore" field="productStore"/>
</else>
</if-empty>
<if-empty field="parameters.product">
- <entity-one entity-name="Product" value-name="product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
<else>
<set from-field="parameters.product" field="product"/>
</else>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -49,7 +49,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSubscription" short-description="Update a Subscription">
- <entity-one entity-name="Subscription" value-name="lookedUpValue"/>
+ <entity-one entity-name="Subscription" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -76,7 +76,7 @@
</simple-method>
<simple-method method-name="getSubscription" short-description="Get Subscription data">
- <entity-one entity-name="Subscription" value-name="subscription"/>
+ <entity-one entity-name="Subscription" value-field="subscription"/>
<field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/>
<if-not-empty field="subscription">
<field-to-result field-name="subscription" result-name="subscription"/>
@@ -91,7 +91,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSubscriptionResource" short-description="Update a SubscriptionResource">
- <entity-one entity-name="SubscriptionResource" value-name="lookedUpValue"/>
+ <entity-one entity-name="SubscriptionResource" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -104,17 +104,17 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductSubscriptionResource" short-description="Update a ProductSubscriptionResource">
- <entity-one entity-name="ProductSubscriptionResource" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductSubscriptionResource" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductSubscriptionResource" short-description="Delete a ProductSubscriptionResource">
- <entity-one entity-name="ProductSubscriptionResource" value-name="lookedUpValue"/>
+ <entity-one entity-name="ProductSubscriptionResource" value-field="lookedUpValue"/>
<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"/>
- <entity-one entity-name="SubscriptionAttribute" value-name="lookedUpValue"/>
+ <entity-one entity-name="SubscriptionAttribute" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue">
<make-value entity-name="SubscriptionAttribute" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -134,7 +134,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="removeSubscriptionCommEvent" short-description="Remove a Subscription Communication Event">
- <entity-one entity-name="SubscriptionCommEvent" value-name="eventSubscription"/>
+ <entity-one entity-name="SubscriptionCommEvent" value-field="eventSubscription"/>
<remove-value value-name="eventSubscription"/>
</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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -69,7 +69,7 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateSupplierProductFeature you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="SupplierProductFeature" value-name="sprod"/>
+ <entity-one entity-name="SupplierProductFeature" value-field="sprod"/>
<set-nonpk-fields map="parameters" value-field="sprod"/>
<store-value value-name="sprod"/>
</simple-method>
@@ -77,7 +77,7 @@
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run updateSupplierProductFeature you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="SupplierProductFeature" value-name="sprod"/>
+ <entity-one entity-name="SupplierProductFeature" value-field="sprod"/>
<remove-value value-name="sprod"/>
</simple-method>
<simple-method method-name="getSupplierProductFeatures" short-description="Get all supplier information for a product feature" login-required="false">
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -55,7 +55,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <entity-one entity-name="ItemIssuance" value-name="lookedUpValue"/>
+ <entity-one entity-name="ItemIssuance" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -67,7 +67,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <entity-one entity-name="ItemIssuance" value-name="lookedUpValue"/>
+ <entity-one entity-name="ItemIssuance" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -94,7 +94,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <entity-one entity-name="ItemIssuanceRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="ItemIssuanceRole" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -110,7 +110,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
<!-- get orderHeader -->
- <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="true"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/>
<!-- make sure the order is NOT of orderTypeId: SALES_ORDER -->
<if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER">
@@ -119,11 +119,11 @@
<check-errors/>
<!-- get orderItem -->
- <entity-one entity-name="OrderItem" value-name="orderItem" auto-field-map="true"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem" auto-field-map="true"/>
<!-- get orderItemShipGroupAssoc -->
- <entity-one entity-name="OrderItemShipGroupAssoc" value-name="orderItemShipGroupAssoc" auto-field-map="true"/>
+ <entity-one entity-name="OrderItemShipGroupAssoc" value-field="orderItemShipGroupAssoc" auto-field-map="true"/>
<!-- get shipment -->
- <entity-one entity-name="Shipment" value-name="shipment" auto-field-map="true"/>
+ <entity-one entity-name="Shipment" value-field="shipment" auto-field-map="true"/>
<call-simple-method method-name="findCreateIssueShipmentItem"/>
<call-simple-method method-name="callCreateItemIssuance"/>
@@ -176,11 +176,11 @@
<check-errors/>
<!-- get orderItem -->
- <entity-one entity-name="OrderItem" value-name="orderItem"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem"/>
<!-- get inventoryItem -->
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<!-- get shipment -->
- <entity-one entity-name="Shipment" value-name="shipment"/>
+ <entity-one entity-name="Shipment" value-field="shipment"/>
<!-- get orderShipment -->
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-field="orderShipmentLookupPk" map="parameters"/>
@@ -348,8 +348,8 @@
</simple-method>
<simple-method method-name="issueInventoryItemToFixedAssetMaint" short-description="Issue InventoryItem To FixedAssetMaint">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
- <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
<!-- make sure specified quantity is not less than or equal to 0 -->
<if-compare field="parameters.quantity" operator="less-equals" value="0" type="Double">
@@ -389,7 +389,7 @@
</simple-method>
<simple-method method-name="returnInventoryItemIssuedToFixedAssetMaint" short-description="Return the InventoryItem Issued To FixedAssetMaint">
- <entity-one entity-name="ItemIssuance" value-name="itemIssuance"/>
+ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
<set field="oldQuantity" from-field="itemIssuance.quantity"/>
<!-- Update the ItemIssuance -->
<set value="0" field="itemIssuanceUpdate.quantity" type="Double" />
@@ -417,7 +417,7 @@
</check-permission>
<!-- get ItemIssuance and related entities-->
- <entity-one entity-name="ItemIssuance" value-name="itemIssuance"/>
+ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
<get-related-one value-name="itemIssuance" relation-name="OrderHeader" to-value-name="orderHeader"/>
<get-related-one value-name="itemIssuance" relation-name="InventoryItem" to-value-name="inventoryItem"/>
<get-related-one value-name="itemIssuance" relation-name="Shipment" to-value-name="shipment"/>
@@ -486,7 +486,7 @@
<call-service service-name="reassignInventoryReservations" in-map-name="reassignInventoryReservationsCtx"/>
<!-- reserve the order item -->
- <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false">
+ <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<if-compare value="Y" operator="equals" field="productStore.isImmediatelyFulfilled">
@@ -508,7 +508,7 @@
<simple-method method-name="issueInventoryItemToShipment" short-description="Issue InventoryItem To Shipment">
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/>
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<entity-and entity-name="ReturnItemShipment" list-name="returnItemShipments">
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
<field-map field-name="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -351,7 +351,7 @@
<!-- update reserved quantity per inventoryItem, keep track of orderItems this came from -->
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/>
<if-empty field="inventoryItem">
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"></entity-one>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"></entity-one>
<set field="inventoryItems.${inventoryItemId}" from-field="inventoryItem"/>
</if-empty>
@@ -556,7 +556,7 @@
<!-- if we put nothing into this bin, delete the bin -->
<if-compare field="itemsInBin" value="0" operator="equals">
- <entity-one entity-name="PicklistBin" value-name="binToRemove">
+ <entity-one entity-name="PicklistBin" value-field="binToRemove">
<field-map field-name="picklistBinId" from-field="picklistBinId"/>
</entity-one>
<remove-value value-name="binToRemove"/>
@@ -609,7 +609,7 @@
<if-not-empty field="parameters.statusId">
<if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
<!-- make sure a StatusValidChange record exists, if not return error -->
- <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
<field-map from-field="lookedUpValue.statusId" field-name="statusId"/>
<field-map from-field="parameters.statusId" field-name="statusIdTo"/>
</entity-one>
@@ -719,7 +719,7 @@
<if-not-empty field="parameters.itemStatusId">
<if-compare-field field="parameters.itemStatusId" to-field="lookedUpValue.itemStatusId" operator="not-equals">
<!-- make sure a StatusValidChange record exists, if not return error -->
- <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
<field-map from-field="lookedUpValue.itemStatusId" field-name="statusId"/>
<field-map from-field="parameters.itemStatusId" field-name="statusIdTo"/>
</entity-one>
@@ -842,7 +842,7 @@
<check-errors/>
<!-- Get the general information for the picklist, this will be used for the pack sheets -->
- <entity-one entity-name="Picklist" value-name="picklist" auto-field-map="true"/>
+ <entity-one entity-name="Picklist" value-field="picklist" auto-field-map="true"/>
<call-simple-method method-name="getPicklistSingleInfoInline"/>
<field-to-result field-name="picklistInfo"/>
@@ -874,7 +874,7 @@
<if-not-empty field="picklistItemInfo.orderItem.productId">
<clear-field field="productValueTemp"/>
<set field="productId" from-field="picklistItemInfo.inventoryItemAndLocation.productId"/>
- <entity-one entity-name="Product" value-name="productValueTemp" use-cache="true">
+ <entity-one entity-name="Product" value-field="productValueTemp" use-cache="true">
<field-map field-name="productId"/>
</entity-one>
<set field="productByProductIdMap.${productId}" from-field="productValueTemp"/>
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=730111&r1=730110&r2=730111&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:07:14 2008
@@ -41,7 +41,7 @@
<create-value value-field="newEntity"/>
<if-not-empty field="parameters.inventoryItemDetailSeqId">
- <entity-one entity-name="InventoryItemDetail" value-name="invDet">
+ <entity-one entity-name="InventoryItemDetail" value-field="invDet">
<field-map field-name="inventoryItemDetailSeqId" from-field="parameters.inventoryItemDetailSeqId"/>
<field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
</entity-one>
@@ -156,7 +156,7 @@
</condition>
<then>
<!-- Retrieve the new inventoryItem -->
- <entity-one entity-name="InventoryItem" value-name="inventoryItem"/>
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
<!-- Don't reset the status if it's already set to INV_PROMISED or INV_ON_HOLD -->
<if>
@@ -191,7 +191,7 @@
<check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run quickReceiveReturn you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
<check-errors/>
- <entity-one entity-name="ReturnHeader" value-name="returnHeader">
+ <entity-one entity-name="ReturnHeader" value-field="returnHeader">
<field-map field-name="returnId" from-field="parameters.returnId"/>
</entity-one>