svn commit: r1768219 [10/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/minilang/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Sat Nov  5 14:14:04 2016
@@ -495,7 +495,7 @@ under the License.
         <if-empty field="shipment.partyIdFrom">
             <set value="SHIP_FROM_VENDOR" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
-            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+            <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
@@ -505,7 +505,7 @@ under the License.
         <if-empty field="shipment.partyIdFrom">
             <set value="VENDOR" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
-            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+            <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
             </if-not-empty>
@@ -516,7 +516,7 @@ under the License.
         <if-empty field="shipment.partyIdTo">
             <set value="SHIP_TO_CUSTOMER" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
-            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+            <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
@@ -526,7 +526,7 @@ under the License.
         <if-empty field="shipment.partyIdTo">
             <set value="CUSTOMER" field="limitRoleMap.roleTypeId"/>
             <filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
-            <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+            <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
             <if-not-empty field="limitOrderRole">
                 <set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
             </if-not-empty>
@@ -541,7 +541,7 @@ under the License.
             <!-- first try from orderContactMechs -->
             <set value="SHIPPING_LOCATION" field="destinationContactMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list="orderContactMechs" map="destinationContactMap" to-list="destinationOrderContactMechs"/>
-            <first-from-list entry="destinationOrderContactMech" list="destinationOrderContactMechs"/>
+            <first-from-list list="destinationOrderContactMechs" entry="destinationOrderContactMech"/>
             <if-not-empty field="destinationOrderContactMech">
                 <set from-field="destinationOrderContactMech.contactMechId" field="shipment.destinationContactMechId"/>
                <else>
@@ -554,7 +554,7 @@ under the License.
             <if-empty field="shipment.originContactMechId">
                 <set value="SHIP_ORIG_LOCATION" field="originContactMap.contactMechPurposeTypeId"/>
                 <filter-list-by-and list="orderContactMechs" map="originContactMap" to-list="originOrderContactMechs"/>
-                <first-from-list entry="originOrderContactMech" list="originOrderContactMechs"/>
+                <first-from-list list="originOrderContactMechs" entry="originOrderContactMech"/>
                 <if-not-empty field="originOrderContactMech">
                     <set from-field="originOrderContactMech.contactMechId" field="shipment.originContactMechId"/>
                     <else>
@@ -568,7 +568,7 @@ under the License.
         <if-empty field="shipment.destinationTelecomNumberId">
             <set value="PHONE_SHIPPING" field="destTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list="orderContactMechs" map="destTelecomOrderContactMechMap" to-list="destTelecomOrderContactMechs"/>
-            <first-from-list entry="destTelecomOrderContactMech" list="destTelecomOrderContactMechs"/>
+            <first-from-list list="destTelecomOrderContactMechs" entry="destTelecomOrderContactMech"/>
             <if-not-empty field="destTelecomOrderContactMech">
                 <set from-field="destTelecomOrderContactMech.contactMechId" field="shipment.destinationTelecomNumberId"/>
                 <else>
@@ -576,7 +576,7 @@ under the License.
                     <entity-and entity-name="PartyAndTelecomNumber" list="phoneNumbers" filter-by-date="true">
                         <field-map field-name="partyId" from-field="shipment.partyIdTo"/>
                     </entity-and>
-                    <first-from-list entry="phoneNumber" list="phoneNumbers"/>
+                    <first-from-list list="phoneNumbers" entry="phoneNumber"/>
                     <if-not-empty field="phoneNumber">
                         <set from-field="phoneNumber.contactMechId" field="shipment.destinationTelecomNumberId"/>
                         <else>
@@ -590,7 +590,7 @@ under the License.
         <if-empty field="shipment.originTelecomNumberId">
             <set value="PHONE_SHIP_ORIG" field="originTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
             <filter-list-by-and list="orderContactMechs" map="originTelecomOrderContactMechMap" to-list="originTelecomOrderContactMechs"/>
-            <first-from-list entry="originTelecomOrderContactMech" list="originTelecomOrderContactMechs"/>
+            <first-from-list list="originTelecomOrderContactMechs" entry="originTelecomOrderContactMech"/>
             <if-not-empty field="originTelecomOrderContactMech">
                 <set from-field="originTelecomOrderContactMech.contactMechId" field="shipment.originTelecomNumberId"/>
                 <else>
@@ -738,7 +738,7 @@ under the License.
             <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
         </entity-and>
 
-        <first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
+        <first-from-list list="curUserPartyAndContactMechs" entry="curUserPartyAndContactMech"/>
         <string-append field="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
 
         <!-- find email addresses of partyIdFrom, set as sendTo -->
@@ -804,9 +804,9 @@ under the License.
             </entity-and>
             <iterate list="receipts" entry="receipt">
                 <calculate field="issuanceQuantity">
-                    <calcop field="receipt.quantityAccepted" operator="get"/>
-                    <calcop field="receipt.quantityRejected" operator="get"/>
-                    <calcop field="issuanceQuantity" operator="get"/>
+                    <calcop operator="get" field="receipt.quantityAccepted"/>
+                    <calcop operator="get" field="receipt.quantityRejected"/>
+                    <calcop operator="get" field="issuanceQuantity"/>
                 </calculate>
             </iterate>
             <set field="issuance.quantity" from-field="issuanceQuantity"/>
@@ -1077,8 +1077,8 @@ under the License.
         <else>
             <!-- add the quantities and store it -->
             <calculate field="shipmentPackageContent.quantity">
-                <calcop field="shipmentPackageContent.quantity" operator="add"/>
-                <calcop field="parameters.quantity" operator="get"/>
+                <calcop operator="add" field="shipmentPackageContent.quantity"/>
+                <calcop operator="get" field="parameters.quantity"/>
             </calculate>
             <set-service-fields service-name="updateShipmentPackageContent" map="shipmentPackageContent" to-map="updateSPCMap"/>
             <call-service service-name="updateShipmentPackageContent" in-map-name="updateSPCMap"/>
@@ -1656,7 +1656,7 @@ under the License.
         <get-related-one to-value-field="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
         <if-compare-field field="inventoryItem.serialNumber" operator="not-equals" to-field="parameters.serialNumber">
             <!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
-            <set-service-fields map="parameters" to-map="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
+            <set-service-fields service-name="reserveAnInventoryItem" map="parameters" to-map="reserveAnInventoryItemCtx"/>/>
             <call-service service-name="reserveAnInventoryItem" in-map-name="reserveAnInventoryItemCtx">
                 <result-to-field result-name="inventoryItemId" field="parameters.inventoryItemId"/>
             </call-service>
@@ -1893,8 +1893,8 @@ under the License.
         <call-service service-name="deleteOrderShipment" in-map-name="inMap"/>
 
         <calculate field="shipmentItem.quantity">
-            <calcop field="shipmentItem.quantity" operator="subtract">
-                <calcop field="orderShipment.quantity" operator="get"/>
+            <calcop operator="subtract" field="shipmentItem.quantity">
+                <calcop operator="get" field="orderShipment.quantity"/>
             </calcop>
         </calculate>
         <clear-field field="inMap"/>
@@ -1977,8 +1977,8 @@ under the License.
         <find-by-and entity-name="OrderShipment" map="orderShipmentLookup" list="existingOrderShipments"/>
         <iterate list="existingOrderShipments" entry="orderShipment">
             <calculate field="plannedQuantity">
-                <calcop field="plannedQuantity" operator="add">
-                    <calcop field="orderShipment.quantity" operator="get"/>
+                <calcop operator="add" field="plannedQuantity">
+                    <calcop operator="get" field="orderShipment.quantity"/>
                 </calcop>
             </calculate>
         </iterate>
@@ -1986,20 +1986,20 @@ under the License.
         <find-by-and entity-name="ItemIssuance" map="orderShipmentLookup" list="existingOrderShipments"/>
         <iterate list="existingOrderShipments" entry="itemIssuance">
             <calculate field="issuedQuantity">
-                <calcop field="issuedQuantity" operator="get"/>
-                <calcop field="itemIssuance.quantity" operator="get"/>
-                <calcop field="itemIssuance.cancelQuantity" operator="negative"/>
+                <calcop operator="get" field="issuedQuantity"/>
+                <calcop operator="get" field="itemIssuance.quantity"/>
+                <calcop operator="negative" field="itemIssuance.cancelQuantity"/>
             </calculate>
         </iterate>
 
         <calculate field="totPlannedOrIssuedQuantity">
-            <calcop field="issuedQuantity" operator="get"/>
-            <calcop field="plannedQuantity" operator="get"/>
+            <calcop operator="get" field="issuedQuantity"/>
+            <calcop operator="get" field="plannedQuantity"/>
         </calculate>
         <calculate field="remainingQuantity">
-            <calcop field="orderItem.quantity" operator="subtract">
-                <calcop field="orderItem.cancelQuantity" operator="get"/>
-                <calcop field="totPlannedOrIssuedQuantity" operator="get"/>
+            <calcop operator="subtract" field="orderItem.quantity">
+                <calcop operator="get" field="orderItem.cancelQuantity"/>
+                <calcop operator="get" field="totPlannedOrIssuedQuantity"/>
             </calcop>
         </calculate>
         <field-to-result field="remainingQuantity"/>

Modified: ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml Sat Nov  5 14:14:04 2016
@@ -205,7 +205,7 @@ under the License.
             <field-map field-name="primaryOrderId" value="DEMO10090"/>
             <field-map field-name="shipmentId" value="9998"/>
         </entity-and>
-        <first-from-list entry="shipment" list="shipments"/>
+        <first-from-list list="shipments" entry="shipment"/>
         <set field="shipRouteSegMap.shipmentId" from-field="shipment.shipmentId"/>
         <entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
             <field-map field-name="userLoginId" value="system"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml Sat Nov  5 14:14:04 2016
@@ -31,7 +31,7 @@ under the License.
         <field name="attrValue"><text size="60"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductCategoryAttribute" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductCategoryAttribute">
                 <parameter param-name="productCategoryId"/>
                 <parameter param-name="attrName"/>
             </hyperlink>
@@ -102,12 +102,12 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         -->
         <field name="editLink" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
-            <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}">
+            <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeContentFromCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromCategory" also-hidden="false">
                 <parameter param-name="productCategoryId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="prodCatContentTypeId"/>
