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/31 11:40:31 UTC
svn commit: r730369 [2/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/...
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Wed Dec 31 02:40:29 2008
@@ -34,9 +34,9 @@
<if-compare field="hasPermission" operator="not-equals" value="true">
<set field="resourceDescription" from-field="parameters.resourceDescription"/>
<if-empty field="resourceDescription">
- <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
+ <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/>
</if-empty>
- <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateCustRequest" field-name="failMessage"/>
+ <property-to-field resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateCustRequest" field="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
<field-to-result field="failMessage"/>
</if-compare>
@@ -158,7 +158,7 @@
<call-service service-name="updateWorkEffort" in-map-name="updTask"/>
<else>
<set field="parameters.statusId" from-field="custRequest.statusId"/>
- <property-to-field resource="ProjectMgrUiLabels" property="cannotCancelledRequest" field-name="errorMessage"/>
+ <property-to-field resource="ProjectMgrUiLabels" property="cannotCancelledRequest" field="errorMessage"/>
<field-to-result field="errorMessage"/>
<set field="isShowEvent" value="N"/>
</else>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Wed Dec 31 02:40:29 2008
@@ -42,7 +42,7 @@
<clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
<field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteRequirement" short-description="Delete a requirement">
@@ -126,7 +126,7 @@
<entity-one entity-name="RequirementRole" value-field="requirementRole" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="requirementRole"/>
- <store-value value-name="requirementRole"/>
+ <store-value value-field="requirementRole"/>
<check-errors/>
</simple-method>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Wed Dec 31 02:40:29 2008
@@ -47,7 +47,7 @@
</if-empty>
<if-empty field="newEntity.listName">
- <property-to-field field-name="newEntity.listName"
+ <property-to-field field="newEntity.listName"
resource="OrderUiLabels" property="OrderNewShoppingList" default="New Shopping List"/>
</if-empty>
@@ -97,7 +97,7 @@
</then>
</if>
- <store-value value-name="shoppingList"/>
+ <store-value value-field="shoppingList"/>
</simple-method>
<simple-method method-name="removeShoppingList" short-description="Remove a ShoppingList">
@@ -134,7 +134,7 @@
<if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals">
<now-timestamp field="shoppingList.lastAdminModified"/>
- <store-value value-name="shoppingList"/>
+ <store-value value-field="shoppingList"/>
</if-compare-field>
</simple-method>
@@ -154,13 +154,13 @@
<else>
<!-- otherwise, just update shopping list item in place -->
<set-nonpk-fields map="parameters" value-field="shoppingListItem"/>
- <store-value value-name="shoppingListItem"/>
+ <store-value value-field="shoppingListItem"/>
</else>
</if-compare>
<if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals">
<now-timestamp field="shoppingList.lastAdminModified"/>
- <store-value value-name="shoppingList"/>
+ <store-value value-field="shoppingList"/>
</if-compare-field>
</simple-method>
@@ -176,7 +176,7 @@
<if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals">
<now-timestamp field="shoppingList.lastAdminModified"/>
- <store-value value-name="shoppingList"/>
+ <store-value value-field="shoppingList"/>
</if-compare-field>
</simple-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Wed Dec 31 02:40:29 2008
@@ -257,7 +257,7 @@
<simple-method method-name="updateContactMechAttribute" short-description="updateContactMechAttribute">
<entity-one entity-name="ContactMechAttribute" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContactMechAttribute" short-description="removeContactMechAttribute">
<entity-one entity-name="ContactMechAttribute" value-field="lookedUpValue"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Wed Dec 31 02:40:29 2008
@@ -26,8 +26,8 @@
<set field="create_allow_password" value="false" />
<set field="default_customer_password" value="ungssblepsswd" />
- <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
- <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
+ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
+ <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<now-timestamp field="nowStamp"/>
<set field="parameters.roleTypeId" value="CUSTOMER" />
@@ -122,13 +122,13 @@
</call-map-processor>
<if-compare value="USA" operator="equals" field="parameters.CUSTOMER_COUNTRY">
<if-empty field="parameters.CUSTOMER_STATE">
- <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
+ <property-to-field field="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
<field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
<if-compare value="CAN" operator="equals" field="parameters.CUSTOMER_COUNTRY">
<if-empty field="parameters.CUSTOMER_STATE">
- <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
+ <property-to-field field="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
<field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml Wed Dec 31 02:40:29 2008
@@ -48,9 +48,9 @@
<else>
<set field="resourceDescription" from-field="parameters.resourceDescription"/>
<if-empty field="resourceDescription">
- <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
+ <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/>
</if-empty>
- <property-to-field resource="PartyUiLabels" property="PartyPermissionErrorPartyId" field-name="failMessage"/>
+ <property-to-field resource="PartyUiLabels" property="PartyPermissionErrorPartyId" field="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
<field-to-result field="failMessage"/>
</else>
@@ -176,7 +176,7 @@
<check-errors/>
</if-compare>
<if-compare field="hasPermission" operator="not-equals" value="true">
- <property-to-field property="PartyInvitationAccAndDecPermissionError" field-name="failMessage" resource="PartyUiLabels"/>
+ <property-to-field property="PartyInvitationAccAndDecPermissionError" field="failMessage" resource="PartyUiLabels"/>
<field-to-result field="hasPermission"/>
<field-to-result field="failMessage"/>
</if-compare>
@@ -230,7 +230,7 @@
</if-compare>
</if-compare>
<if-compare field="hasPermission" operator="not-equals" value="true">
- <property-to-field property="PartyInvitationCancelPermissionError" field-name="failMessage" resource="PartyUiLabels"/>
+ <property-to-field property="PartyInvitationCancelPermissionError" field="failMessage" resource="PartyUiLabels"/>
<field-to-result field="hasPermission"/>
<field-to-result field="failMessage"/>
</if-compare>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Wed Dec 31 02:40:29 2008
@@ -204,7 +204,7 @@
<simple-method method-name="updatePartyClassification" short-description="update a PartyClassification">
<entity-one entity-name="PartyClassification" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyClassification" short-description="delete a PartyClassification">
<entity-one entity-name="PartyClassification" value-field="lookedUpValue"/>
@@ -223,7 +223,7 @@
<simple-method method-name="updatePartyClassificationGroup" short-description="update a PartyClassificationGroup">
<entity-one entity-name="PartyClassificationGroup" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyClassificationGroup" short-description="delete a PartyClassificationGroup">
<entity-one entity-name="PartyClassificationGroup" value-field="lookedUpValue"/>
@@ -240,7 +240,7 @@
<simple-method method-name="updateVendor" short-description="updateVendor">
<entity-one entity-name="Vendor" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteVendor" short-description="deleteVendor">
<entity-one entity-name="Vendor" value-field="lookedUpValue"/>
@@ -257,7 +257,7 @@
<simple-method method-name="updatePartyAttribute" short-description="updatePartyAttribute">
<entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removePartyAttribute" short-description="removePartyAttribute">
<entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/>
@@ -280,7 +280,7 @@
<!-- update the fields -->
<set-nonpk-fields value-field="partyProfileDefault" map="parameters" set-if-null="false"/>
- <store-value value-name="partyProfileDefault"/>
+ <store-value value-field="partyProfileDefault"/>
</simple-method>
<!-- create party content -->
@@ -786,7 +786,7 @@
<entity-one entity-name="PartyRelationship" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deletePartyRelationship" short-description="deletePartyRelationship">
<if-empty field="parameters.roleTypeIdFrom"><set field="parameters.roleTypeIdFrom" value="_NA_"/></if-empty>
@@ -810,7 +810,7 @@
<simple-method method-name="updatePartyCarrierAccount" short-description="Update a PartyCarrierAccount">
<entity-one entity-name="PartyCarrierAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<!-- send party creation email notification -->
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Wed Dec 31 02:40:29 2008
@@ -35,8 +35,8 @@
<set field="require_login" value="false" />
<set field="create_allow_password" value="true" />
- <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
- <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
+ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
+ <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<now-timestamp field="nowStamp"/>
<set field="parameters.roleTypeId" value="PROSPECT" />
@@ -49,8 +49,8 @@
<set field="require_login" value="true" />
<set field="create_allow_password" value="true" />
- <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
- <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
+ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
+ <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<now-timestamp field="nowStamp"/>
<set field="parameters.roleTypeId" value="EMPLOYEE" />
@@ -58,8 +58,8 @@
</simple-method>
<simple-method method-name="createUser" short-description="Create User" login-required="false">
- <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
- <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
+ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
+ <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<set field="default_user_password" value="ungssblepsswd" />
<now-timestamp field="nowStamp"/>
@@ -161,13 +161,13 @@
</call-map-processor>
<if-compare value="USA" operator="equals" field="parameters.USER_COUNTRY">
<if-empty field="parameters.USER_STATE">
- <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
+ <property-to-field field="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/>
<field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
<if-compare value="CAN" operator="equals" field="parameters.USER_COUNTRY">
<if-empty field="parameters.USER_STATE">
- <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
+ <property-to-field field="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/>
<field-to-list field="tempErrorMessage" list="error_list"/>
</if-empty>
</if-compare>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730369&r1=730368&r2=730369&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Wed Dec 31 02:40:29 2008
@@ -39,7 +39,7 @@
<simple-method method-name="updateProdCatalog" short-description="Update an ProdCatalog">
<entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
<set-nonpk-fields map="parameters" value-field="prodCatalog"/>
- <store-value value-name="prodCatalog"/>
+ <store-value value-field="prodCatalog"/>
</simple-method>
<simple-method method-name="deleteProdCatalog" short-description="Delete an ProdCatalog">
<entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
@@ -71,7 +71,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/>
<set-nonpk-fields map="parameters" value-field="prodCatalogCategory"/>
- <store-value value-name="prodCatalogCategory"/>
+ <store-value value-field="prodCatalogCategory"/>
</simple-method>
<simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog">
@@ -98,7 +98,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party">
<make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/>
@@ -111,7 +111,7 @@
<if-not-empty field="parameters.topCategory">
<set field="defaultTopCategoryId" from-field="parameters.topCategory"/>
<else>
- <property-to-field property="top.category.default" field-name="defaultTopCategoryId" resource="catalog"/>
+ <property-to-field property="top.category.default" field="defaultTopCategoryId" resource="catalog"/>
</else>
</if-not-empty>
<!-- set field="productCategoryContext.productCategoryId" from-field="defaultTopCategoryId"/>
@@ -396,7 +396,7 @@
</if-not-empty>
<!-- set-service-fields service-name="updateProductCategory" map-name="category" to-map-name="updateProductCategoryContext"/>
<call-service service-name="updateProductCategory" in-map-name="updateProductCategoryContext" / -->
- <store-value value-name="category"/>
+ <store-value value-field="category"/>
<field-to-result field="filesImageMap" result-name="filesImageMap"/>
</if-not-empty>
</simple-method>
@@ -461,7 +461,7 @@
</if-compare>
</if-not-empty>
<field-to-result field="filesImageMap" result-name="filesImageMap"/>
- <store-value value-name="product"/>
+ <store-value value-field="product"/>
<!-- set-service-fields service-name="updateProduct" map-name="product" to-map-name="updateProductContext"/>
<call-service service-name="updateProduct" in-map-name="updateProductContext" / -->
</if-not-empty>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -85,7 +85,7 @@
<!-- save this value before overwriting it so we can compare it later -->
<!-- <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-map-name="saveIdMap"/> -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<!-- if setting the primaryParentCategoryId, create a rollup entity too -->
<!-- NOTE: this is commented out to disable because it is dangerous to add category rollups on a live site without being able to specify a fromDate
@@ -187,7 +187,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductFromCategory" short-description="Remove Product From Category">
<!-- note that the security semantics require the user to have the general admin permission,
@@ -203,7 +203,7 @@
<entity-one entity-name="Product" value-field="product" auto-field-map="true"/>
<if-compare-field field="product.primaryProductCategoryId" to-field="parameters.productCategoryId" operator="equals">
<clear-field field="product.primaryProductCategoryId"/>
- <store-value value-name="product"/>
+ <store-value value-field="product"/>
</if-compare-field>
<make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
@@ -242,7 +242,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removePartyFromCategory" short-description="Remove Party From Category">
<set value="removePartyFromCategory" field="callingMethodName"/>
@@ -332,7 +332,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductCategoryFromCategory" short-description="Remove ProductCategory From Category">
<set value="removeProductCategoryFromCategory" field="callingMethodName"/>
@@ -449,7 +449,7 @@
<iterate entry="productCategoryMember" list="productCategoryMembers">
<set field="productCategoryMember.thruDate" from-field="expireTimestamp"/>
- <store-value value-name="productCategoryMember"/>
+ <store-value value-field="productCategoryMember"/>
</iterate>
</simple-method>
<simple-method method-name="removeExpiredCategoryProductMembers" short-description="Remove ProductCategory From Category">
@@ -547,7 +547,7 @@
<if-compare field="hasSelectableFeatures" operator="equals" value="Y">
<entity-one entity-name="Product" value-field="newProduct"/>
<set field="newProduct.isVirtual" value="Y"/>
- <store-value value-name="newProduct"/>
+ <store-value value-field="newProduct"/>
</if-compare>
</simple-method>
@@ -648,7 +648,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/>
<set-nonpk-fields map="parameters" value-field="ProductCategoryAttributeInstance"/>
- <store-value value-name="ProductCategoryAttributeInstance"/>
+ <store-value value-field="ProductCategoryAttributeInstance"/>
</simple-method>
<simple-method method-name="deleteProductCategoryAttribute"
short-description="Delete an association between two product categories">
@@ -688,7 +688,7 @@
<simple-method method-name="updateProductCategoryLink" short-description="update a ProductCategoryLink">
<entity-one entity-name="ProductCategoryLink" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductCategoryLink" short-description="delete a ProductCategoryLink">
@@ -766,7 +766,7 @@
<field-to-result field="hasPermission"/>
<else>
- <property-to-field resource="ProductUiLabels" property="ProductPermissionError" field-name="failMessage"/>
+ <property-to-field resource="ProductUiLabels" property="ProductPermissionError" field="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
<field-to-result field="hasPermission"/>
<field-to-result field="failMessage"/>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -54,7 +54,7 @@
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductConfig" short-description="Delete an ProductConfig">
<set field="callingMethodName" value="deleteProductConfig" />
@@ -91,7 +91,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductConfigItem" short-description="Delete a Config Item">
<check-permission action="_DELETE" permission="CATALOG">
@@ -126,7 +126,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductConfigOption" short-description="Delete a Config Option">
<check-permission action="_DELETE" permission="CATALOG">
@@ -158,7 +158,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductConfigProduct" short-description="Delete a ProductConfigProduct">
<check-permission action="_DELETE" permission="CATALOG">
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -38,7 +38,7 @@
<entity-one entity-name="ProductFeatureCategory" value-field="productFeatureCategory"/>
<set-nonpk-fields value-field="productFeatureCategory" map="parameters"/>
- <store-value value-name="productFeatureCategory"/>
+ <store-value value-field="productFeatureCategory"/>
</simple-method>
<simple-method method-name="createProductFeature" short-description="Create Product Feature">
@@ -63,7 +63,7 @@
<entity-one entity-name="ProductFeature" value-field="productFeature"/>
<set-nonpk-fields map="parameters" value-field="productFeature"/>
- <store-value value-name="productFeature"/>
+ <store-value value-field="productFeature"/>
</simple-method>
<simple-method method-name="applyFeatureToProduct" short-description="Apply Feature to Product">
@@ -88,7 +88,7 @@
<entity-one entity-name="ProductFeatureAppl" value-field="productFeatureAppl"/>
<set-nonpk-fields map="parameters" value-field="productFeatureAppl"/>
- <store-value value-name="productFeatureAppl"/>
+ <store-value value-field="productFeatureAppl"/>
</simple-method>
<simple-method method-name="removeFeatureFromProduct" short-description="Remove Feature from Product">
<set field="callingMethodName" value="removeFeatureFromProduct"/>
@@ -103,7 +103,7 @@
<env-to-field env-name="nowStamp" field-name="thruDate" map-name="parameters"/>
</if-empty>
<field-to-field field-name="thruDate" map-name="parameters" to-map-name="productFeatureAppl"/>
- <store-value value-name="productFeatureAppl"/>
+ <store-value value-field="productFeatureAppl"/>
-->
<remove-value value-field="productFeatureAppl"/>
</simple-method>
@@ -155,7 +155,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductFeatureCategoryAppl" short-description="Remove a Product Feature Category Application">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureCategoryAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -190,7 +190,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductFeatureCatGrpAppl" short-description="Remove a ProductFeatureGroup to ProductCategory Application">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureCatGrpAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -221,7 +221,7 @@
<entity-one entity-name="ProductFeatureGroup" value-field="productFeatureGroup"/>
<set-nonpk-fields map="parameters" value-field="productFeatureGroup"/>
- <store-value value-name="productFeatureGroup"/>
+ <store-value value-field="productFeatureGroup"/>
</simple-method>
<simple-method method-name="createProductFeatureGroupAppl" short-description="Create an Product Feature Group Application">
<check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureGroupAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
@@ -245,7 +245,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductFeatureGroupAppl" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductFeatureGroupAppl" short-description="Remove a Product Feature Group Application">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureGroupAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -308,7 +308,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductFeatureType" short-description="Remove a Product Feature Type">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureType you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -353,7 +353,7 @@
<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"/>
+ <store-value value-field="productFeatureApplAttr"/>
<check-errors/>
</simple-method>
@@ -401,7 +401,7 @@
<set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" />
<set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFeaturePrice" short-description="Delete a feature price">
<make-value entity-name="ProductFeaturePrice" value-field="lookupPKMap"/>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -67,7 +67,7 @@
<field-to-result field="hasPermission"/>
<else>
- <property-to-field resource="ProductUiLabels" property="ProductFacilityPermissionError" field-name="failMessage"/>
+ <property-to-field resource="ProductUiLabels" property="ProductFacilityPermissionError" field="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
<field-to-result field="hasPermission"/>
<field-to-result field="failMessage"/>
@@ -84,7 +84,7 @@
<check-errors/>
<set field="resourceDescription" from-field="parameters.resourceDescription"/>
<if-empty field="resourceDescription">
- <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
+ <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/>
</if-empty>
<set field="callingMethodName" from-field="resourceDescription" />
<set field="checkAction" from-field="mainAction" />
@@ -95,7 +95,7 @@
<field-to-result field="hasPermission"/>
<else>
- <property-to-field resource="ProductUiLabels" property="ProductFacilityPermissionError" field-name="failMessage"/>
+ <property-to-field resource="ProductUiLabels" property="ProductFacilityPermissionError" field="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
<field-to-result field="hasPermission"/>
<field-to-result field="failMessage"/>
@@ -180,7 +180,7 @@
</call-service>
<set field="inventoryItem.currencyUomId" from-field="accPref.baseCurrencyUomId"/>
<if-empty field="inventoryItem.currencyUomId">
- <property-to-field resource="general" property="currency.uom.id.default" field-name="inventoryItem.currencyUomId"/>
+ <property-to-field resource="general" property="currency.uom.id.default" field="inventoryItem.currencyUomId"/>
</if-empty>
<!-- if inventoryItem's currencyUomId is still empty, return an error message -->
<if-empty field="inventoryItem.currencyUomId">
@@ -218,7 +218,7 @@
</if-compare>
<check-errors/>
<if-not-empty field="updateInventoryItem">
- <store-value value-name="inventoryItem"/>
+ <store-value value-field="inventoryItem"/>
</if-not-empty>
</simple-method>
@@ -242,7 +242,7 @@
</if-not-empty>
<set field="oldUnitCost" from-field="lookedUpValue.unitCost"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<!-- if the unit cost is changed create an InventoryItemDetail to keep track of unit cost history -->
<if-not-empty field="parameters.unitCost">
<if-compare-field field="parameters.unitCost" to-field="oldUnitCost" operator="not-equals">
@@ -264,7 +264,7 @@
<first-from-list entry="oldInventoryItemStatus" list="oldInventoryItemStatusList"/>
<if-not-empty field="oldInventoryItemStatus">
<set field="oldInventoryItemStatus.statusEndDatetime" from-field="nowTimestamp"/>
- <store-value value-name="oldInventoryItemStatus"/>
+ <store-value value-field="oldInventoryItemStatus"/>
</if-not-empty>
<make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/>
@@ -312,7 +312,7 @@
<set field="inventoryItem.availableToPromiseTotal" from-field="inventoryItemDetailSummary.availableToPromiseTotal"/>
<set field="inventoryItem.quantityOnHandTotal" from-field="inventoryItemDetailSummary.quantityOnHandTotal"/>
- <store-value value-name="inventoryItem"/>
+ <store-value value-field="inventoryItem"/>
</simple-method>
<simple-method method-name="updateSerializedInventoryTotals" short-description="Update the totals on serialized inventory">
@@ -333,7 +333,7 @@
<set field="inventoryItem.availableToPromiseTotal" value="1" type="Double"/>
<set field="inventoryItem.quantityOnHandTotal" value="1" type="Double"/>
<log level="always" message="In updateSerializedInventoryTotals Storing totals for item [${inventoryItem.inventoryItemId}] INV_AVAIABLE [1/1]"/>
- <store-value value-name="inventoryItem"/>
+ <store-value value-field="inventoryItem"/>
</then>
<!-- delivered -->
@@ -351,7 +351,7 @@
<set field="inventoryItem.availableToPromiseTotal" value="0" type="Double"/>
<set field="inventoryItem.quantityOnHandTotal" value="0" type="Double"/>
<log level="always" message="In updateSerializedInventoryTotals Storing totals [${inventoryItem.inventoryItemId}] for INV_DELIVERED [0/0]"/>
- <store-value value-name="inventoryItem"/>
+ <store-value value-field="inventoryItem"/>
</then>
</else-if>
@@ -371,7 +371,7 @@
<set field="inventoryItem.availableToPromiseTotal" value="0" type="Double"/>
<set field="inventoryItem.quantityOnHandTotal" value="1" type="Double"/>
<log level="always" message="In updateSerializedInventoryTotals Storing totals [${inventoryItem.inventoryItemId}] for other status [0/1]"/>
- <store-value value-name="inventoryItem"/>
+ <store-value value-field="inventoryItem"/>
</then>
</else-if>
</if>
@@ -401,7 +401,7 @@
<clear-field field="parameters.inventoryItem.oldAvailableToPromise"/>
<clear-field field="parameters.inventoryItem.oldQuantityOnHand"/>
- <store-value value-name="parameters.inventoryItem"/>
+ <store-value value-field="parameters.inventoryItem"/>
</simple-method>
<simple-method method-name="checkProductInventoryDiscontinuation" short-description="Check Product Inventory Discontinuation" login-required="false">
@@ -537,7 +537,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductFacility" short-description="Delete a ProductFacility">
@@ -561,7 +561,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductFacilityLocation" short-description="Delete a ProductFacilityLocation">
@@ -1012,7 +1012,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="inventoryTransfer"/>
- <store-value value-name="inventoryTransfer"/>
+ <store-value value-field="inventoryTransfer"/>
</simple-method>
<simple-method method-name="createInventoryTransfersForProduct" short-description="Create inventory transfers for the given product and quantity. Return the units not available for transfers.">
@@ -1195,7 +1195,7 @@
<simple-method method-name="updateInventoryItemLabelType" short-description="Update an InventoryItemLabelType">
<entity-one entity-name="InventoryItemLabelType" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteInventoryItemLabelType" short-description="Delete an InventoryItemLabelType">
<entity-one entity-name="InventoryItemLabelType" value-field="lookedUpValue"/>
@@ -1210,7 +1210,7 @@
<simple-method method-name="updateInventoryItemLabel" short-description="Update an InventoryItemLabel">
<entity-one entity-name="InventoryItemLabel" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteInventoryItemLabel" short-description="Delete an InventoryItemLabel">
<entity-one entity-name="InventoryItemLabel" value-field="lookedUpValue"/>
@@ -1227,7 +1227,7 @@
<simple-method method-name="updateInventoryItemLabelAppl" short-description="Update an InventoryItemLabel">
<entity-one entity-name="InventoryItemLabelAppl" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteInventoryItemLabelAppl" short-description="Delete an InventoryItemLabel">
<entity-one entity-name="InventoryItemLabelAppl" value-field="lookedUpValue"/>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -100,7 +100,7 @@
<now-timestamp field="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<!-- if setting the primaryParentCategoryId, create a rollup entity too -->
<!-- THIS IS REMOVED BECAUSE IT CAUSES PROBLEMS FOR WORKING ON PRODUCTION SITES
@@ -132,7 +132,7 @@
<now-timestamp field="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<if-compare field="lookedUpValue.isVirtual" operator="equals" value="Y">
<!-- get all variant products, to update their productNames -->
@@ -151,7 +151,7 @@
<set from-field="parameters.productName" field="variantProduct.productName"/>
<now-timestamp field="variantProduct.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="variantProduct.lastModifiedByUserLogin"/>
- <store-value value-name="variantProduct"/>
+ <store-value value-field="variantProduct"/>
</iterate>
</if-compare>
</simple-method>
@@ -325,7 +325,7 @@
<simple-method method-name="updateProductKeyword" short-description="update a ProductKeyword">
<entity-one entity-name="ProductKeyword" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductKeyword" short-description="delete a ProductKeyword">
<entity-one entity-name="ProductKeyword" value-field="lookedUpValue"/>
@@ -373,13 +373,13 @@
<now-timestamp field="nowTimestamp"/>
<entity-one entity-name="Product" value-field="product"/>
<set from-field="nowTimestamp" field="product.salesDiscontinuationDate"/>
- <store-value value-name="product"/>
+ <store-value value-field="product"/>
<!-- expire product from all categories -->
<get-related value-field="product" relation-name="ProductCategoryMember" list="productCategoryMembers"/>
<iterate entry="productCategoryMember" list="productCategoryMembers">
<if-empty field="productCategoryMember.thruDate">
<set from-field="nowTimestamp" field="productCategoryMember.thruDate"/>
- <store-value value-name="productCategoryMember"/>
+ <store-value value-field="productCategoryMember"/>
</if-empty>
</iterate>
<!-- expire product from all associations going to it -->
@@ -387,7 +387,7 @@
<iterate entry="assocProductAssoc" list="assocProductAssocs">
<if-empty field="assocProductAssoc.thruDate">
<set from-field="nowTimestamp" field="assocProductAssoc.thruDate"/>
- <store-value value-name="assocProductAssoc"/>
+ <store-value value-field="assocProductAssoc"/>
</if-empty>
</iterate>
</simple-method>
@@ -409,7 +409,7 @@
<calcop field="parameters.weight" operator="get"></calcop>
</calcop>
</calculate>
- <store-value value-name="productCalculatedInfo"/>
+ <store-value value-field="productCalculatedInfo"/>
</else>
</if-empty>
@@ -437,7 +437,7 @@
<create-value value-field="productCalculatedInfo"/>
<else>
<set field="productCalculatedInfo.totalQuantityOrdered" value="${productCalculatedInfo.totalQuantityOrdered + parameters.quantity}" type="BigDecimal"/>
- <store-value value-name="productCalculatedInfo"/>
+ <store-value value-field="productCalculatedInfo"/>
</else>
</if-empty>
@@ -475,7 +475,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteGoodIdentification" short-description="Delete an GoodIdentification">
<set value="deleteGoodIdentification" field="callingMethodName"/>
@@ -511,7 +511,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductGlAccount" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductGlAccount" short-description="Delete an ProductGlAccount">
<set value="deleteProductGlAccount" field="callingMethodName"/>
@@ -556,7 +556,7 @@
<create-value value-field="newEntity"/>
<set from-field="newEntity.productId" field="productId"/>
- <property-to-field resource="ProductUiLabels" property="ProductCreateProductReviewSuccess" field-name="successMessage"/>
+ <property-to-field resource="ProductUiLabels" property="ProductCreateProductReviewSuccess" field="successMessage"/>
<call-simple-method method-name="updateProductWithReviewRatingAvg"/>
</simple-method>
<simple-method method-name="updateProductReview" short-description="Update ProductReview">
@@ -569,7 +569,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<set from-field="lookedUpValue.productId" field="productId"/>
<call-simple-method method-name="updateProductWithReviewRatingAvg"/>
@@ -594,7 +594,7 @@
<create-value value-field="productCalculatedInfo"/>
<else>
<set from-field="averageCustomerRating" field="productCalculatedInfo.averageCustomerRating"/>
- <store-value value-name="productCalculatedInfo"/>
+ <store-value value-field="productCalculatedInfo"/>
</else>
</if-empty>
</simple-method>
@@ -740,7 +740,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductAssoc" map="lookupPKMap" value-field="productAssocInstance"/>
<set-nonpk-fields map="parameters" value-field="productAssocInstance"/>
- <store-value value-name="productAssocInstance"/>
+ <store-value value-field="productAssocInstance"/>
</simple-method>
<simple-method method-name="deleteProductAssoc" short-description="Delete an association between two products">
<set value="deleteProductAssoc" field="callingMethodName"/>
@@ -776,7 +776,7 @@
<entity-one entity-name="ProductMaint" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductMaint" short-description="Delete Product Maint from PRODUCT_MAINT">
<set value="deleteProductMaint" field="callingMethodName"/>
@@ -807,7 +807,7 @@
<entity-one entity-name="ProductMeter" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductMeter" short-description="Delete an existing Product Meter">
<set value="deleteProductMeter" field="callingMethodName"/>
@@ -829,7 +829,7 @@
<simple-method method-name="updateProductGeo" short-description="Update an existing Product Geo">
<entity-one entity-name="ProductGeo" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductGeo" short-description="Delete an existing Product Geo">
<entity-one entity-name="ProductGeo" value-field="lookedUpValue"/>
@@ -897,7 +897,7 @@
<field-to-result field="hasPermission"/>
<else>
- <property-to-field resource="ProductUiLabels" property="ProductPermissionError" field-name="failMessage"/>
+ <property-to-field resource="ProductUiLabels" property="ProductPermissionError" field="failMessage"/>
<set field="hasPermission" type="Boolean" value="false"/>
<field-to-result field="hasPermission"/>
<field-to-result field="failMessage"/>
@@ -914,7 +914,7 @@
<simple-method method-name="updateProductAttribute" short-description="update a ProductAttribute">
<entity-one entity-name="ProductAttribute" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductAttribute" short-description="delete a ProductAttribute">
<entity-one entity-name="ProductAttribute" value-field="lookedUpValue"/>
@@ -951,7 +951,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removePartyFromProduct" short-description="Remove Party From Product">
<set value="removePartyFromProduct" field="callingMethodName"/>
@@ -998,7 +998,7 @@
<entity-one entity-name="ProductCategoryGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductCategoryGlAccount" short-description="Delete an ProductCategoryGlAccount">
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -60,7 +60,7 @@
<set from-field="nowTimestamp" field="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromo" short-description="Delete a ProductPromo">
<check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromo you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
@@ -97,7 +97,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromoAction" short-description="Delete an ProductPromoAction">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoAction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -131,7 +131,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromoCategory" short-description="Delete an ProductPromoCategory">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCategory you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -184,7 +184,7 @@
<set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromoCode" short-description="Delete an ProductPromoCode">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCode you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -266,7 +266,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromoCond" short-description="Delete an ProductPromoCond">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCond you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -300,7 +300,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromoProduct" short-description="Delete an ProductPromoProduct">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoProduct you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -336,7 +336,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPromoRule" short-description="Delete a ProductPromoRule">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoRule you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -375,7 +375,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductStorePromoAppl" short-description="Delete ProductStorePromoAppl">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStorePromoAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createFixedAssetAndLinkToProduct" short-description="Create an FixedAsset and link the asset to the product, used when a asset usage product is created">
- <property-to-field field-name="autoCreate" resource="AccountingConfig" property="accounting.fixedasset.autocreate" no-locale="true"/>
+ <property-to-field field="autoCreate" resource="AccountingConfig" property="accounting.fixedasset.autocreate" no-locale="true"/>
<if-compare field="autoCreate" value="Y" operator="not-equals">
<return/>
</if-compare>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -73,7 +73,7 @@
<check-errors/>
</if-compare>
- <store-value value-name="store"/>
+ <store-value value-field="store"/>
<!-- update the ProductStoreFacility record -->
<now-timestamp field="nowTimestamp"/>
@@ -85,7 +85,7 @@
<filter-list-by-date list-name="storeFacilities"/>
<iterate list="storeFacilities" entry="facility">
<set from-field="nowTimestamp" field="facility.thruDate"/>
- <store-value value-name="facility"/>
+ <store-value value-field="facility"/>
</iterate>
</if-compare>
<!-- create the new entry -->
@@ -121,7 +121,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductStoreCatalog" short-description="Delete ProductStoreCatalog">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreCatalog you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -151,7 +151,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
<set-nonpk-fields map="parameters" value-field="setting"/>
- <store-value value-name="setting"/>
+ <store-value value-field="setting"/>
</simple-method>
<simple-method method-name="deleteProductStorePaymentSetting" short-description="Delete a Product Store Payment Setting">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStorePaymentSetting you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -187,7 +187,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductStoreEmail" short-description="Remove Product Store Email Setting">
<check-permission permission="CATALOG" action="_DELETE">
@@ -242,7 +242,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProductStoreShipMeth" short-description="Remove Product Store Carrier Shipment Method">
<check-permission permission="CATALOG" action="_DELETE">
@@ -285,7 +285,7 @@
<now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="lookedUpValue.thruDate"/>
</if-empty>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<!-- Product Store Keyword Override Services -->
@@ -315,7 +315,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductStoreKeywordOvrd" short-description="Delete a ProductStoreKeywordOvrd">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStoreKeywordOvrd you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
@@ -358,7 +358,7 @@
<now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="lookedUpValue.thruDate"/>
</if-empty>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<!-- Product Store FinAccount Settings -->
@@ -380,7 +380,7 @@
<find-by-primary-key map="lookupPk" value-field="finAccountSetting"/>
<set-nonpk-fields value-field="finAccountSetting" map="parameters"/>
- <store-value value-name="finAccountSetting"/>
+ <store-value value-field="finAccountSetting"/>
</simple-method>
<simple-method method-name="removeProductStoreFinActSetting" short-description="Remove a ProductStoreFinActSetting">
<check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductStoreFinActSetting you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -51,7 +51,7 @@
<simple-method method-name="updateSubscription" short-description="Update a Subscription">
<entity-one entity-name="Subscription" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="isSubscribed" short-description="check if a party has a subscription">
@@ -93,7 +93,7 @@
<simple-method method-name="updateSubscriptionResource" short-description="Update a SubscriptionResource">
<entity-one entity-name="SubscriptionResource" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="createProductSubscriptionResource" short-description="Create a ProductSubscriptionResource">
@@ -106,7 +106,7 @@
<simple-method method-name="updateProductSubscriptionResource" short-description="Update a ProductSubscriptionResource">
<entity-one entity-name="ProductSubscriptionResource" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductSubscriptionResource" short-description="Delete a ProductSubscriptionResource">
<entity-one entity-name="ProductSubscriptionResource" value-field="lookedUpValue"/>
@@ -122,7 +122,7 @@
<create-value value-field="newEntity"/>
<else>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</else>
</if-empty>
</simple-method>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -57,7 +57,7 @@
<entity-one entity-name="ItemIssuance" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteItemIssuance" short-description="Delete ItemIssuance">
<check-permission permission="FACILITY" action="_DELETE">
@@ -218,7 +218,7 @@
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
- <store-value value-name="orderShipment"/>
+ <store-value value-field="orderShipment"/>
<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"/>
@@ -250,7 +250,7 @@
<call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/>
</if-empty>
<else>
- <store-value value-name="orderItemShipGrpInvRes"/>
+ <store-value value-field="orderItemShipGrpInvRes"/>
</else>
</if-compare>
@@ -301,7 +301,7 @@
<calcop operator="get" field="quantity" map-name="parameters"/>
</calcop>
</calculate>
- <store-value value-name="shipmentItem"/>
+ <store-value value-field="shipmentItem"/>
</else>
</if-empty>
<field-to-result field="shipmentItemSeqId" map-name="shipmentItem" result-name="shipmentItemSeqId"/>
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=730369&r1=730368&r2=730369&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 Wed Dec 31 02:40:29 2008
@@ -242,7 +242,7 @@
<now-timestamp field="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
<field-to-result field="lookedUpValue.shipmentId" result-name="shipmentId"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteShipment" short-description="Delete Shipment">
<check-permission permission="FACILITY" action="_DELETE">
@@ -772,7 +772,7 @@
</calculate>
</iterate>
<set field="issuance.quantity" from-field="issuanceQuantity"/>
- <store-value value-name="issuance"/>
+ <store-value value-field="issuance"/>
<clear-field field="issuanceQuantity"/>
</iterate>
</simple-method>
@@ -806,7 +806,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteShipmentItem" short-description="Delete ShipmentItem">
<check-permission permission="FACILITY" action="_DELETE">
@@ -943,7 +943,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<set from-field="lookedUpValue.shipmentId" field="shipmentId"/>
<set from-field="lookedUpValue.shipmentPackageSeqId" field="shipmentPackageSeqId"/>
@@ -1010,7 +1010,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteShipmentPackageContent" short-description="Delete ShipmentPackageContent">
<check-permission permission="FACILITY" action="_DELETE">
@@ -1077,7 +1077,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteShipmentPackageRouteSeg" short-description="Delete ShipmentPackageRouteSeg">
<check-permission permission="FACILITY" action="_DELETE">
@@ -1116,7 +1116,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentContactMech" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteShipmentContactMech" short-description="Delete ShipmentContactMech">
<check-permission permission="FACILITY" action="_DELETE">
@@ -1177,7 +1177,7 @@
<set from-field="userLogin.userLoginId" field="lookedUpValue.updatedByUserLoginId"/>
<now-timestamp field="lookedUpValue.lastUpdatedDate"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<set from-field="lookedUpValue.shipmentId" field="shipmentId"/>
<set from-field="lookedUpValue.shipmentRouteSegmentId" field="shipmentRouteSegmentId"/>
@@ -1273,7 +1273,7 @@
<simple-method method-name="updateCarrierShipmentMethod" short-description="Updates a CarrierShipmentMethod">
<entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/>
<set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/>
- <store-value value-name="carrierShipmentMethod"/>
+ <store-value value-field="carrierShipmentMethod"/>
</simple-method>
<simple-method method-name="deleteCarrierShipmentMethod" short-description="Removes a CarrierShipmentMethod">
<entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/>
@@ -1289,7 +1289,7 @@
<simple-method method-name="updateShipmentMethodType" short-description="Updates a ShipmentMethodType">
<entity-one entity-name="ShipmentMethodType" value-field="shipmentMethodType"/>
<set-nonpk-fields map="parameters" value-field="shipmentMethodType"/>
- <store-value value-name="shipmentMethodType"/>
+ <store-value value-field="shipmentMethodType"/>
</simple-method>
<simple-method method-name="deleteShipmentMethodType" short-description="Deletes a ShipmentMethodType">
<entity-one entity-name="ShipmentMethodType" value-field="shipmentMethodType"/>
@@ -1676,7 +1676,7 @@
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="routeSegLookup" value-field="packageRouteSegment"/>
<if-not-empty field="packageRouteSegment">
<set from-field="parameters.trackingNum" field="packageRouteSegment.trackingCode"/>
- <store-value value-name="packageRouteSegment"/>
+ <store-value value-field="packageRouteSegment"/>
</if-not-empty>
<if-empty field="packageRouteSegment">
<log level="warning" message="No route segment found : ${routeSegLookup}"/>
@@ -1806,7 +1806,7 @@
<if-not-empty field="packageRouteSegment">
<set from-field="itemMap.trackingNum" field="packageRouteSegment.trackingCode"/>
- <store-value value-name="packageRouteSegment"/>
+ <store-value value-field="packageRouteSegment"/>
</if-not-empty>
<if-empty field="packageRouteSegment">
<log level="warning" message="No route segment found : ${routeSegLookup}"/>
@@ -2029,7 +2029,7 @@
<entity-one entity-name="QuantityBreak" value-field="quantityBreak" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quantityBreak"/>
- <store-value value-name="quantityBreak"/>
+ <store-value value-field="quantityBreak"/>
<check-errors/>
</simple-method>