svn commit: r1772885 [6/9] - in /ofbiz/branches/release16.11: ./ applications/accounting/minila
Locked
svn commit: r1772885 [6/9] - in /ofbiz/branches/release16.11: ./ applications/accounting/minila
 
|
Modified: ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml Tue Dec 6 12:45:34 2016 @@ -27,7 +27,7 @@ under the License. </check-permission> <check-errors/> - <make-value entity-name="Product" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Product"/> <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 entity-name="ProductCategoryMember" value-field="newLimitMember"/> + <make-value value-field="newLimitMember" entity-name="ProductCategoryMember"/> <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 entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/> + <make-value value-field="productCalculatedInfo" entity-name="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 entity-name="ProductReview" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductReview"/> <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 entity-name="ProductReview" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ProductReview"/> <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 entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/> + <make-value value-field="productCalculatedInfo" entity-name="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 entity-name="ProductRole" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductRole"/> <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 entity-name="ProductRole" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ProductRole"/> <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 entity-name="ProductRole" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ProductRole"/> <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 entity-name="ProductCategoryGlAccount" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/branches/release16.11/applications/product/minilang/product/promo/PromoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/promo/PromoServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/promo/PromoServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/promo/PromoServices.xml Tue Dec 6 12:45:34 2016 @@ -23,7 +23,7 @@ under the License. <!-- ProductPromoCond methods --> <simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond"> - <make-value entity-name="ProductPromoCond" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductPromoCond"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-not-empty field="parameters.carrierShipmentMethod"> <set field="newEntity.otherValue" from-field="parameters.carrierShipmentMethod"/> Modified: ofbiz/branches/release16.11/applications/product/minilang/product/storage/FacilityContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/storage/FacilityContactMechServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/storage/FacilityContactMechServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/storage/FacilityContactMechServices.xml Tue Dec 6 12:45:34 2016 @@ -48,7 +48,7 @@ under the License. <!-- now create the FacilityContactMechPurpose record --> <if-not-empty field="parameters.contactMechPurposeTypeId"> - <make-value entity-name="FacilityContactMechPurpose" value-field="facilityContactMechPurpose"/> + <make-value value-field="facilityContactMechPurpose" entity-name="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 level="info" message="parameters: ${parameters}"/> + <log message="parameters: ${parameters}" level="info"/> <clone-value value-field="facilityContactMech" new-value-field="newFacilityContactMech"/> - <log level="info" message="parameters: ${parameters}"/> + <log message="parameters: ${parameters}" level="info"/> <!-- 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 service-name="createPostalAddress" in-map-name="createPostalAddressMap"> + <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress"> <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 service-name="updatePostalAddress" in-map-name="updatePostalAddressMap"> + <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress"> <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 service-name="createTelecomNumber" in-map-name="createTelecomNumberMap"> + <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber"> <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 service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap"> + <call-service in-map-name="updateFacilityContactMechMap" service-name="updateFacilityContactMech"> <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 entity-name="FacilityContactMechPurpose" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/> <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/branches/release16.11/applications/product/minilang/product/storage/StorageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/storage/StorageServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/storage/StorageServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/storage/StorageServices.xml Tue Dec 6 12:45:34 2016 @@ -23,7 +23,7 @@ under the License. <!-- Facility Location Services --> <simple-method method-name="createFacilityLocation" short-description="Create a Facility Location"> - <make-value entity-name="FacilityLocation" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="FacilityLocation"/> <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 entity-name="FacilityGroupRole" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/> <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 entity-name="FacilityContent" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="FacilityContent"/> <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/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml Tue Dec 6 12:45:34 2016 @@ -49,7 +49,7 @@ under the License. <check-errors/> </if-compare> - <make-value entity-name="ProductStore" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductStore"/> <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 entity-name="ProductStoreFacility" value-field="storeFacility"/> + <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> <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 entity-name="ProductStoreFacility" value-field="storeFacility"/> + <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> <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/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml Tue Dec 6 12:45:34 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 entity-name="ItemIssuance" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ItemIssuance"/> <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 entity-name="ItemIssuanceRole" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ItemIssuanceRole"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/branches/release16.11/applications/product/minilang/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/shipment/picklist/PicklistServices.xml Tue Dec 6 12:45:34 2016 @@ -900,7 +900,7 @@ under the License. --> <simple-method method-name="editPicklistItem" short-description="Edit a Picklist Item"> - <make-value entity-name="PicklistItem" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="PicklistItem"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="picklistItem"/> @@ -1192,7 +1192,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 entity-name="FacilityLocation" value-field="facilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/> + <make-value value-field="facilityLocation" entity-name="FacilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/> <set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap[facilityLocation.locationSeqId]"/> <clear-field field="picklistItemInfoTempList"/> @@ -1550,12 +1550,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 entity-name="PicklistBin" value-field="binLookup"/> + <make-value value-field="binLookup" entity-name="PicklistBin"/> <set-pk-fields map="parameters" value-field="binLookup"/> <find-by-primary-key map="binLookup" value-field="picklistBin"/> <!-- find the pick list --> - <make-value entity-name="Picklist" value-field="plLookup"/> + <make-value value-field="plLookup" entity-name="Picklist"/> <set-pk-fields map="picklistBin" value-field="plLookup"/> <find-by-primary-key map="plLookup" value-field="picklist"/> Modified: ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 6 12:45:34 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 entity-name="ShipmentReceipt" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentReceipt"/> <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 entity-name="ShipmentReceiptRole" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/> <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 entity-name="ShipmentReceiptRole" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/> <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/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml Tue Dec 6 12:45:34 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 entity-name="Shipment" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Shipment"/> <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 entity-name="Shipment" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="Shipment"/> <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 entity-name="ShipmentItem" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentItem"/> <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 entity-name="ShipmentItem" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/> <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 entity-name="ShipmentItem" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/> <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 entity-name="ShipmentPackage" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentPackage"/> <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 entity-name="ShipmentPackage" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/> <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 entity-name="ShipmentPackageContent" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/> <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 entity-name="ShipmentPackageContent" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/> <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 entity-name="ShipmentPackageContent" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/> <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 entity-name="ShipmentPackageContent" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/> <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,7 +1090,7 @@ under the License. <!-- ShipmentPackageRouteSeg services --> <simple-method method-name="createShipmentPackageRouteSeg" short-description="Create ShipmentPackageRouteSeg"> - <make-value entity-name="ShipmentPackageRouteSeg" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1101,7 +1101,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value entity-name="ShipmentPackageRouteSeg" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/> <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"/> @@ -1113,7 +1113,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value entity-name="ShipmentRouteSegment" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1231,7 +1231,7 @@ under the License. <!-- shipment method type services --> <simple-method method-name="createCarrierShipmentMethod" short-description="Creates a CarrierShipmentMethod"> - <make-value entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/> + <make-value value-field="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/> <set-pk-fields map="parameters" value-field="carrierShipmentMethod"/> <set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/> <create-value value-field="carrierShipmentMethod"/> @@ -1242,7 +1242,7 @@ under the License. </simple-method> <simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType"> - <make-value entity-name="ShipmentMethodType" value-field="shipmentMethodType"/> + <make-value value-field="shipmentMethodType" entity-name="ShipmentMethodType"/> <set-pk-fields map="parameters" value-field="shipmentMethodType"/> <set-nonpk-fields map="parameters" value-field="shipmentMethodType"/> <create-value value-field="shipmentMethodType"/> @@ -2015,7 +2015,7 @@ under the License. <!-- QuantityBreak services --> <!-- create a new QuantityBreak --> <simple-method method-name="createQuantityBreak" short-description="Create a QuoteAttribute"> - <make-value entity-name="QuantityBreak" value-field="quantityBreak"/> + <make-value value-field="quantityBreak" entity-name="QuantityBreak"/> <set-nonpk-fields map="parameters" value-field="quantityBreak"/> <sequenced-id sequence-name="QuantityBreak" field="quantityBreak.quantityBreakId"/> <create-value value-field="quantityBreak"/> Modified: ofbiz/branches/release16.11/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/release16.11/applications/product/webapp/catalog/WEB-INF/controller.xml Tue Dec 6 12:45:34 2016 @@ -2527,19 +2527,19 @@ under the License. </request-map> <request-map uri="createProductConfigItem"> <security auth="true" https="true"/> - <event type="service" invoke="createProductConfigItem" path=""/> + <event invoke="createProductConfigItem" path="" type="service"/> <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 type="service" invoke="updateProductConfigItem" path=""/> + <event invoke="updateProductConfigItem" path="" type="service"/> <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 type="service" invoke="deleteProductConfigItem" path=""/> + <event invoke="deleteProductConfigItem" path="" type="service"/> <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 type="service" invoke="createProductConfigOption"/> + <event invoke="createProductConfigOption" type="service"/> <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 type="service" invoke="updateProductConfigOption"/> + <event invoke="updateProductConfigOption" type="service"/> <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 type="service" invoke="deleteProductConfigOption"/> + <event invoke="deleteProductConfigOption" type="service"/> <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 type="service" invoke="createProductConfigProduct"/> + <event invoke="createProductConfigProduct" type="service"/> <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 type="service" invoke="updateProductConfigProduct"/> + <event invoke="updateProductConfigProduct" type="service"/> <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 type="service" invoke="deleteProductConfigProduct"/> + <event invoke="deleteProductConfigProduct" type="service"/> <response name="success" type="view" value="EditProductConfigOptions"/> <response name="error" type="view" value="EditProductConfigOptions"/> </request-map> Modified: ofbiz/branches/release16.11/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/branches/release16.11/applications/product/webapp/facility/WEB-INF/controller.xml Tue Dec 6 12:45:34 2016 @@ -827,7 +827,7 @@ under the License. </request-map> <request-map uri="deleteFacilityContent"> <security auth="true" https="true"/> - <event type="service" invoke="deleteFacilityContent"/> + <event invoke="deleteFacilityContent" type="service"/> <response name="success" type="request-redirect" value="EditFacilityContent"> <redirect-parameter name="facilityId"/> </response> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/ConfigForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/ConfigForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/ConfigForms.xml Tue Dec 6 12:45:34 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="${uiLabelMap.ProductSingleChoice}" description="SINGLE"/> - <option key="${uiLabelMap.ProductMultiChoice}" description="MULTIPLE"/> + <option key="SINGLE" description="${uiLabelMap.ProductSingleChoice}"/> + <option key="MULTIPLE" description="${uiLabelMap.ProductMultiChoice}"/> </drop-down> </field> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/FieldLookupForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/FieldLookupForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/FieldLookupForms.xml Tue Dec 6 12:45:34 2016 @@ -223,8 +223,8 @@ under the License. </field> <field name="showInSelect"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </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/branches/release16.11/applications/product/widget/catalog/ImageManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/ImageManagementForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/ImageManagementForms.xml Tue Dec 6 12:45:34 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="${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}"/> + <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}"/> </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="${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}"/> + <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}"/> </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="${uiLabelMap.ImageManagementFrame}" description="frame"/> - <option key="${uiLabelMap.ImageManagementCrop}" description="crop"/> - <option key="${uiLabelMap.ImageManagementRotate}" description="rotate"/> + <option key="frame" description="${uiLabelMap.ImageManagementFrame}"/> + <option key="crop" description="${uiLabelMap.ImageManagementCrop}"/> + <option key="rotate" description="${uiLabelMap.ImageManagementRotate}"/> </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="Resize All Images" description="resizeAllImages"/> - <option key="Create New Thumbnail Size" description="createNewThumbnail"/> + <option key="resizeAllImages" description="Resize All Images"/> + <option key="createNewThumbnail" description="Create New Thumbnail Size"/> </drop-down> </field> <field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/PriceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/PriceForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/PriceForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/PriceForms.xml Tue Dec 6 12:45:34 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="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="timestamp"/></field> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/ProdCatalogForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/ProdCatalogForms.xml Tue Dec 6 12:45:34 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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="purchaseAllowPermReqd" title="${uiLabelMap.ProductCategoryPurchaseAllowPermReqd}"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/ProductForms.xml Tue Dec 6 12:45:34 2016 @@ -78,10 +78,10 @@ under the License. </drop-down> </field> <field position="1" name="isVirtual" title="${uiLabelMap.ProductVirtualProduct}"> - <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down> + <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down> </field> <field position="2" name="isVariant" title="${uiLabelMap.ProductVariantProduct}"> - <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down> + <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></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="${uiLabelMap.lotIdFilledInAllowed}" description="Allowed"/> - <option key="${uiLabelMap.lotIdFilledInMandatory}" description="Mandatory"/> - <option key="${uiLabelMap.lotIdFilledInForbidden}" description="Forbidden"/> + <option key="Allowed" description="${uiLabelMap.lotIdFilledInAllowed}"/> + <option key="Mandatory" description="${uiLabelMap.lotIdFilledInMandatory}"/> + <option key="Forbidden" description="${uiLabelMap.lotIdFilledInForbidden}"/> </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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></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="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down> + <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></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="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </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="${uiLabelMap.ProductStandard}" description="STANDARD"/> - <option key="${uiLabelMap.ProductQuestion}" description="QUESTION"/> + <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/> + <option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/> </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="${uiLabelMap.ProductStandard}" description="STANDARD"/> - <option key="${uiLabelMap.ProductQuestion}" description="QUESTION"/> + <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/> + <option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/> </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="${uiLabelMap.ProductEstimatedCosts}" description="EST_STD"/> + <option key="EST_STD" description="${uiLabelMap.ProductEstimatedCosts}"/> </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="${uiLabelMap.ProductEstimatedCosts}" description="EST_STD"/> + <option key="EST_STD" description="${uiLabelMap.ProductEstimatedCosts}"/> </drop-down> </field> <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}"> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/PromoForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/PromoForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/PromoForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/PromoForms.xml Tue Dec 6 12:45:34 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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showToCustomer" title="${uiLabelMap.ProductPromoShowToCustomer}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireCode" title="${uiLabelMap.ProductPromotionReqCode}"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></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="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireEmailOrParty"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/branches/release16.11/applications/product/widget/catalog/StoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/catalog/StoreForms.xml?rev=1772885&r1=1772884&r2=1772885&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/widget/catalog/StoreForms.xml (original) +++ ofbiz/branches/release16.11/applications/product/widget/catalog/StoreForms.xml Tue Dec 6 12:45:34 2016 @@ -74,44 +74,44 @@ under the License. </field> <field name="manualAuthIsCapture"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="prorateShipping"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="prorateTaxes"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="viewCartOnAdd"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoSaveCart"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoApproveReviews"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoInvoiceDigitalItems"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reqShipAddrForDigItems"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="isDemoStore"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="isImmediatelyFulfilled"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="checkInventory"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireInventory"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reserveInventory"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reserveOrderEnumId"> <drop-down allow-empty="true"> @@ -122,13 +122,13 @@ under the License. </drop-down> </field> <field name="balanceResOnOrderCreation"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showOutOfStockProducts"> - <drop-down allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="oneInventoryFacility"> - <drop-down allow-empty="true" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requirementMethodEnumId"> <drop-down allow-empty="true"> @@ -141,7 +141,7 @@ under the License. <!-- <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> --> <field name="defaultCurrencyUomId"> @@ -161,10 +161,10 @@ under the License. </drop-down> </field> <field name="allowPassword"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="retryFailedAuths"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="headerApprovedStatus"> <drop-down no-current-selected-key="ORDER_APPROVED"> @@ -240,8 +240,8 @@ under the License. <field name="oldStyleSheet"><hidden/></field> <field name="managedByLot" title="${uiLabelMap.ProductManagedByLot}"> <drop-down allow-empty="false" no-current-selected-key="N"> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <field name="oldHeaderLogo"><hidden/></field> @@ -252,68 +252,68 @@ under the License. <field name="templatePathPrefix" tooltip="If specified will be prepended to template paths. Should start with a slash but not end with one."><text size="60" maxlength="250"/></field> --> <field name="explodeOrderItems"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="checkGcBalance"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="usePrimaryEmailUsername"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireCustomerRole"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showCheckoutGiftOptions"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="selectPaymentTypePerItem"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showPricesWithVatTax"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showTaxIsExempt"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="vatTaxAuthGeoId"><lookup target-form-name="LookupGeo"/></field> <field name="vatTaxAuthPartyId"><lookup target-form-name="LookupPartyName"/></field> <field name="prodSearchExcludeVariants"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="enableDigProdUpload"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="digProdUploadCategoryId"><lookup target-form-name="LookupProductCategory"/></field> <field name="enableAutoSuggestionList"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoOrderCcTryExp"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoOrderCcTryOtherCards"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoOrderCcTryLaterNsf"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoApproveInvoice"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoApproveOrder"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="shipIfCaptureFails"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="setOwnerUponIssuance"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reqReturnInventoryReceive"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="orderDecimalQuantity" tooltip="${uiLabelMap.ProductOrderDecimalQuantityExistsToOverride}"> - <drop-down allow-empty="true" ><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <sort-order> @@ -469,8 +469,8 @@ under the License. <field name="sequenceNum"><text/></field> <field name="manualOnly"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> @@ -487,8 +487,8 @@ under the License. <field name="thruDate"><date-time/></field> <field name="manualOnly"> <drop-down> - <option key="${uiLabelMap.CommonN}" description="N"/> - <option key="${uiLabelMap.CommonY}" description="Y"/> + <option key="N" description="${uiLabelMap.CommonN}"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -849,8 +849,8 @@ under the License. <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><text/></field> <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll} ${uiLabelMap.ProductProducts}"> <drop-down> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -1259,22 +1259,22 @@ under the License. <field name="minTotal" tooltip="${uiLabelMap.ProductMinTotalMessage}"><text/></field> <field name="maxTotal" tooltip="${uiLabelMap.ProductMaxTotalMessage}"><text/></field> <field name="allowUspsAddr" tooltip="${uiLabelMap.ProductAllowUSPSAddr}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireUspsAddr" tooltip="${uiLabelMap.ProductRequireMessage}"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="allowCompanyAddr"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireCompanyAddr" tooltip="${uiLabelMap.ProductRequireMessage}"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="companyPartyId" tooltip="${uiLabelMap.ProductAllowMessage}"> <lookup target-form-name="LookupPartyName"/> </field> <field name="includeNoChargeItems" title="${uiLabelMap.ProductIncludeFreeship}" tooltip="${uiLabelMap.ProductIncludeFreeshipMessage}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="includeGeoId" title="${uiLabelMap.ProductIncludeGeo}" tooltip="${uiLabelMap.ProductIncludeGeoMessage}"> <lookup target-form-name="LookupGeo"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |