svn commit: r1768219 [11/18] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ ...

[diveshdutta]

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Nov  5 14:14:04 2016
@@ -43,7 +43,7 @@ under the License.
             </service>
         </actions>
         <field name="productId" sort-field="true">
-            <hyperlink also-hidden="false" description="${productId}" target="EditProduct">
+            <hyperlink description="${productId}" target="EditProduct" also-hidden="false">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -504,7 +504,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
 
         <field name="viewHistoryLink" title=" " widget-style="buttontext">
-            <hyperlink target="ProductPriceHistory" description="${uiLabelMap.ProductHistory}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.ProductHistory}" target="ProductPriceHistory" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="productPriceTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -512,7 +512,7 @@ under the License.
         </field>
 
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductPrice" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductPrice" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="productPriceTypeId"/><parameter param-name="productPricePurposeId"/>
                 <parameter param-name="currencyUomId"/><parameter param-name="productStoreGroupId"/><parameter param-name="fromDate"/>
             </hyperlink>
@@ -551,7 +551,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductPaymentMethodType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductPaymentMethodType" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="productPricePurposeId"/><parameter param-name="paymentMethodTypeId"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -586,7 +586,7 @@ under the License.
         <field name="comments" title="${uiLabelMap.ProductComments}" ><textarea/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeProductFromCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFromCategory" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="productCategoryId"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -596,7 +596,7 @@ under the License.
     <form name="ListProductContentInfos" type="list" title="" list-name="productContent"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="editProductContentInfo" title="${uiLabelMap.ProductContent}" widget-style="buttontext">
-            <hyperlink target="EditProductContentContent" description="${description} [${contentId}]" also-hidden="false">
+            <hyperlink description="${description} [${contentId}]" target="EditProductContentContent" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="productContentTypeId"/>
@@ -616,12 +616,12 @@ under the License.
         <field name="useRoleTypeId"><display/></field>
         <field name="sequenceNum"><display/></field>
         <field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
-            <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
         <field name="removeContent" title=" " widget-style="buttontext">
-            <hyperlink target="removeContentFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromProduct" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="contentId"/><parameter param-name="productContentTypeId"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -681,7 +681,7 @@ under the License.
         <auto-fields-service service-name="updateProductContent" map-name="productContent"/>
         <field name="productId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.ProductContent_Id}" widget-style="buttontext">
-            <hyperlink target="EditProductContentContent" description="${content.description} [${productContent.contentId}]">
+            <hyperlink description="${content.description} [${productContent.contentId}]" target="EditProductContentContent">
                 <parameter param-name="productId" from-field="productContent.productId"/>
                 <parameter param-name="contentId" from-field="productContent.contentId"/>
             </hyperlink>
@@ -695,7 +695,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeContentFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromProduct" also-hidden="false">
                 <parameter param-name="productId" from-field="productContent.productId"/>
                 <parameter param-name="contentId" from-field="productContent.contentId"/>
                 <parameter param-name="productContentTypeId" from-field="productContent.productContentTypeId"/>
@@ -721,12 +721,12 @@ under the License.
             <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false"/>
         </field>
         <field name="editDataResource" widget-style="buttontext">
-            <hyperlink target="/content/control/EditDataResource" target-type="inter-app" description="${dataResourceId}" also-hidden="false">
+            <hyperlink description="${dataResourceId}" target="/content/control/EditDataResource" target-type="inter-app" also-hidden="false">
                 <parameter param-name="dataResourceId"/>
             </hyperlink>
         </field>
         <field name="editContent" widget-style="buttontext">
-            <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -979,7 +979,7 @@ under the License.
             <display type="currency" currency="${currencyUomId}"/>
         </field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductSuppliers" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductSuppliers" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="currencyUomId"/>
@@ -988,7 +988,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeSupplierProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeSupplierProduct" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="currencyUomId"/>
@@ -1041,7 +1041,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductConfig" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductConfig" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="configItemId"/><parameter param-name="sequenceNum"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -1204,7 +1204,7 @@ under the License.
             <set field="sectionTitle" from-field="assocSection.sectionTitle"/>
         </actions>
         <row-actions>
-            <entity-one value-field="product" entity-name="Product">
+            <entity-one entity-name="Product" value-field="product">
                 <field-map field-name="productId" value="${parameters.productId}"/>
             </entity-one>
         </row-actions>
@@ -1232,7 +1232,7 @@ under the License.
         <field name="instruction"><display/></field>
         <field name="quantity"><display/></field>
         <field name="editLink" widget-style="buttontext">
-            <hyperlink target="EditProductAssoc" description="${uiLabelMap.CommonEdit}">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductAssoc">
                 <parameter param-name="productId"/>
                 <parameter param-name="productIdTo"/>
                 <parameter param-name="productAssocTypeId"/>
@@ -1240,7 +1240,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="deleteButton" widget-style="buttontext">
-            <hyperlink target="deleteProductAssoc" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductAssoc">
                 <parameter param-name="productId"/>
                 <parameter param-name="productIdTo"/>
                 <parameter param-name="productAssocTypeId"/>
@@ -1259,7 +1259,7 @@ under the License.
         <field name="instruction"><hidden/></field>
         <field name="routingWorkEffortId"><hidden/></field>
         <field name="productIdTo" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productIdTo}" target="ViewProductManufacturing">
+            <hyperlink description="${productIdTo}" target="ViewProductManufacturing" also-hidden="false">
                 <parameter param-name="productId" from-field="productIdTo"/>
             </hyperlink>
         </field>
@@ -1279,7 +1279,7 @@ under the License.
         <field name="productAssocTypeId"><hidden/></field>
         <field name="scrapFactor"><hidden/></field>
         <field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productId}" target="ViewProductManufacturing">
+            <hyperlink description="${productId}" target="ViewProductManufacturing" also-hidden="false">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -1297,7 +1297,7 @@ under the License.
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/>
         </field>
         <field name="workEffortId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" target-type="inter-app">
+            <hyperlink description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -1338,7 +1338,7 @@ under the License.
             <display/>
         </field>
         <field name="costComponentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${costComponentId}" target="EditProductCosts">
+            <hyperlink description="${costComponentId}" target="EditProductCosts" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="productCostComponentId" from-field="costComponentId"/>
             </hyperlink>
@@ -1348,7 +1348,7 @@ under the License.
             <display-entity entity-name="CostComponentType"/>
         </field>
         <field name="deleteCostComponent" entry-name="costComponentId" widget-style="buttontext">
-            <hyperlink target="deleteCostComponent" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCostComponent" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="costComponentId"/>
             </hyperlink>
         </field>
@@ -1360,7 +1360,7 @@ under the License.
             <display-entity entity-name="CostComponentType"/>
         </field>
         <field name="costComponentCalcId" widget-style="buttontext">
-            <hyperlink target="/manufacturing/control/EditCostCalcs" also-hidden="false" target-type="inter-app" description="${costComponentCalcId}">
+            <hyperlink description="${costComponentCalcId}" target="/manufacturing/control/EditCostCalcs" also-hidden="false" target-type="inter-app">
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>
@@ -1370,7 +1370,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
         <field name="deleteProductCostComponentCalc" entry-name="productId" widget-style="buttontext">
-            <hyperlink target="deleteProductCostComponentCalc" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductCostComponentCalc" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="costComponentTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -1454,7 +1454,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="orderDate"><display/></field>
         <field name="orderId">
-            <hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -1533,7 +1533,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductMaint" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductMaint" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="productMaintSeqId"/>
             </hyperlink>
         </field>
@@ -1583,7 +1583,7 @@ under the License.
         </field>
         <field name="meterName"><text size="20"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductMeter" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductMeter" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="productMeterTypeId"/>
             </hyperlink>
         </field>
@@ -1634,7 +1634,7 @@ under the License.
         </field>
         <field name="description"><text size="20"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductGeo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductGeo" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="geoId"/>
             </hyperlink>
         </field>
@@ -1660,7 +1660,7 @@ under the License.
         <field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field>
 
         <field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="removeFeatureIactn" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFeatureIactn">
                 <parameter param-name="productFeatureId"/><parameter param-name="productFeatureIdTo"/><parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -1701,7 +1701,7 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="productFeatureId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ProductFeatureAndAppl" description="${description} [${productFeatureId}]" key-field-name="productFeatureId">
+                <entity-options entity-name="ProductFeatureAndAppl" key-field-name="productFeatureId" description="${description} [${productFeatureId}]">
                     <entity-constraint name="productId" env-name="productId"/>
                     <entity-order-by field-name="sequenceNum"/>
                     <entity-order-by field-name="defaultSequenceNum"/>
@@ -1724,7 +1724,7 @@ under the License.
             <display-entity entity-name="ProductFeature" description="${description} [${productFeatureId}]"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductFeatureApplAttr" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductFeatureApplAttr" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="productFeatureId"/><parameter param-name="attrName"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -1753,7 +1753,7 @@ under the License.
 
         <field name="useTimeUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1768,7 +1768,7 @@ under the License.
         </field>
         <field name="canclAutmExtTimeUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1777,7 +1777,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" widget-style="buttontext">
-            <hyperlink target="deleteProductSubscriptionResource" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductSubscriptionResource" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="subscriptionResourceId"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -1797,7 +1797,7 @@ under the License.
 
         <field name="useTimeUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1812,7 +1812,7 @@ under the License.
         </field>
         <field name="canclAutmExtTimeUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1856,7 +1856,7 @@ under the License.
             <entity-one entity-name="Agreement" value-field="agreement"/>
         </row-actions>
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink target="/accounting/control/EditAgreement" target-type="inter-app" description="${agreementId}" also-hidden="false">
+            <hyperlink description="${agreementId}" target="/accounting/control/EditAgreement" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
             </hyperlink>
         </field>
@@ -1871,7 +1871,7 @@ under the License.
     <form name="ListSalesAgreements" type="list" list-name="salesAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="productId"/>
@@ -1888,7 +1888,7 @@ under the License.
     <form name="ListProductAgreements" type="list" list-name="productAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="productId"/>
@@ -1905,7 +1905,7 @@ under the License.
     <form name="ListCommissionAgreements" type="list" list-name="commissionAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="productId"/>
@@ -1974,7 +1974,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeWorkEffortGoodStandard">
+            <hyperlink description="[${uiLabelMap.CommonDelete}]" target="removeWorkEffortGoodStandard" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="workEffortId"/><parameter param-name="workEffortGoodStdTypeId"/><parameter param-name="fromDate"/>
             </hyperlink>
         </field>
@@ -1990,7 +1990,7 @@ under the License.
         <field name="lastInventoryCount"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductFacility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductFacility" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="facilityId"/>
             </hyperlink>
         </field>
@@ -2033,7 +2033,7 @@ under the License.
         </field>
         <field name="submitButton" position="2" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" position="2" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductFacilityLocation" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductFacilityLocation" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="facilityId"/><parameter param-name="locationSeqId"/>
             </hyperlink>
         </field>
@@ -2076,7 +2076,7 @@ under the License.
         <field name="idValue"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteGoodIdentification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteGoodIdentification" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="goodIdentificationTypeId"/>
             </hyperlink>
         </field>
@@ -2134,7 +2134,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductKeyword" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductKeyword" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="keyword"/>
                 <parameter param-name="keywordTypeId"/>
@@ -2158,7 +2158,7 @@ under the License.
         <field name="attrValue"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductAttribute" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductAttribute" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="attrName"/>
             </hyperlink>
         </field>
@@ -2186,7 +2186,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink target="deleteProductGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductGlAccount" also-hidden="false">
                 <parameter param-name="productId"/><parameter param-name="organizationPartyId"/><parameter param-name="glAccountTypeId"/>
             </hyperlink>
         </field>
@@ -2286,7 +2286,7 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}" red-when="before-now"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removePartyFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removePartyFromProduct" also-hidden="false">
               <parameter param-name="productId"/>
               <parameter param-name="partyId"/>
               <parameter param-name="roleTypeId"/>
@@ -2334,13 +2334,13 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&amp;&amp;${groovy: return thruDate.compareTo(org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductGroupOrder" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductGroupOrder" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="groupOrderId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductGroupOrder" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductGroupOrder" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="groupOrderId"/>
             </hyperlink>
@@ -2383,7 +2383,7 @@ under the License.
         </actions>
         <field name="keywordTypeId"><hidden/></field>
         <field name="productId">
-            <hyperlink target="EditProduct" description="${productId}">
+            <hyperlink description="${productId}" target="EditProduct">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml Sat Nov  5 14:14:04 2016
@@ -23,7 +23,7 @@ under the License.
     <form name="ListProductPromos" type="list" title="" list-name="productPromos"
         paginate-target="FindProductPromo" odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productPromoId" widget-style="buttontext">
-            <hyperlink target="EditProductPromo" description="${productPromoId}" also-hidden="false">
+            <hyperlink description="${productPromoId}" target="EditProductPromo" also-hidden="false">
                 <parameter param-name="productPromoId"/>
             </hyperlink>
         </field>
@@ -107,12 +107,12 @@ under the License.
         <auto-fields-entity entity-name="ProductPromoCode" default-field-type="display"/>
         <field name="productPromoId"><hidden/></field>
         <field name="productPromoCodeId" widget-style="buttontext">
-            <hyperlink target="EditProductPromoCode" description="${productPromoCodeId}" also-hidden="false">
+            <hyperlink description="${productPromoCodeId}" target="EditProductPromoCode" also-hidden="false">
                 <parameter param-name="productPromoCodeId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductPromoCode" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductPromoCode" also-hidden="false">
                 <parameter param-name="productPromoCodeId"/>
                 <parameter param-name="productPromoId"/>
             </hyperlink>
@@ -134,7 +134,7 @@ under the License.
     <form name="ListProductPromoContent" type="list" list-name="productPromoContents"
             odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="editProductPromoContent" title="${uiLabelMap.ProductContent}" widget-style="buttontext">
-            <hyperlink target="EditProductPromoContent" description="${description} [${contentId}]" also-hidden="false">
+            <hyperlink description="${description} [${contentId}]" target="EditProductPromoContent" also-hidden="false">
                 <parameter param-name="productPromoId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="productPromoContentTypeId"/>
@@ -147,12 +147,12 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
         <field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
-            <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
         <field name="removeContent" title=" " widget-style="buttontext">
-            <hyperlink target="removeContentFromProductPromo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromProductPromo" also-hidden="false">
                 <parameter param-name="productPromoId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="productPromoContentTypeId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml Sat Nov  5 14:14:04 2016
@@ -57,7 +57,7 @@ under the License.
         </row-actions>
         <field name="productReviewId"><hidden/></field>
         <field name="productId">
-            <hyperlink also-hidden="false" description="${productId}" target="EditProduct">
+            <hyperlink description="${productId}" target="EditProduct" also-hidden="false">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -69,13 +69,13 @@ under the License.
         <field name="productReview" use-when="${statusId == 'PRR_DELETED'}"><textarea read-only="true"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="${statusId != 'PRR_DELETED'}"><submit button-type="button"/></field>
         <field name="approve" widget-style="buttontext" use-when="${statusId == 'PRR_PENDING'}">
-            <hyperlink target="updateProductReviewStatus" description="${uiLabelMap.FormFieldTitle_approve}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.FormFieldTitle_approve}" target="updateProductReviewStatus" also-hidden="false">
                 <parameter param-name="statusId" value="PRR_APPROVED"/>
                 <parameter param-name="productReviewId" from-field="productReviewId"/>
             </hyperlink>
         </field>
         <field name="rejectButton" widget-style="buttontext" use-when="${statusId != 'PRR_DELETED'}">
-            <hyperlink target="updateProductReviewStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}" also-hidden="false" confirmation-message="Do you want to reject this review?">
+            <hyperlink description="${uiLabelMap.FormFieldTitle_rejectButton}" target="updateProductReviewStatus" also-hidden="false" confirmation-message="Do you want to reject this review?">
                 <parameter param-name="statusId" value="PRR_DELETED"/>
                 <parameter param-name="productReviewId" from-field="productReviewId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml Sat Nov  5 14:14:04 2016
@@ -25,13 +25,13 @@
         paginate-target="ListQuantityBreaks" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="QuantityBreak" default-field-type="display"/>
         <field name="quantityBreakId" widget-style="buttontext">
-            <hyperlink target="ListQuantityBreaks" description="${quantityBreakId}" also-hidden="false">
+            <hyperlink description="${quantityBreakId}" target="ListQuantityBreaks" also-hidden="false">
                 <parameter param-name="quantityBreakId"/>
             </hyperlink>
         </field>
         <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}"><display-entity also-hidden="false" entity-name="QuantityBreakType"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteQuantityBreak" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteQuantityBreak" also-hidden="false">
                 <parameter param-name="quantityBreakId"/>
             </hyperlink>
         </field>
@@ -54,12 +54,12 @@
         paginate-target="ListShipmentMethodTypes" odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ShipmentMethodType" default-field-type="display"/>
         <field name="shipmentMethodTypeId" widget-style="buttontext">
-            <hyperlink target="ListShipmentMethodTypes" description="${shipmentMethodTypeId}" also-hidden="false">
+            <hyperlink description="${shipmentMethodTypeId}" target="ListShipmentMethodTypes" also-hidden="false">
                 <parameter param-name="shipmentMethodTypeId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteShipmentMethodType" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteShipmentMethodType" also-hidden="false">
                 <parameter param-name="shipmentMethodTypeId"/>
             </hyperlink>
         </field>
@@ -77,14 +77,14 @@
         <field name="shipmentMethodTypeId"><display-entity also-hidden="false" entity-name="ShipmentMethodType"/></field>
         <field name="roleTypeId"><display-entity also-hidden="false" entity-name="RoleType"/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="ListCarrierShipmentMethods" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="ListCarrierShipmentMethods" also-hidden="false">
                 <parameter param-name="shipmentMethodTypeId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteCarrierShipmentMethod" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteCarrierShipmentMethod" also-hidden="false">
                 <parameter param-name="shipmentMethodTypeId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Sat Nov  5 14:14:04 2016
@@ -30,7 +30,7 @@ under the License.
             </entity-condition>
         </actions>
         <field name="productStoreId" title="${uiLabelMap.ProductStoreId}" widget-style="buttontext" sort-field="true">
-            <hyperlink target="EditProductStore" description="${productStoreId}">
+            <hyperlink description="${productStoreId}" target="EditProductStore">
                 <parameter param-name="productStoreId"/>
             </hyperlink>
         </field>
@@ -68,7 +68,7 @@ under the License.
             </drop-down>
         </field>
         <field use-when="productStore!=null&amp;&amp;productStore.getString(&quot;inventoryFacilityId&quot;)!=null" name="inventoryFacilityLink" title=" " widget-style="buttontext">
-            <hyperlink target="/facility/control/EditFacility" target-type="inter-app" description="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}" target="/facility/control/EditFacility" target-type="inter-app" also-hidden="false">
                 <parameter param-name="facilityId" from-field="productStore.inventoryFacilityId"/>
             </hyperlink>
         </field>
@@ -448,7 +448,7 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductStoreCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductStoreCatalog" also-hidden="false">
                 <parameter param-name="prodCatalogId"/>
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="fromDate"/>
@@ -459,7 +459,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true">
         <field name="productStoreId"><hidden/></field>
         <field name="productPromoId" widget-style="buttontext">
-            <hyperlink target="EditProductPromo" description="${productPromoId}" also-hidden="true">
+            <hyperlink description="${productPromoId}" target="EditProductPromo" also-hidden="true">
                 <parameter param-name="productPromoId"/>
             </hyperlink>
         </field>
@@ -532,7 +532,7 @@ under the License.
         <field name="thruDate"><display/></field>
         <field name="sequenceNum"><display/></field>
         <field name="editLink" widget-style="buttontext" title="${uiLabelMap.CommonEdit}">
-           <hyperlink target="FindProductStoreRoles" description="${uiLabelMap.CommonEdit}">
+           <hyperlink description="${uiLabelMap.CommonEdit}" target="FindProductStoreRoles">
                 <parameter param-name="partyId"/>
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="roleTypeId"/>
@@ -540,7 +540,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="deleteLink" widget-style="buttontext" title="${uiLabelMap.CommonDelete}">
-            <hyperlink target="storeRemoveRole" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="storeRemoveRole">
                 <parameter param-name="partyId"/>
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="roleTypeId"/>
@@ -638,7 +638,7 @@ under the License.
         </actions>
         <field name="productStoreGroupId"><hidden/></field>
         <field name="productStoreGroupName">
-            <hyperlink target="EditProductStoreGroupAndAssoc" description="${productStoreGroupName} [${productStoreGroupId}]">
+            <hyperlink description="${productStoreGroupName} [${productStoreGroupId}]" target="EditProductStoreGroupAndAssoc">
                 <parameter param-name="productStoreGroupId"/>
             </hyperlink>
         </field>
@@ -682,7 +682,7 @@ under the License.
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
         <field name="submitButton" title=" ">
-            <hyperlink target="updateProductStoreGroupRollup" request-confirmation="true" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="updateProductStoreGroupRollup" request-confirmation="true">
                 <parameter param-name="productStoreGroupId"/>
                 <parameter param-name="parentGroupId"/>
                 <parameter param-name="fromDate"/>
@@ -698,7 +698,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="productStoreId">
-            <hyperlink target="EditProductStore" description="${productStoreId}">
+            <hyperlink description="${productStoreId}" target="EditProductStore">
                 <parameter param-name="productStoreId"/>
             </hyperlink>
         </field>
@@ -732,13 +732,13 @@ under the License.
             <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="remove" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveProductStoreFinAccountSettings" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="RemoveProductStoreFinAccountSettings">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="finAccountTypeId"/>
             </hyperlink>
         </field>
         <field name="edit" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductStoreFinAccountSettings" description="${uiLabelMap.CommonEdit}">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductStoreFinAccountSettings">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="finAccountTypeId"/>
             </hyperlink>
@@ -802,7 +802,7 @@ under the License.
         <field name="fromAddress" title="${uiLabelMap.CommonFromAddress}"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="removeProductStoreEmail" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductStoreEmail" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="emailType"/>
             </hyperlink>
@@ -880,7 +880,7 @@ under the License.
         <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field>
         <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field>
         <field name="editLink" title=" " use-when="${groovy:security.hasEntityPermission(&quot;CATALOG&quot;, &quot;_UPDATE&quot;, session);}" widget-style="buttontext">
-            <hyperlink target="EditProductStorePaySetup" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductStorePaySetup" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="paymentMethodTypeId"/>
                 <parameter param-name="paymentServiceTypeEnumId"/>
@@ -890,7 +890,7 @@ under the License.
             <display/>
         </field>
         <field name="deleteLink" title=" " use-when="${groovy:security.hasEntityPermission(&quot;CATALOG&quot;, &quot;_DELETE&quot;, session);}" widget-style="buttontext">
-            <hyperlink target="storeRemovePaySetting" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="storeRemovePaySetting" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="paymentMethodTypeId"/>
                 <parameter param-name="paymentServiceTypeEnumId"/>
@@ -908,14 +908,14 @@ under the License.
             </entity-and>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.ProductSegmentGroupId}">
-            <hyperlink also-hidden="false" target-type="inter-app" description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup">
+            <hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" also-hidden="false" target-type="inter-app">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
         <field name="segmentGroupTypeId" title="${uiLabelMap.ProductSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="/marketing/control/deleteSegmentGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false" target-type="inter-app">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="/marketing/control/deleteSegmentGroup" also-hidden="false" target-type="inter-app">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
@@ -950,7 +950,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductStoreKeywordOvrd" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductStoreKeywordOvrd" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="keyword"/>
                 <parameter param-name="fromDate"/>
@@ -1015,7 +1015,7 @@ under the License.
         <field name="productStoreId"><hidden/></field>
         <field name="carrierRoleTypeId"><hidden/></field>
         <field name="shipmentCostEstimateId" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductStoreShipmentCostEstimates" description="${shipmentCostEstimateId}" also-hidden="false">
+            <hyperlink description="${shipmentCostEstimateId}" target="EditProductStoreShipmentCostEstimates" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="shipmentCostEstimateId"/>
             </hyperlink>
@@ -1048,7 +1048,7 @@ under the License.
             <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="storeRemoveShipRate" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="storeRemoveShipRate" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="shipmentCostEstimateId"/>
             </hyperlink>
@@ -1207,7 +1207,7 @@ under the License.
         <auto-fields-entity entity-name="ProductStoreShipmentMeth" default-field-type="display"/>
         <field name="productStoreId"><hidden/></field>
         <field name="productStoreShipMethId" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductStoreShipSetup" description="${productStoreShipMethId}" also-hidden="false">
+            <hyperlink description="${productStoreShipMethId}" target="EditProductStoreShipSetup" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="productStoreShipMethId"/>
             </hyperlink>
@@ -1235,7 +1235,7 @@ under the License.
             <display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" />
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="storeRemoveShipMeth" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="storeRemoveShipMeth" also-hidden="false">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="productStoreShipMethId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sat Nov  5 14:14:04 2016
@@ -136,7 +136,7 @@ under the License.
         <field name="roleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
 
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -337,7 +337,7 @@ under the License.
         </field>
 
         <field name="subscriptionResourceId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${subscriptionResourceId}" target="EditSubscriptionResource">
+            <hyperlink description="${subscriptionResourceId}" target="EditSubscriptionResource" also-hidden="false">
                 <parameter param-name="subscriptionResourceId"/>
             </hyperlink>
         </field>
@@ -382,7 +382,7 @@ under the License.
         <field name="productId"><display/></field>
         <field name="useTimeUomId">
             <drop-down>
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -410,7 +410,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductSubscriptionResourceSr" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductSubscriptionResourceSr" also-hidden="false">
                 <parameter param-name="subscriptionResourceId"/>
                 <parameter param-name="productId"/>
                 <parameter param-name="fromDate"/>
@@ -426,7 +426,7 @@ under the License.
         <field name="productId"><lookup target-form-name="LookupProduct"/></field>
         <field name="useTimeUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -480,7 +480,7 @@ under the License.
         </actions>
         <field name="subscriptionId"><hidden/></field>
         <field name="communicationEventId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
+            <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" also-hidden="false" target-type="inter-app">
                 <parameter param-name="communicationEventId"/>
             </hyperlink>
         </field>
@@ -498,7 +498,7 @@ under the License.
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="removeSubscriptionCommEvent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeSubscriptionCommEvent" also-hidden="false">
                 <parameter param-name="subscriptionId"/>
                 <parameter param-name="communicationEventId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Sat Nov  5 14:14:04 2016
@@ -31,7 +31,7 @@ under the License.
             </service>
         </actions>
         <field name="facilityId">
-            <hyperlink target="EditFacility" description="${facilityId}">
+            <hyperlink description="${facilityId}" target="EditFacility">
                 <parameter param-name="facilityId"/>
             </hyperlink>
         </field>
@@ -106,7 +106,7 @@ under the License.
             </service>
         </actions>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
                 <parameter param-name="facilityId"/>
             </hyperlink>
@@ -118,14 +118,14 @@ under the License.
         <field name="datetimeReceived"><display/></field>
         <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
         <field name="productId">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
         <field name="internalName"><display/></field>
         <field name="partyId"><display/></field>
         <field name="locationSeqId" widget-style="buttontext">
-            <hyperlink target="EditFacilityLocation" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]">
+            <hyperlink description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]" target="EditFacilityLocation">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="locationSeqId"/>
             </hyperlink>
@@ -139,7 +139,7 @@ under the License.
         <field name="softIdentifier"><display/></field>
         <field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field>
         <field name="transfer" title="${uiLabelMap.ProductTransfer}" entry-name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="TransferInventoryItem" description="${uiLabelMap.ProductTransfer}">
+            <hyperlink description="${uiLabelMap.ProductTransfer}" target="TransferInventoryItem">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
@@ -149,7 +149,7 @@ under the License.
          override-list-size="${inventoryItemsSize}" paginate-target="SearchInventoryItemsByLabels"
          odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
                 <parameter param-name="facilityId"/>
             </hyperlink>
@@ -161,7 +161,7 @@ under the License.
         <field name="datetimeReceived"><display/></field>
         <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
         <field name="productId">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -233,13 +233,13 @@ under the License.
         </row-actions>
 
         <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
                 <parameter param-name="facilityId"/>
             </hyperlink>
         </field>
         <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -262,19 +262,19 @@ under the License.
         </field>
         <field name="description" position="2"><display/></field>
         <field name="orderId" widget-style="buttontext" position="2">
-            <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
         <field name="orderItemSeqId" position="2"><display/></field>
         <field name="shipmentId" widget-style="buttontext" position="2">
-            <hyperlink target="ViewShipment" description="${shipmentId}" >
+            <hyperlink description="${shipmentId}" target="ViewShipment" >
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentItemSeqId" position="2"><display/></field>
         <field name="workEffortId" widget-style="buttontext" position="2">
-            <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" >
+            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -297,14 +297,14 @@ under the License.
         </row-actions>
 
         <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
 
         <field name="effectiveDate" position="2"><display/></field>
         <field name="inventoryItemId" widget-style="buttontext" position="2">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
                 <parameter param-name="facilityId"/>
             </hyperlink>
@@ -318,19 +318,19 @@ under the License.
         </field>
         <field name="description" position="2"><display/></field>
         <field name="orderId" widget-style="buttontext" position="2">
-            <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
         <field name="orderItemSeqId" position="2"><display/></field>
         <field name="shipmentId" widget-style="buttontext" position="2">
-            <hyperlink target="ViewShipment" description="${shipmentId}" >
+            <hyperlink description="${shipmentId}" target="ViewShipment" >
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentItemSeqId" position="2"><display/></field>
         <field name="workEffortId" widget-style="buttontext" position="2">
-            <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" >
+            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -351,12 +351,12 @@ under the License.
 
         <field name="effectiveDate"><display/></field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
                 <parameter param-name="facilityId"/>
             </hyperlink>
@@ -370,19 +370,19 @@ under the License.
         </field>
         <field name="description"><display/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
         <field name="orderItemSeqId"><display/></field>
         <field name="shipmentId" widget-style="buttontext">
-            <hyperlink target="ViewShipment" description="${shipmentId}" >
+            <hyperlink description="${shipmentId}" target="ViewShipment" >
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentItemSeqId"><display/></field>
         <field name="workEffortId" widget-style="buttontext">
-            <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" >
+            <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -413,7 +413,7 @@ under the License.
         <field name="productSupplierId" title="${uiLabelMap.ProductSupplier}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
-                    <entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/>
+                    <entity-constraint name="roleTypeId" operator="equals"  value="SUPPLIER"/>
                     <entity-order-by field-name="partyId"/>
                 </entity-options>
             </drop-down>
@@ -448,7 +448,7 @@ under the License.
             <script location="component://product/groovyScripts/facility/facility/ComputeProductSellThroughData.groovy"/>
         </row-actions>
         <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink target="EditFacilityInventoryItems" description="${productId}">
+            <hyperlink description="${productId}" target="EditFacilityInventoryItems">
                 <parameter param-name="productId"/>
                 <parameter param-name="facilityId"/>
             </hyperlink>
@@ -485,17 +485,17 @@ under the License.
     <form name="SchedulingList" type="multi" use-row-submit="true" list-name="shipmentRouteSegments" title="${uiLabelMap.PageTitlePackageShipmentScheduling}" target="BatchScheduleShipmentRouteSegments?facilityId=${facilityId}"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
         <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}">
-            <hyperlink target="ViewShipment" description="${shipmentId}">
+            <hyperlink description="${shipmentId}" target="ViewShipment">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}">
-            <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app">
+            <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId" from-field="primaryOrderId"/>
             </hyperlink>
         </field>
         <field name="shipmentRouteSegmentId">
-            <hyperlink target="EditShipmentRouteSegments" description="${shipmentRouteSegmentId}">
+            <hyperlink description="${shipmentRouteSegmentId}" target="EditShipmentRouteSegments">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
@@ -527,12 +527,12 @@ under the License.
     <form name="Labels" type="multi" use-row-submit="true" list-name="shipmentPackageRouteSegments" title="" target="BatchPrintShippingLabels" separate-columns="true"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}">
-            <hyperlink target="ViewShipment" description="${shipmentId}">
+            <hyperlink description="${shipmentId}" target="ViewShipment">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}">
-            <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app">
+            <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId" from-field="primaryOrderId"/>
             </hyperlink>
         </field>
@@ -545,7 +545,7 @@ under the License.
             <display-entity entity-name="ShipmentMethodType"/>
         </field>
         <field name="label" title="${uiLabelMap.ProductLabel}">
-          <hyperlink target="viewShipmentPackageRouteSegLabelImage" description="${uiLabelMap.ProductLabel}">
+          <hyperlink description="${uiLabelMap.ProductLabel}" target="viewShipmentPackageRouteSegLabelImage">
                 <parameter param-name="shipmentId"/>
                 <parameter param-name="shipmentRouteSegmentId"/>
                 <parameter param-name="shipmentPackageSeqId"/>
@@ -614,7 +614,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeGroupFromFacility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeGroupFromFacility" also-hidden="false">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="facilityGroupId"/>
                 <parameter param-name="fromDate"/>