@@ -173,7 +173,7 @@ under the License.
         <field name="imageUrl"><ignored/></field>
         <field name="imageTwoUrl"><ignored/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductCategoryLink" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductCategoryLink" also-hidden="false">
                 <parameter param-name="productCategoryId"/>
                 <parameter param-name="linkSeqId"/>
                 <parameter param-name="fromDate"/>
@@ -206,7 +206,7 @@ under the License.
         <field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
         <field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="clearFormButton" title=" " use-when="productCategoryLink!=null">
-            <hyperlink target="EditProductCategoryLinks" target-type="intra-app" description="${uiLabelMap.CommonClear}">
+            <hyperlink description="${uiLabelMap.CommonClear}" target="EditProductCategoryLinks" target-type="intra-app">
                 <parameter param-name="productCategoryId"/>
             </hyperlink>
         </field>
@@ -214,7 +214,7 @@ under the License.
 
     <form name="ListTopCategory" type="list" list-name="noParentCategories" odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productCategoryId"  widget-style="buttontext">
-            <hyperlink target="EditCategory" description="${productCategoryId}" also-hidden="false">
+            <hyperlink description="${productCategoryId}" target="EditCategory" also-hidden="false">
                 <parameter param-name="CATALOG_TOP_CATEGORY" value="${productCategoryId}"/>
                 <parameter param-name="productCategoryId" value="${productCategoryId}"/>
             </hyperlink>
