You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2016/11/05 14:34:02 UTC
svn commit: r1768222 [5/8] - in /ofbiz/trunk:
applications/accounting/minilang/ applications/accounting/minilang/admin/
applications/accounting/minilang/budget/
applications/accounting/minilang/finaccount/
applications/accounting/minilang/invoice/ appl...
Modified: ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml Sat Nov 5 14:34:00 2016
@@ -23,7 +23,7 @@ under the License.
<simple-method method-name="createCustomerDigitalDownloadProduct" short-description="createCustomerDigitalDownloadProduct">
<now-timestamp field="nowTimestamp"/>
- <make-value value-field="createProductMap" entity-name="Product"/>
+ <make-value entity-name="Product" value-field="createProductMap"/>
<sequenced-id sequence-name="Product" field="createProductMap.productId"/>
<set field="productId" from-field="createProductMap.productId"/>
@@ -33,7 +33,7 @@ under the License.
<set field="createProductMap.productTypeId" value="DIGITAL_GOOD"/>
<create-value value-field="createProductMap"/>
- <make-value value-field="createProductPriceMap" entity-name="ProductPrice"/>
+ <make-value entity-name="ProductPrice" value-field="createProductPriceMap"/>
<set field="createProductPriceMap.productId" from-field="productId"/>
<set field="createProductPriceMap.productPriceTypeId" value="DEFAULT_PRICE"/>
<set field="createProductPriceMap.productPricePurposeId" value="PURCHASE"/>
@@ -43,7 +43,7 @@ under the License.
<set field="createProductPriceMap.price" from-field="parameters.price"/>
<create-value value-field="createProductPriceMap"/>
- <make-value value-field="createProductSupplierMap" entity-name="SupplierProduct"/>
+ <make-value entity-name="SupplierProduct" value-field="createProductSupplierMap"/>
<set field="createProductSupplierMap.productId" from-field="productId"/>
<set field="createProductSupplierMap.partyId" from-field="userLogin.partyId"/>
<set field="createProductSupplierMap.currencyUomId" from-field="parameters.currencyUomId" default-value="USD"/>
@@ -59,7 +59,7 @@ under the License.
<!-- create association with ProductStore.digProdUploadCategoryId -->
<entity-one entity-name="ProductStore" value-field="productStore"/>
<if-not-empty field="productStore.digProdUploadCategoryId">
- <make-value value-field="addProductToCategoryMap" entity-name="ProductCategoryMember"/>
+ <make-value entity-name="ProductCategoryMember" value-field="addProductToCategoryMap"/>
<set field="addProductToCategoryMap.productId" from-field="productId"/>
<set field="addProductToCategoryMap.productCategoryId" from-field="productStore.digProdUploadCategoryId"/>
<create-value value-field="addProductToCategoryMap"/>
@@ -168,7 +168,7 @@ under the License.
<check-errors/>
- <make-value value-field="productContent" entity-name="ProductContent"/>
+ <make-value entity-name="ProductContent" value-field="productContent"/>
<set field="productContent.productId" from-field="parameters.productId"/>
<set field="productContent.contentId" from-field="parameters.contentId"/>
<set field="productContent.productContentTypeId" value="DIGITAL_DOWNLOAD"/>
Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml Sat Nov 5 14:34:00 2016
@@ -22,7 +22,7 @@ under the License.
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ProductContent -->
<simple-method method-name="createProductContent" short-description="Create Content For Product">
- <make-value value-field="newEntity" entity-name="ProductContent"/>
+ <make-value entity-name="ProductContent" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -41,7 +41,7 @@ under the License.
<field-to-result field="newEntity.productContentTypeId" result-name="productContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductContent" short-description="Update Content For Product">
- <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
+ <make-value entity-name="ProductContent" value-field="lookupPKMap"/>
<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"/>
@@ -51,7 +51,7 @@ under the License.
<call-service service-name="updateContent" in-map-name="updateContent"/>
</simple-method>
<simple-method method-name="removeProductContent" short-description="Remove Content From Product">
- <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
+ <make-value entity-name="ProductContent" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml Sat Nov 5 14:34:00 2016
@@ -27,7 +27,7 @@ under the License.
</check-permission>
<check-errors/>
- <make-value value-field="newEntity" entity-name="Product"/>
+ <make-value entity-name="Product" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set from-field="parameters.productId" field="newEntity.productId"/>
@@ -83,7 +83,7 @@ under the License.
<iterate list="productCategoryRoles" entry="productCategoryRole">
<!-- add this new product to the category -->
- <make-value value-field="newLimitMember" entity-name="ProductCategoryMember"/>
+ <make-value entity-name="ProductCategoryMember" value-field="newLimitMember"/>
<set from-field="newEntity.productId" field="newLimitMember.productId"/>
<set from-field="productCategoryRole.productCategoryId" field="newLimitMember.productCategoryId"/>
<set from-field="nowTimestamp" field="newLimitMember.fromDate"/>
@@ -420,7 +420,7 @@ under the License.
<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"/>
+ <make-value entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<set from-field="parameters.productId" field="productCalculatedInfo.productId"/>
<set from-field="parameters.weight" field="productCalculatedInfo.totalTimesViewed"/>
<create-value value-field="productCalculatedInfo"/>
@@ -447,7 +447,7 @@ under the License.
</simple-method>
<simple-method method-name="createProductReview" short-description="Create a ProductReview" login-required="false">
- <make-value value-field="newEntity" entity-name="ProductReview"/>
+ <make-value entity-name="ProductReview" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set from-field="userLogin.userLoginId" field="newEntity.userLoginId"/>
<set value="PRR_PENDING" field="newEntity.statusId"/>
@@ -486,7 +486,7 @@ under the License.
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ProductReview"/>
+ <make-value entity-name="ProductReview" value-field="lookupPKMap"/>
<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"/>
@@ -509,7 +509,7 @@ under the License.
<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"/>
+ <make-value entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<set from-field="productId" field="productCalculatedInfo.productId"/>
<set from-field="averageCustomerRating" field="productCalculatedInfo.averageCustomerRating"/>
<create-value value-field="productCalculatedInfo"/>
@@ -745,7 +745,7 @@ under the License.
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ProductRole"/>
+ <make-value entity-name="ProductRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -761,7 +761,7 @@ under the License.
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
+ <make-value entity-name="ProductRole" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -773,7 +773,7 @@ under the License.
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
+ <make-value entity-name="ProductRole" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -786,7 +786,7 @@ under the License.
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/>
+ <make-value entity-name="ProductCategoryGlAccount" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml Sat Nov 5 14:34:00 2016
@@ -23,7 +23,7 @@ under the License.
<!-- ProductPromoCond methods -->
<simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond">
- <make-value value-field="newEntity" entity-name="ProductPromoCond"/>
+ <make-value entity-name="ProductPromoCond" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-not-empty field="parameters.carrierShipmentMethod">
<set field="newEntity.otherValue" from-field="parameters.carrierShipmentMethod"/>
Modified: ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml Sat Nov 5 14:34:00 2016
@@ -48,7 +48,7 @@ under the License.
<!-- now create the FacilityContactMechPurpose record -->
<if-not-empty field="parameters.contactMechPurposeTypeId">
- <make-value value-field="facilityContactMechPurpose" entity-name="FacilityContactMechPurpose"/>
+ <make-value entity-name="FacilityContactMechPurpose" value-field="facilityContactMechPurpose"/>
<set-pk-fields map="newValue" value-field="facilityContactMechPurpose"/>
<set field="facilityContactMechPurpose.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
<create-value value-field="facilityContactMechPurpose"/>
@@ -72,9 +72,9 @@ under the License.
</if-empty>
<check-errors/>
- <log message="parameters: ${parameters}" level="info"/>
+ <log level="info" message="parameters: ${parameters}"/>
<clone-value value-field="facilityContactMech" new-value-field="newFacilityContactMech"/>
- <log message="parameters: ${parameters}" level="info"/>
+ <log level="info" message="parameters: ${parameters}"/>
<!-- If we already have a new contactMechId don't update ContactMech -->
<if-empty field="parameters.newContactMechId">
<set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/>
@@ -144,7 +144,7 @@ under the License.
<simple-method method-name="createFacilityPostalAddress" short-description="Create a PostalAddress for facility">
<set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
- <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
+ <call-service service-name="createPostalAddress" in-map-name="createPostalAddressMap">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
<result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>
@@ -164,7 +164,7 @@ under the License.
<simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility">
<make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
- <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
+ <call-service service-name="updatePostalAddress" in-map-name="updatePostalAddressMap">
<default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
<result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>
@@ -184,7 +184,7 @@ under the License.
<simple-method method-name="createFacilityTelecomNumber" short-description="Create a TelecomNumber for facility">
<log level="info" message="Creating telecom number"/>
<set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>
- <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
+ <call-service service-name="createTelecomNumber" in-map-name="createTelecomNumberMap">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
<result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>
@@ -214,7 +214,7 @@ under the License.
<set field="updateFacilityContactMechMap.contactMechTypeId" value="TELECOM_NUMBER"/>
<log level="info" message="Copied id to updateFacilityContactMechMap: ${updateFacilityContactMechMap.newContactMechId}"/>
- <call-service in-map-name="updateFacilityContactMechMap" service-name="updateFacilityContactMech">
+ <call-service service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap">
<default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
@@ -278,7 +278,7 @@ under the License.
</if-not-empty>
<now-timestamp field="nowTimestamp"/>
- <make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/>
+ <make-value entity-name="FacilityContactMechPurpose" value-field="newEntity"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId"/>
<set field="newEntity.contactMechId" from-field="parameters.contactMechId"/>
<set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
Modified: ofbiz/trunk/applications/product/minilang/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/storage/StorageServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/storage/StorageServices.xml Sat Nov 5 14:34:00 2016
@@ -23,7 +23,7 @@ under the License.
<!-- Facility Location Services -->
<simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
- <make-value value-field="newEntity" entity-name="FacilityLocation"/>
+ <make-value entity-name="FacilityLocation" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId"/>
@@ -63,14 +63,14 @@ under the License.
</simple-method>
<simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
- <make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/>
+ <make-value entity-name="FacilityGroupRole" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFacilityContent" short-description="Delete Content From Facility">
- <make-value value-field="lookupPKMap" entity-name="FacilityContent"/>
+ <make-value entity-name="FacilityContent" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityContent" map="lookupPKMap" value-field="lookedUpValue"/>
<now-timestamp field="lookedUpValue.thruDate"/>
Modified: ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml Sat Nov 5 14:34:00 2016
@@ -49,7 +49,7 @@ under the License.
<check-errors/>
</if-compare>
- <make-value value-field="newEntity" entity-name="ProductStore"/>
+ <make-value entity-name="ProductStore" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductStore" field="productStoreId"/>
@@ -62,7 +62,7 @@ under the License.
<now-timestamp field="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
- <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
+ <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/>
<set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
@@ -119,7 +119,7 @@ under the License.
</iterate>
</if-compare>
<!-- create the new entry -->
- <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
+ <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/>
<set from-field="store.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="store.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
Modified: ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml Sat Nov 5 14:34:00 2016
@@ -26,7 +26,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/minilang/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ItemIssuance"/>
+ <make-value entity-name="ItemIssuance" value-field="newEntity"/>
<sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/>
<field-to-result field="newEntity.itemIssuanceId" result-name="itemIssuanceId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -87,7 +87,7 @@ under the License.
<set value="Create ItemIssuanceRole" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/minilang/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ItemIssuanceRole"/>
+ <make-value entity-name="ItemIssuanceRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Sat Nov 5 14:34:00 2016
@@ -908,7 +908,7 @@ under the License.
-->
<simple-method method-name="editPicklistItem" short-description="Edit a Picklist Item">
- <make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
+ <make-value entity-name="PicklistItem" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="picklistItem"/>
@@ -1208,7 +1208,7 @@ under the License.
A Map with a List of PicklistItemInfo records keyed by the productId
-->
<if-not-empty field="picklistItemInfo.inventoryItemAndLocation.locationSeqId">
- <make-value value-field="facilityLocation" entity-name="FacilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/>
+ <make-value entity-name="FacilityLocation" value-field="facilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/>
<set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap[facilityLocation.locationSeqId]"/>
<clear-field field="picklistItemInfoTempList"/>
@@ -1566,12 +1566,12 @@ under the License.
<!-- special method to check update the picklist status from the item status -->
<simple-method method-name="checkPicklistBinItemStatuses" short-description="Checks the item status and updates the pick list status">
<!-- find the picklist bin -->
- <make-value value-field="binLookup" entity-name="PicklistBin"/>
+ <make-value entity-name="PicklistBin" value-field="binLookup"/>
<set-pk-fields map="parameters" value-field="binLookup"/>
<find-by-primary-key map="binLookup" value-field="picklistBin"/>
<!-- find the pick list -->
- <make-value value-field="plLookup" entity-name="Picklist"/>
+ <make-value entity-name="Picklist" value-field="plLookup"/>
<set-pk-fields map="picklistBin" value-field="plLookup"/>
<find-by-primary-key map="plLookup" value-field="picklist"/>
Modified: ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml Sat Nov 5 14:34:00 2016
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createShipmentReceipt" short-description="Create a ShipmentReceipt">
- <make-value value-field="newEntity" entity-name="ShipmentReceipt"/>
+ <make-value entity-name="ShipmentReceipt" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ShipmentReceipt" field="receiptId"/>
@@ -64,7 +64,7 @@ under the License.
</simple-method>
<simple-method method-name="createShipmentReceiptRole" short-description="Create a ShipmentReceipt Role">
- <make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/>
+ <make-value entity-name="ShipmentReceiptRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -72,7 +72,7 @@ under the License.
</simple-method>
<simple-method method-name="removeShipmentReceiptRole" short-description="Remove a ShipmentReceipt Role">
- <make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/>
+ <make-value entity-name="ShipmentReceiptRole" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentReceiptRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Sat Nov 5 14:34:00 2016
@@ -22,7 +22,7 @@ under the License.
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- Shipment services -->
<simple-method method-name="createShipment" short-description="Create Shipment">
- <make-value value-field="newEntity" entity-name="Shipment"/>
+ <make-value entity-name="Shipment" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-not-empty field="parameters.shipmentId">
@@ -115,7 +115,7 @@ under the License.
<set value="Update Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
- <make-value value-field="lookupPKMap" entity-name="Shipment"/>
+ <make-value entity-name="Shipment" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
@@ -821,7 +821,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ShipmentItem"/>
+ <make-value entity-name="ShipmentItem" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- if no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
@@ -834,7 +834,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
+ <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -856,7 +856,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
+ <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -949,7 +949,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ShipmentPackage"/>
+ <make-value entity-name="ShipmentPackage" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -974,7 +974,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusShipped"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/>
+ <make-value entity-name="ShipmentPackage" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -1033,7 +1033,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
+ <make-value entity-name="ShipmentPackageContent" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -1045,7 +1045,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
+ <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -1056,7 +1056,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
+ <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -1065,7 +1065,7 @@ under the License.
<set value="Create ShipmentPackageContent" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
+ <make-value entity-name="ShipmentPackageContent" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<find-by-primary-key value-field="shipmentPackageContent" map="newEntity"/>
<log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
@@ -1090,14 +1090,14 @@ under the License.
<!-- ShipmentPackageRouteSeg services -->
<simple-method method-name="createShipmentPackageRouteSeg" short-description="Create ShipmentPackageRouteSeg">
- <make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/>
+ <make-value entity-name="ShipmentPackageRouteSeg" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateShipmentPackageRouteSeg" short-description="Update ShipmentPackageRouteSeg">
- <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
+ <make-value entity-name="ShipmentPackageRouteSeg" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -1108,7 +1108,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
+ <make-value entity-name="ShipmentPackageRouteSeg" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -1120,7 +1120,7 @@ under the License.
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/>
+ <make-value entity-name="ShipmentRouteSegment" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -1238,7 +1238,7 @@ under the License.
<!-- shipment method type services -->
<simple-method method-name="createCarrierShipmentMethod" short-description="Creates a CarrierShipmentMethod">
- <make-value value-field="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/>
+ <make-value entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/>
<set-pk-fields map="parameters" value-field="carrierShipmentMethod"/>
<set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/>
<create-value value-field="carrierShipmentMethod"/>
@@ -1254,7 +1254,7 @@ under the License.
</simple-method>
<simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType">
- <make-value value-field="shipmentMethodType" entity-name="ShipmentMethodType"/>
+ <make-value entity-name="ShipmentMethodType" value-field="shipmentMethodType"/>
<set-pk-fields map="parameters" value-field="shipmentMethodType"/>
<set-nonpk-fields map="parameters" value-field="shipmentMethodType"/>
<create-value value-field="shipmentMethodType"/>
@@ -2027,7 +2027,7 @@ under the License.
<!-- QuantityBreak services -->
<!-- create a new QuantityBreak -->
<simple-method method-name="createQuantityBreak" short-description="Create a QuoteAttribute">
- <make-value value-field="quantityBreak" entity-name="QuantityBreak"/>
+ <make-value entity-name="QuantityBreak" value-field="quantityBreak"/>
<set-nonpk-fields map="parameters" value-field="quantityBreak"/>
<sequenced-id sequence-name="QuantityBreak" field="quantityBreak.quantityBreakId"/>
<create-value value-field="quantityBreak"/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Nov 5 14:34:00 2016
@@ -2527,19 +2527,19 @@ under the License.
</request-map>
<request-map uri="createProductConfigItem">
<security auth="true" https="true"/>
- <event invoke="createProductConfigItem" path="" type="service"/>
+ <event type="service" invoke="createProductConfigItem" path=""/>
<response name="success" type="view" value="EditProductConfigItem"/>
<response name="error" type="view" value="EditProductConfigItem"/>
</request-map>
<request-map uri="updateProductConfigItem">
<security auth="true" https="true"/>
- <event invoke="updateProductConfigItem" path="" type="service"/>
+ <event type="service" invoke="updateProductConfigItem" path=""/>
<response name="success" type="view" value="EditProductConfigItem"/>
<response name="error" type="view" value="EditProductConfigItem"/>
</request-map>
<request-map uri="deleteProductConfigItem">
<security auth="true" https="true"/>
- <event invoke="deleteProductConfigItem" path="" type="service"/>
+ <event type="service" invoke="deleteProductConfigItem" path=""/>
<response name="success" type="view" value="EditProductConfigItem"/>
<response name="error" type="view" value="EditProductConfigItem"/>
</request-map>
@@ -2551,19 +2551,19 @@ under the License.
</request-map>
<request-map uri="createProductConfigOption">
<security auth="true" https="true"/>
- <event invoke="createProductConfigOption" type="service"/>
+ <event type="service" invoke="createProductConfigOption"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="updateProductConfigOption">
<security auth="true" https="true"/>
- <event invoke="updateProductConfigOption" type="service"/>
+ <event type="service" invoke="updateProductConfigOption"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="deleteProductConfigOption">
<security auth="true" https="true"/>
- <event invoke="deleteProductConfigOption" type="service"/>
+ <event type="service" invoke="deleteProductConfigOption"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
@@ -2571,19 +2571,19 @@ under the License.
<!-- Product Config Product Requests -->
<request-map uri="createProductConfigProduct">
<security auth="true" https="true"/>
- <event invoke="createProductConfigProduct" type="service"/>
+ <event type="service" invoke="createProductConfigProduct"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="updateProductConfigProduct">
<security auth="true" https="true"/>
- <event invoke="updateProductConfigProduct" type="service"/>
+ <event type="service" invoke="updateProductConfigProduct"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="deleteProductConfigProduct">
<security auth="true" https="true"/>
- <event invoke="deleteProductConfigProduct" type="service"/>
+ <event type="service" invoke="deleteProductConfigProduct"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sat Nov 5 14:34:00 2016
@@ -827,7 +827,7 @@ under the License.
</request-map>
<request-map uri="deleteFacilityContent">
<security auth="true" https="true"/>
- <event invoke="deleteFacilityContent" type="service"/>
+ <event type="service" invoke="deleteFacilityContent"/>
<response name="success" type="request-redirect" value="EditFacilityContent">
<redirect-parameter name="facilityId"/>
</response>
Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml Sat Nov 5 14:34:00 2016
@@ -70,8 +70,8 @@ under the License.
<field use-when="configItem==null&&configItemId==null" name="configItemId" title="${uiLabelMap.ProductConfigItem}"><ignored/></field>
<field name="configItemTypeId" title="${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
- <option key="SINGLE" description="${uiLabelMap.ProductSingleChoice}"/>
- <option key="MULTIPLE" description="${uiLabelMap.ProductMultiChoice}"/>
+ <option key="${uiLabelMap.ProductSingleChoice}" description="SINGLE"/>
+ <option key="${uiLabelMap.ProductMultiChoice}" description="MULTIPLE"/>
</drop-down>
</field>
Modified: ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml Sat Nov 5 14:34:00 2016
@@ -223,8 +223,8 @@ under the License.
</field>
<field name="showInSelect">
<drop-down allow-empty="true">
- <option key="Y" description="${uiLabelMap.CommonYes}"/>
- <option key="N" description="${uiLabelMap.CommonNo}"/>
+ <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option key="${uiLabelMap.CommonNo}" description="N"/>
</drop-down>
</field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Sat Nov 5 14:34:00 2016
@@ -100,18 +100,18 @@ under the License.
</field>
<field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}">
<radio no-current-selected-key="${checkRadio}">
- <option key="IM_APPROVED__${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/>
- <option key="IM_REJECTED__${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/>
- <option key="IM_PENDING__${productId}" description="${uiLabelMap.FormFieldTitle_pending}"/>
+ <option key="${uiLabelMap.FormFieldTitle_approve}" description="IM_APPROVED__${productId}"/>
+ <option key="${uiLabelMap.FormFieldTitle_rejectButton}" description="IM_REJECTED__${productId}"/>
+ <option key="${uiLabelMap.FormFieldTitle_pending}" description="IM_PENDING__${productId}"/>
</radio>
</field>
<field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field>
<field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="checkStatusId" position="2" title="${uiLabelMap.CommonStatus}">
<radio no-current-selected-key="${checkRadio}">
- <option key="IM_APPROVED/${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/>
- <option key="IM_REJECTED/${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/>
- <option key="IM_PENDING/${productId}" description="${uiLabelMap.FormFieldTitle_pending}"/>
+ <option key="${uiLabelMap.FormFieldTitle_approve}" description="IM_APPROVED/${productId}"/>
+ <option key="${uiLabelMap.FormFieldTitle_rejectButton}" description="IM_REJECTED/${productId}"/>
+ <option key="${uiLabelMap.FormFieldTitle_pending}" description="IM_PENDING/${productId}"/>
</radio>
</field>
<field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field>
@@ -310,9 +310,9 @@ under the License.
document.ListImageManage.action='checkAction?productId=${productId}&contentId=${contentId}&dataResourceId=${dataResourceId}';
document.ListImageManage.submit();">
<drop-down allow-empty="true">
- <option key="frame" description="${uiLabelMap.ImageManagementFrame}"/>
- <option key="crop" description="${uiLabelMap.ImageManagementCrop}"/>
- <option key="rotate" description="${uiLabelMap.ImageManagementRotate}"/>
+ <option key="${uiLabelMap.ImageManagementFrame}" description="frame"/>
+ <option key="${uiLabelMap.ImageManagementCrop}" description="crop"/>
+ <option key="${uiLabelMap.ImageManagementRotate}" description="rotate"/>
</drop-down>
</field>
<field name="description" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementCaption}"><text/></field>
@@ -765,8 +765,8 @@ under the License.
<form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeImages">
<field name="resizeOption">
<drop-down >
- <option key="resizeAllImages" description="Resize All Images"/>
- <option key="createNewThumbnail" description="Create New Thumbnail Size"/>
+ <option key="Resize All Images" description="resizeAllImages"/>
+ <option key="Create New Thumbnail Size" description="createNewThumbnail"/>
</drop-down>
</field>
<field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml Sat Nov 5 14:34:00 2016
@@ -60,8 +60,8 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text size="60"/></field>
<field name="isSale" title="${uiLabelMap.ProductSaleRule}">
<drop-down>
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="timestamp"/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sat Nov 5 14:34:00 2016
@@ -70,7 +70,7 @@ under the License.
<field name="catalogName"><text size="30" maxlength="60"/></field>
<field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="styleSheet" title="${uiLabelMap.ProductStyleSheet}"><text size="60" maxlength="250"/></field>
@@ -79,10 +79,10 @@ under the License.
<field name="templatePathPrefix" title="${uiLabelMap.ProductTemplatePathPrefix}" tooltip="${uiLabelMap.ProductPrependedTemplatePaths}"><text size="60" maxlength="250"/></field>
<field name="viewAllowPermReqd" title="${uiLabelMap.ProductCategoryViewAllowPermReqd}">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="purchaseAllowPermReqd" title="${uiLabelMap.ProductCategoryPurchaseAllowPermReqd}">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Nov 5 14:34:00 2016
@@ -78,10 +78,10 @@ under the License.
</drop-down>
</field>
<field position="1" name="isVirtual" title="${uiLabelMap.ProductVirtualProduct}">
- <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
+ <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
</field>
<field position="2" name="isVariant" title="${uiLabelMap.ProductVariantProduct}">
- <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
+ <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
</field>
<field position="3" name="virtualVariantMethodEnum" title="${uiLabelMap.ProductVirtualVariantMethod}">
<drop-down allow-empty="true">
@@ -112,7 +112,7 @@ under the License.
<field position="4" name="supportDiscontinuationDate" title="${uiLabelMap.ProductSupportThruDate}" red-when="before-now"><date-time/></field>
<field name="salesDiscWhenNotAvail" title="${uiLabelMap.ProductSalesDiscontinuationNotAvailable}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field position="1" name="requirementMethodEnumId" title="${uiLabelMap.ProductRequirementMethodEnumId}">
<drop-down allow-empty="true">
@@ -124,7 +124,7 @@ under the License.
</field>
<field name="requireInventory" title="${uiLabelMap.ProductRequireInventory}" tooltip="${uiLabelMap.ProductInventoryRequiredProduct}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="inventoryMessage" title="${uiLabelMap.ProductInventoryMessage}"><text size="20" maxlength="255"/></field>
<field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}" use-when="product==null">
@@ -140,9 +140,9 @@ under the License.
<field name="lotIdFilledIn" title="${uiLabelMap.ProductLotId}">
<drop-down allow-empty="false">
- <option key="Allowed" description="${uiLabelMap.lotIdFilledInAllowed}"/>
- <option key="Mandatory" description="${uiLabelMap.lotIdFilledInMandatory}"/>
- <option key="Forbidden" description="${uiLabelMap.lotIdFilledInForbidden}"/>
+ <option key="${uiLabelMap.lotIdFilledInAllowed}" description="Allowed"/>
+ <option key="${uiLabelMap.lotIdFilledInMandatory}" description="Mandatory"/>
+ <option key="${uiLabelMap.lotIdFilledInForbidden}" description="Forbidden"/>
</drop-down>
</field>
@@ -157,7 +157,7 @@ under the License.
<field position="2" title="${uiLabelMap.ProductRating}" name="productRating"><text size="10" maxlength="20"/></field>
<field position="1" name="requireAmount" title="${uiLabelMap.ProductRequireAmount}" tooltip="${uiLabelMap.ProductRequireCustomerAmount}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field position="2" name="amountUomTypeId" title="${uiLabelMap.ProductAmountUomTypeId}">
<drop-down allow-empty="true">
@@ -231,7 +231,7 @@ under the License.
</field>
<field position="1" name="piecesIncluded" title="${uiLabelMap.ProductPiecesIncluded}"><text size="10" maxlength="20"/></field>
<field position="2" name="inShippingBox" title="${uiLabelMap.ProductShippingBox}">
- <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
+ <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
</field>
<field position="3" name="defaultShipmentBoxTypeId" title="${uiLabelMap.ProductDefaultShipmentBoxTypeId}">
<drop-down allow-empty="true">
@@ -241,21 +241,21 @@ under the License.
</drop-down>
</field>
<field position="4" name="chargeShipping" title="${uiLabelMap.ProductChargeShipping}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}">
- <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="contentInfoText" title="${uiLabelMap.ProductContentInfoText}" widget-style="tooltip">
@@ -281,7 +281,7 @@ under the License.
<display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
</field>
<field name="orderDecimalQuantity" >
- <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="true" ><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<sort-order>
<field-group>
@@ -942,8 +942,8 @@ under the License.
</field>
<field name="canDropShip" title="${uiLabelMap.ProductSupplierCanDropShip}">
<drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
@@ -1005,8 +1005,8 @@ under the License.
<field name="productId"><hidden value="${productId}"/></field>
<field name="configTypeId">
<drop-down allow-empty="false">
- <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/>
- <option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/>
+ <option key="${uiLabelMap.ProductStandard}" description="STANDARD"/>
+ <option key="${uiLabelMap.ProductQuestion}" description="QUESTION"/>
</drop-down>
</field>
<field name="configItemId" title="${uiLabelMap.ProductConfigItem}">
@@ -1033,8 +1033,8 @@ under the License.
</field>
<field name="configTypeId">
<drop-down allow-empty="false">
- <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/>
- <option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/>
+ <option key="${uiLabelMap.ProductStandard}" description="STANDARD"/>
+ <option key="${uiLabelMap.ProductQuestion}" description="QUESTION"/>
</drop-down>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
@@ -1308,7 +1308,7 @@ under the License.
<field name="productId"><hidden value="${productId}"/></field>
<field name="costComponentTypePrefix">
<drop-down allow-empty="false">
- <option key="EST_STD" description="${uiLabelMap.ProductEstimatedCosts}"/>
+ <option key="${uiLabelMap.ProductEstimatedCosts}" description="EST_STD"/>
</drop-down>
</field>
<field name="costUomId" title="${uiLabelMap.CommonCurrency}">
@@ -1436,7 +1436,7 @@ under the License.
<field name="productId"><hidden value="${productId}"/></field>
<field name="costComponentTypePrefix">
<drop-down allow-empty="false">
- <option key="EST_STD" description="${uiLabelMap.ProductEstimatedCosts}"/>
+ <option key="${uiLabelMap.ProductEstimatedCosts}" description="EST_STD"/>
</drop-down>
</field>
<field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml Sat Nov 5 14:34:00 2016
@@ -49,13 +49,13 @@ under the License.
<field name="promoText" title="${uiLabelMap.ProductPromoText}"><textarea cols="70" rows="5"/></field>
<field name="userEntered" title="${uiLabelMap.ProductPromoUserEntered}">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="showToCustomer" title="${uiLabelMap.ProductPromoShowToCustomer}">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="requireCode" title="${uiLabelMap.ProductPromotionReqCode}">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
</field>
<field name="overrideOrgPartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -86,10 +86,10 @@ under the License.
<field use-when="productPromoCode==null&&productPromoCodeId==null" name="productPromoCodeId" tooltip="${uiLabelMap.ProductPromoCodeBlank}"><text/></field>
<field name="userEntered">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
</field>
<field name="requireEmailOrParty">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>