@@ -647,7 +647,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removePartyFromFacility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removePartyFromFacility" also-hidden="false">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
@@ -687,7 +687,7 @@ under the License.
             odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
             paginate-target="InventoryAverageCosts" override-list-size="${overrideListSize}">
         <field name="productId2" title="${uiLabelMap.ProductProductId}" entry-name="productId" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -734,17 +734,17 @@ under the License.
         </row-actions>
 
         <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
-            <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}">
+            <hyperlink description="${inventoryTransferId}" target="TransferInventoryItem">
                 <parameter param-name="inventoryTransferId"/>
             </hyperlink>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
         <field name="facilityId" widget-style="buttontext">
-            <hyperlink target="EditFacility" description="${facilityId}">
+            <hyperlink description="${facilityId}" target="EditFacility">
                 <parameter param-name="facilityId"/>
             </hyperlink>
         </field>
@@ -753,7 +753,7 @@ under the License.
         </field>
         <field name="locationSeqId"><display/></field>
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}">
+            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
@@ -778,17 +778,17 @@ under the License.
             </entity-one>
         </row-actions>
         <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
-            <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}">
+            <hyperlink description="${inventoryTransferId}" target="TransferInventoryItem">
                 <parameter param-name="inventoryTransferId"/>
             </hyperlink>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
         <field name="facilityIdTo" widget-style="buttontext">
-            <hyperlink target="EditFacility" description="${facilityIdTo}">
+            <hyperlink description="${facilityIdTo}" target="EditFacility">
                 <parameter param-name="facilityId" from-field="facilityIdTo"/>
             </hyperlink>
         </field>
@@ -797,7 +797,7 @@ under the License.
         </field>
         <field name="locationSeqIdTo"><display/></field>
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}">
+            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
@@ -823,17 +823,17 @@ under the License.
             </entity-one>
         </row-actions>
         <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
-            <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}">
+            <hyperlink description="${inventoryTransferId}" target="TransferInventoryItem">
                 <parameter param-name="inventoryTransferId"/>
             </hyperlink>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
         <field name="facilityIdTo" widget-style="buttontext">
-            <hyperlink target="EditFacility" description="${facilityIdTo}" also-hidden="false">
+            <hyperlink description="${facilityIdTo}" target="EditFacility" also-hidden="false">
                 <parameter param-name="facilityId" from-field="facilityIdTo"/>
             </hyperlink>
         </field>
@@ -842,7 +842,7 @@ under the License.
         </field>
         <field name="locationSeqIdTo"><display also-hidden="false"/></field>
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}" also-hidden="false">
+            <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app" also-hidden="false">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
@@ -890,7 +890,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="facilityId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.CommonView}">
-            <hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" target-type="inter-app">
+            <hyperlink description="[${contentId}]" target="/content/control/ViewSimpleContent" target-type="inter-app">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -899,7 +899,7 @@ under the License.
         <field name="contentTypeId" title="${uiLabelMap.FormFieldTitle_contentTypeId}"><display-entity entity-name="ContentType" also-hidden="false"/></field>
         <field name="fromDate"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteFacilityContent">
+           <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFacilityContent" also-hidden="false">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="fromDate"/>
@@ -937,7 +937,7 @@ under the License.
     <form name="ListFacilityAgreements" type="list" list-name="facilityAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink target="/accounting/control/EditAgreementItemFacility" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+            <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemFacility" target-type="inter-app" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="faclityId"/>
@@ -972,13 +972,13 @@ under the License.
         <alt-target use-when="${groovy: inventoryItem==null}" target="createInventoryTransfersForProduct"/>
         <alt-target use-when="${groovy: inventoryTransferId!=null}" target="UpdateInventoryTransfer"/>
         <field name="inventoryItemId" widget-style="buttontext" use-when="${groovy: inventoryItem != null}">
-            <hyperlink target="/catalog/control/EditInventoryItem" target-type="inter-app" description="${inventoryItemId}">
+            <hyperlink description="${inventoryItemId}" target="/catalog/control/EditInventoryItem" target-type="inter-app">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>
         <field name="inventoryItemTypeId" use-when="${groovy: inventoryItem != null}"><display description="${inventoryItemType.description}"/></field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${groovy: if(inventoryItem) inventoryItem.productId else parameters.productId}">
+            <hyperlink description="${groovy: if(inventoryItem) inventoryItem.productId else parameters.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -1003,7 +1003,7 @@ under the License.
             </drop-down>
         </field>
         <field name="facilityIdTo" use-when="${groovy: inventoryTransfer!=null}" widget-style="buttontext">
-            <hyperlink target="EditFacility" description="${inventoryTransfer.facilityIdTo}" also-hidden="false">
+            <hyperlink description="${inventoryTransfer.facilityIdTo}" target="EditFacility" also-hidden="false">
                 <parameter param-name="facilityIdTo" value="${inventoryTransfer.facilityIdTo}"/>
             </hyperlink>
         </field>