@@ -245,7 +245,7 @@ under the License.
             </service>
         </actions>
         <field name="productCategoryId" sort-field="true">
-            <hyperlink also-hidden="false" description="${productCategoryId}" target="EditCategory">
+            <hyperlink description="${productCategoryId}" target="EditCategory" also-hidden="false">
                 <parameter param-name="productCategoryId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Nov  5 14:14:04 2016
@@ -361,7 +361,7 @@ under the License.
     <screen name="ProductStoreGroupTree">
         <section>
             <actions>
-                <entity-one value-field="parentProductStoreGroup" entity-name="ProductStoreGroup"/>
+                <entity-one entity-name="ProductStoreGroup" value-field="parentProductStoreGroup"/>
                 <entity-condition entity-name="ProductStoreGroup" list="parentProductStoreGroups">
                     <condition-expr field-name="primaryParentGroupId" from-field="nullField"/>
                 </entity-condition>

Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml Sat Nov  5 14:14:04 2016
@@ -35,7 +35,7 @@ under the License.
             <set field="typeDescription" value="${groovy: return &quot;SINGLE&quot;.equals(configItemTypeId) ? uiLabelMap.get(&quot;ProductSingleChoice&quot;) : uiLabelMap.get(&quot;ProductMultiChoice&quot;)}"/>
         </row-actions>
         <field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext">
-            <hyperlink target="EditProductConfigItem" description="${configItemId}">
+            <hyperlink description="${configItemId}" target="EditProductConfigItem">
                 <parameter param-name="configItemId"/>
             </hyperlink>
         </field>
@@ -151,7 +151,7 @@ under the License.
         <auto-fields-service service-name="updateProductConfigItemContent" map-name="productContent"/>
         <field name="configItemId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.ProductContent_Id}" widget-style="buttontext">
-            <hyperlink target="EditProductConfigItemContentContent" description="${content.description} [${productContent.contentId}]">
+            <hyperlink description="${content.description} [${productContent.contentId}]" target="EditProductConfigItemContentContent">
                 <parameter param-name="configItemId" from-field="productContent.configItemId"/>
                 <parameter param-name="contentId" from-field="productContent.contentId"/>
             </hyperlink>
@@ -165,7 +165,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="removeContentFromProductConfigItem" description="[${uiLabelMap.CommonDelete}]" also-hidden="false">
+            <hyperlink description="[${uiLabelMap.CommonDelete}]" target="removeContentFromProductConfigItem" also-hidden="false">
                 <parameter param-name="configItemId" from-field="productContent.configItemId"/>
                 <parameter param-name="contentId" from-field="productContent.contentId"/>
                 <parameter param-name="confItemContentTypeId" from-field="productContent.confItemContentTypeId"/>
@@ -207,7 +207,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="ProductConfigAndProduct" default-field-type="hidden"/>
         <field name="productId" widget-style="buttontext"  >
-            <hyperlink target="EditProductConfigs" description="${productId}">
+            <hyperlink description="${productId}" target="EditProductConfigs">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -220,7 +220,7 @@ under the License.
         target="" header-row-style="header-row-2" paginate="true">
         <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display"/>
         <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}">
-            <hyperlink target="EditProductConfigOptions" description="${configOptionId} - ${configOptionName}">
+            <hyperlink description="${configOptionId} - ${configOptionName}" target="EditProductConfigOptions">
                 <parameter param-name="configItemId"/>
                 <parameter param-name="configOptionId"/>
             </hyperlink>
@@ -228,7 +228,7 @@ under the License.
         <field name="configOptionId" ><hidden/></field>
         <field name="configOptionName" ><hidden/></field>
         <field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" >
-            <hyperlink target="deleteProductConfigOption" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductConfigOption">
                 <parameter param-name="configItemId"/>
                 <parameter param-name="configOptionId"/>
             </hyperlink>
@@ -247,12 +247,12 @@ under the License.
         <field name="configItemId" ><hidden/></field>
         <field name="configOptionId" ><hidden/></field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink target="EditProduct" description="${product.productId} - ${product.productName}">
+            <hyperlink description="${product.productId} - ${product.productName}" target="EditProduct">
                 <parameter param-name="productId" from-field="product.productId"/>
             </hyperlink>
         </field>
         <field name="remove" widget-style="buttontext" >
-            <hyperlink target="deleteProductConfigProduct" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductConfigProduct">
                 <parameter param-name="configItemId"/>
                 <parameter param-name="configOptionId"/>
                 <parameter param-name="productId" from-field="product.productId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml Sat Nov  5 14:14:04 2016
@@ -48,7 +48,7 @@
             </drop-down>
         </field>
         <field use-when="productFeature!=null&amp;&amp;productFeature.getString(&quot;productFeatureCategoryId&quot;)!=null" name="categoryLink" title=" " widget-style="buttontext">
-            <hyperlink target="/EditFeatureCategoryFeatures" target-type="intra-app" description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" target="/EditFeatureCategoryFeatures" target-type="intra-app" also-hidden="false">
                 <parameter param-name="productFeatureCategoryId" from-field="productFeature.productFeatureCategoryId"/>
             </hyperlink>
         </field>
@@ -102,7 +102,7 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeSupplierProductFeature" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeSupplierProductFeature">
                 <parameter param-name="productFeatureId"/>
                 <parameter param-name="partyId"/>
             </hyperlink>
@@ -127,7 +127,7 @@
             </service>
         </actions>
         <field name="productFeatureTypeId" widget-style="buttontext">
-            <hyperlink target="EditFeatureType" description="${productFeatureTypeId}">
+            <hyperlink description="${productFeatureTypeId}" target="EditFeatureType">
                 <parameter param-name="productFeatureTypeId"/>
             </hyperlink>
         </field>
@@ -140,7 +140,7 @@
             </display-entity>
         </field>
         <field name="removeFeatureType" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="removeProductFeatureType" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFeatureType">
                 <parameter param-name="productFeatureTypeId"/>
             </hyperlink>
         </field>
@@ -197,7 +197,7 @@
         <field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field>
 
         <field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="removeProductFeatureIactn" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFeatureIactn">
                 <parameter param-name="productFeatureId"/>
                 <parameter param-name="productFeatureIdTo"/>
             </hyperlink>
@@ -244,7 +244,7 @@
         </field>
         <field name="sequenceNum"><text size="3"/></field>
         <field name="removeFeatureGroupAppl" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
-            <hyperlink target="RemoveProductFeatureGroupAppl" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="RemoveProductFeatureGroupAppl">
                 <parameter param-name="productFeatureGroupId"/>
                 <parameter param-name="productFeatureId"/>
                 <parameter param-name="fromDate"/>
@@ -310,7 +310,7 @@
             </service>
         </actions>
         <field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}" widget-style="buttontext">
-            <hyperlink target="EditFeatureCategoryFeatures" description="${productFeatureCategoryId}">
+            <hyperlink description="${productFeatureCategoryId}" target="EditFeatureCategoryFeatures">
                 <parameter param-name="productFeatureCategoryId"/>
             </hyperlink>
         </field>
@@ -345,7 +345,7 @@
         <field name="updateFeaturePrice" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="lastModifiedBy" title="${uiLabelMap.ProductLastModifiedBy}"><display description="[${lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${lastModifiedDate}"/></field>
         <field name="deleteFeaturePrice" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteFeaturePrice" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFeaturePrice" also-hidden="false">
                 <parameter param-name="productFeatureId"/>
                 <parameter param-name="productPriceTypeId"/>
                 <parameter param-name="currencyUomId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml Sat Nov  5 14:14:04 2016
@@ -59,13 +59,13 @@ under the License.
             <set field="hasVariants" value="${groovy: org.apache.ofbiz.entity.util.EntityUtil.filterByDate(delegator.findByAnd('ProductAssoc', org.apache.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT'), null, true)).size() > 0}" type="Boolean"/>
         </row-actions>
         <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
         <field name="searchVariants" title=" " widget-style="buttontext" use-when="hasVariants">
-            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct">
+            <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -97,7 +97,7 @@ under the License.
             </service>
         </actions>
         <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -122,7 +122,7 @@ under the License.
             </service>
         </actions>
         <field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -191,12 +191,12 @@ under the License.
         </row-actions>
         <!--
         <field name="productId" title=" " widget-style="buttontext" use-when="isVirtual==null||&quot;${isVirtual}&quot;.equals(&quot;N&quot;)">
-            <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="isVirtual!=null&amp;&amp;&quot;${isVirtual}&quot;.equals(&quot;Y&quot;)"><display/></field>
         -->
         <field name="productId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+            <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
@@ -205,7 +205,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="searchVariants" title=" " widget-style="buttontext" use-when="hasVariants">
-            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct">
+            <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -261,7 +261,7 @@ under the License.
         <auto-fields-entity entity-name="ProductCategory" default-field-type="display"/>
         <field name="productCategoryTypeId"><display-entity entity-name="ProductCategoryType"/></field>
         <field name="productCategoryId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')"/>
+            <hyperlink description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="longDescription"><ignored/></field>
         <field name="categoryImageUrl"><ignored/></field>
@@ -303,7 +303,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
         <field name="productFeatureId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 
@@ -333,7 +333,7 @@ under the License.
         <!-- <auto-fields-entity entity-name="ProductStore" default-field-type="display"/> -->
 
         <field name="productStoreId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productStoreId}" target="javascript:set_value('${productStoreId}')"/>
+            <hyperlink description="${productStoreId}" target="javascript:set_value('${productStoreId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="primaryStoreGroupId"><display/></field>
         <field name="storeName"><display/></field>
@@ -371,7 +371,7 @@ under the License.
             </service>
         </actions>
         <field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')"/>
+            <hyperlink description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"><display/></field>

Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Sat Nov  5 14:14:04 2016
@@ -46,7 +46,7 @@ under the License.
         </row-actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}">
-            <hyperlink target="${currentFormName}" description="${drDataResourceName}">
+            <hyperlink description="${drDataResourceName}" target="${currentFormName}">
                 <parameter param-name="productId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="dataResourceId"/>
@@ -59,7 +59,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -119,7 +119,7 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
         <field name="fromDate" position="2"><display/></field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -159,7 +159,7 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
         <field name="fromDate" position="2"><display/></field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -209,7 +209,7 @@ under the License.
             </drop-down>
         </field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -259,7 +259,7 @@ under the License.
         <field name="rejectedBy" position="2" title="${uiLabelMap.ImageManagementRejectedBy}"><display/></field>
         <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"><display/></field>
         <field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </form>
     
@@ -319,7 +319,7 @@ under the License.
         <field name="sequenceNum" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementSortOrder}"><text maxlength="2" size="5"/></field>
         <field name="drIsPublic" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementPublic}"><check/></field>
         <field name="defaultImage" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementDefaultImage}" widget-style="buttontext">
-            <hyperlink target="setDefaultImage" description="${uiLabelMap.ImageManagementSetDefault}">
+            <hyperlink description="${uiLabelMap.ImageManagementSetDefault}" target="setDefaultImage">
                 <parameter param-name="productId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentIdTo"/>
@@ -338,10 +338,10 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
         <field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
-            <hyperlink target="removeImage" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this image?">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeImage" also-hidden="false" confirmation-message="Do you want to remove this image?">
                 <parameter param-name="productId" from-field="productId"/>
                 <parameter param-name="contentId" from-field="contentId"/>
                 <parameter param-name="productContentTypeId" from-field="productContentTypeId"/>
@@ -422,7 +422,7 @@ under the License.
         <field name="previewButton" title="${uiLabelMap.CommonPreview}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('new');"><submit button-type="button"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('_self');"><submit button-type="button"/></field>
         <field name="cancelButton" title=" " widget-style="buttontext" event="onClick" action="javascript:deletePreviewFrameImage();">
-            <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}">
+            <hyperlink description="${uiLabelMap.CommonCancel}" target="ListImageManage">
                 <parameter param-name="productId" from-field="parameters.productId"/>
             </hyperlink>
         </field>
@@ -471,7 +471,7 @@ under the License.
         <field name="imageRotate" widget-area-style="cropbox" title="${uiLabelMap.CommonImage}"><image value="${imageURL}" /></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" position="1"><submit button-type="button"/></field>
         <field name="cancelButton" title=" " widget-style="buttontext">
-            <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}">
+            <hyperlink description="${uiLabelMap.CommonCancel}" target="ListImageManage">
                 <parameter param-name="productId" from-field="parameters.productId"/>
             </hyperlink>
         </field>
@@ -561,7 +561,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="status"><display description="Uploaded"/></field>
         <field name="removeContent" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="removeImageUpload" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeImageUpload" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="productContentTypeId"/>
@@ -596,7 +596,7 @@ under the License.
         </row-actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/>
+            <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentId"><display/></field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
@@ -605,7 +605,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -654,7 +654,7 @@ under the License.
         </field>
         <field name="purchaseFromDate" title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -684,7 +684,7 @@ under the License.
         </row-actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}">
-            <hyperlink target="ListImageReplace" description="${drDataResourceName}">
+            <hyperlink description="${drDataResourceName}" target="ListImageReplace">
                 <parameter param-name="productId"/>
                 <parameter param-name="contentIdExist" from-field="contentId"/>
                 <parameter param-name="dataResourceIdExist" from-field="dataResourceId"/>
@@ -695,7 +695,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -725,7 +725,7 @@ under the License.
         </row-actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}">
-            <hyperlink target="ListImageReplace" description="${drDataResourceName}">
+            <hyperlink description="${drDataResourceName}" target="ListImageReplace">
                 <parameter param-name="productId"/>
                 <parameter param-name="contentIdReplace" from-field="contentId"/>
                 <parameter param-name="dataResourceIdReplace" from-field="dataResourceId"/>
@@ -738,7 +738,7 @@ under the License.
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
-            <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+            <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
         </field>
     </grid>
     
@@ -750,13 +750,13 @@ under the License.
         </actions>
         <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
         <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/>
+            <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentId"><display/></field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
         <field name="createdDate"><display/></field>
         <!--<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteImageFrame" target-window="_blank" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteImageFrame" target-window="_blank" also-hidden="false">
                 <parameter param-name="contentId" from-field="contentId"/>
             </hyperlink>
         </field>-->
@@ -787,7 +787,7 @@ under the License.
         </actions>
         <field name="mapKey" title="${uiLabelMap.CommonSize}"><display/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonRemove}" use-when="${groovy: return context.mapKey != '100';}" widget-style="buttontext">
-            <hyperlink target="removeImageBySize" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this size?">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeImageBySize" also-hidden="false" confirmation-message="Do you want to remove this size?">
                 <parameter param-name="productId" from-field="parameters.productId"/>
                 <parameter param-name="mapKey" from-field="mapKey"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml Sat Nov  5 14:14:04 2016
@@ -96,7 +96,7 @@ under the License.
                                    <field-map field-name="contentAssocTypeId" value="ALTERNATE_LOCALE" />
                                 </entity-and>-->
                                 
-                                <!--<entity-one value-field="product" entity-name="Product"/>-->
+                                <!--<entity-one entity-name="Product" value-field="product"/>-->
                                 <!--<script location="component://product/groovyScripts/catalog/imagemanagement/SeoLocales.groovy"/>-->
                                 <script location="component://product/groovyScripts/catalog/imagemanagement/ImageGallery.groovy"/>
                             </actions>
@@ -415,7 +415,7 @@ under the License.
             <actions>
                 <set field="userTabButtonImage" value="ImageManage"/>
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one value-field="product" entity-name="Product"/>
+                <entity-one entity-name="Product" value-field="product"/>
             </actions>
             <widgets>
                 <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}">
@@ -642,7 +642,7 @@ under the License.
                 <set field="currentFormName" value="ListImageReplace"/>
                 <set field="statusForm" value="IM_APPROVED"/>
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one value-field="product" entity-name="Product"/>
+                <entity-one entity-name="Product" value-field="product"/>
             </actions>
             <widgets>
                 <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}">
@@ -826,7 +826,7 @@ under the License.
             <actions>
                 <set field="userTabButtonImage" value="ImageResize"/>
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one value-field="product" entity-name="Product"/>
+                <entity-one entity-name="Product" value-field="product"/>
                 <entity-condition entity-name="ProductContentAndInfo" list="productContentAndInfos">
                     <condition-list combine="and">
                         <condition-expr field-name="productId" from-field="parameters.productId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml Sat Nov  5 14:14:04 2016
@@ -34,7 +34,7 @@
             </service>
         </actions>
         <field name="productPriceRuleId" title="${uiLabelMap.ProductPriceRuleNameId}" widget-style="buttontext">
-            <hyperlink target="EditProductPriceRules" description="${ruleName}[${productPriceRuleId}]" >
+            <hyperlink description="${ruleName}[${productPriceRuleId}]" target="EditProductPriceRules" >
                 <parameter param-name="productPriceRuleId"/>
             </hyperlink>
         </field>
@@ -42,7 +42,7 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductPriceRules" description="${uiLabelMap.CommonEdit}">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductPriceRules">
                 <parameter param-name="productPriceRuleId"/>
             </hyperlink>
         </field>
@@ -69,7 +69,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>        
         <field use-when="org.apache.ofbiz.base.util.UtilValidate.isEmpty(productPriceConds) &amp;&amp; org.apache.ofbiz.base.util.UtilValidate.isEmpty(productPriceActions)"
             name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductPriceRule" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductPriceRule">
                 <parameter param-name="productPriceRuleId"/>
             </hyperlink>
         </field>        
@@ -100,7 +100,7 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title=" " widget-style="buttontext" widget-area-style="align-text">
-            <hyperlink target="deleteProductPriceCond" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductPriceCond">
                 <parameter param-name="productPriceRuleId" from-field="productPriceCond.productPriceRuleId"/>
                 <parameter param-name="productPriceCondSeqId" from-field="productPriceCond.productPriceCondSeqId"/>
             </hyperlink>
@@ -144,7 +144,7 @@
         <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>        
         <field name="deleteLink" title=" " widget-style="buttontext" widget-area-style="align-text">
-            <hyperlink target="deleteProductPriceAction" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductPriceAction">
                 <parameter param-name="productPriceRuleId" from-field="productPriceAction.productPriceRuleId"/>
                 <parameter param-name="productPriceActionSeqId" from-field="productPriceAction.productPriceActionSeqId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sat Nov  5 14:14:04 2016
@@ -44,13 +44,13 @@ under the License.
             </service>
         </actions>
         <field name="prodCatalogId" sort-field="true">
-            <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditCatalog">
+            <hyperlink description="${prodCatalogId}" target="EditCatalog" also-hidden="false">
                 <parameter param-name="prodCatalogId"/>
             </hyperlink>
         </field>
         
         <field name="prodCatalogId" sort-field="true">
-            <hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="${prodCatalogId}"></hyperlink>
+            <hyperlink description="${prodCatalogId}" target="EditProdCatalog?prodCatalogId=${prodCatalogId}"></hyperlink>
         </field>
         <field name="catalogName" sort-field="true"><display/></field>
         <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
@@ -118,7 +118,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="removeProdCatalogFromParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProdCatalogFromParty" also-hidden="false">
               <parameter param-name="prodCatalogId"/>
               <parameter param-name="partyId"/>
               <parameter param-name="roleTypeId"/>
@@ -154,7 +154,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="deleteProdCatalogStore" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProdCatalogStore" also-hidden="false">
               <parameter param-name="prodCatalogId"/>
               <parameter param-name="productStoreId"/>
               <parameter param-name="fromDate"/>
@@ -177,7 +177,7 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
         <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeProductCategoryFromProdCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductCategoryFromProdCatalog" also-hidden="false">
               <parameter param-name="prodCatalogId"/>
               <parameter param-name="productCategoryId"/>
               <parameter param-name="partyId"/>
@@ -186,7 +186,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="makeTopLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditCategory" description="${uiLabelMap.ProductMakeTop}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.ProductMakeTop}" target="EditCategory" also-hidden="false">
                 <parameter param-name="CATALOG_TOP_CATEGORY" from-field="productCategoryId"/>
                 <parameter param-name="productCategoryId"/>
             </hyperlink>