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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

diveshdutta
Modified: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementForms.xml Sat Nov  5 14:14:04 2016
@@ -66,18 +66,18 @@ under the License.
         </row-actions>        
         <auto-fields-entity entity-name="Agreement" default-field-type="display"/>
         <field name="agreementId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext" sort-field="true">
-            <hyperlink also-hidden="false" description="${agreementId}" target="EditAgreement">
+            <hyperlink description="${agreementId}" target="EditAgreement" also-hidden="false">
                 <parameter param-name="agreementId"/>
             </hyperlink>
         </field>
         <field name="productId" sort-field="true"></field>
         <field name="partyIdFrom" sort-field="true">
-            <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target-type="inter-app">
+            <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdFrom"/>
             </hyperlink>
         </field>
         <field name="partyIdTo" sort-field="true">
-            <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultTo.fullName} [${partyIdTo}]" target-type="inter-app">
+            <hyperlink description="${partyNameResultTo.fullName} [${partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyIdTo"/>
             </hyperlink>
         </field>
@@ -94,7 +94,7 @@ under the License.
         <field name="textData" title="${uiLabelMap.AccountingTextData}"><hidden/></field>
         <field name="description" sort-field="true"></field>
         <field name="cancelLink" title=" " widget-style="buttontext">
-            <hyperlink target="cancelAgreement" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelAgreement" also-hidden="false">
                 <parameter param-name="agreementId"/>
             </hyperlink>
         </field>
@@ -142,7 +142,7 @@ under the License.
         <auto-fields-entity entity-name="AgreementItem" default-field-type="display"/>
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${agreementItemSeqId}" target="EditAgreementItem">
+            <hyperlink description="${agreementItemSeqId}" target="EditAgreementItem" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
             </hyperlink>
@@ -151,7 +151,7 @@ under the License.
             <display-entity entity-name="AgreementItemType"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementItem" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItem" also-hidden="false">
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="agreementId"/>
             </hyperlink>
@@ -189,7 +189,7 @@ under the License.
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="agreementTermId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${agreementTermId}" target="EditAgreementItemTerm">
+            <hyperlink description="${agreementTermId}" target="EditAgreementItemTerm" also-hidden="false">
                 <parameter param-name="agreementTermId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -202,7 +202,7 @@ under the License.
             <display-entity entity-name="InvoiceItemType"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementItemTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemTerm" also-hidden="false">
                 <parameter param-name="agreementTermId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -233,7 +233,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteAgreementTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAgreementTerm" also-hidden="false">
                 <parameter param-name="agreementTermId"/>
                 <parameter param-name="agreementId"/>
             </hyperlink>
@@ -348,7 +348,7 @@ under the License.
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${productId}" target="EditAgreementItemProduct">
+           <hyperlink description="${productId}" target="EditAgreementItemProduct" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -359,7 +359,7 @@ under the License.
         </field>
         <field name="price"><display type="currency" currency="${agreementItem.currencyUomId}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementItemProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemProduct" also-hidden="false">
                 <parameter param-name="productId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -372,7 +372,7 @@ under the License.
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="facilityId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${facilityId}" target="EditAgreementItemFacility">
+           <hyperlink description="${facilityId}" target="EditAgreementItemFacility" also-hidden="false">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -382,7 +382,7 @@ under the License.
             <display-entity entity-name="Facility" key-field-name="facilityId" description="${internalName}"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementItemFacility" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemFacility" also-hidden="false">
                 <parameter param-name="facilityId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -397,7 +397,7 @@ under the License.
         <field name="partyId"><hidden/></field>
         <field name="currencyUomId"><hidden/></field>
         <field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productId}" target="EditAgreementItemSupplierProduct">
+            <hyperlink description="${productId}" target="EditAgreementItemSupplierProduct" also-hidden="false">
                 <parameter param-name="minimumOrderQuantity"/>
                 <parameter param-name="currencyUomId"/>
                 <parameter param-name="availableFromDate"/>
@@ -412,7 +412,7 @@ under the License.
         </field>
         <field name="lastPrice"><display type="currency" currency="${agreementItem.currencyUomId}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementItemSupplierProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemSupplierProduct" also-hidden="false">
                 <parameter param-name="minimumOrderQuantity"/>
                 <parameter param-name="currencyUomId"/>
                 <parameter param-name="availableFromDate"/>
@@ -544,7 +544,7 @@ under the License.
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="productPromoId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productPromoId}" target="EditAgreementPromoAppl">
+            <hyperlink description="${productPromoId}" target="EditAgreementPromoAppl" also-hidden="false">
                 <parameter param-name="productPromoId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -555,7 +555,7 @@ under the License.
             <display-entity entity-name="ProductPromo" key-field-name="productPromoId" description="${promoName}"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementPromoAppl" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementPromoAppl" also-hidden="false">
                 <parameter param-name="productPromoId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -590,7 +590,7 @@ under the License.
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${partyId}" target="EditAgreementItemParty">
+           <hyperlink description="${partyId}" target="EditAgreementItemParty" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -600,7 +600,7 @@ under the License.
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementItemParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeAgreementItemParty" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -630,7 +630,7 @@ under the License.
             <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeAgreementGeographicalApplic" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeAgreementGeographicalApplic" also-hidden="false">
                 <parameter param-name="geoId"/>
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
@@ -683,7 +683,7 @@ under the License.
         <field name="agreementItemSeqId"><display/></field>
         <field name="workEffortId"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic">
+           <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="agreementItemSeqId"/>
                 <parameter param-name="workEffortId"/>
@@ -702,7 +702,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteAgreementRole" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAgreementRole" also-hidden="false">
                 <parameter param-name="agreementId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Sat Nov  5 14:14:04 2016
@@ -106,7 +106,7 @@ under the License.
         <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
         <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
         <field name="capture" use-when="${groovy:!paidInvoice}" widget-style="buttontext">
-            <hyperlink target="capturePaymentsByInvoice" description="${uiLabelMap.AccountingCapture}">
+            <hyperlink description="${uiLabelMap.AccountingCapture}" target="capturePaymentsByInvoice">
                 <parameter param-name="invoiceId"/>
                 <parameter param-name="billingAccountId"/>
             </hyperlink>
@@ -137,7 +137,7 @@ under the License.
         </field>
         <field name="contactMechId" tooltip="${uiLabelMap.AccountingBillingContactMechIdMessage}" use-when="billingAccount != null">
             <drop-down>
-                <entity-options entity-name="BillingAccountRoleAndAddress" description="[${partyId}][${contactMechId}] ${toName}, ${attnName}, ${address1}, ${stateProvinceGeoId} ${postalCode}" key-field-name="contactMechId" filter-by-date="true">
+                <entity-options entity-name="BillingAccountRoleAndAddress" key-field-name="contactMechId" description="[${partyId}][${contactMechId}] ${toName}, ${attnName}, ${address1}, ${stateProvinceGeoId} ${postalCode}" filter-by-date="true">
                     <entity-constraint name="billingAccountId" env-name="billingAccountId"/>
                     <entity-order-by field-name="partyId"/>
                     <entity-order-by field-name="contactMechId"/>
@@ -184,7 +184,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="deleteBillingAccountRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteBillingAccountRole" also-hidden="false">
                 <parameter param-name="billingAccountId"/>
                 <parameter param-name="roleTypeId"/>
                 <parameter param-name="partyId"/>
@@ -324,7 +324,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="billingAccountId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" also-hidden="false">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" also-hidden="false">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/BudgetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BudgetForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BudgetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BudgetForms.xml Sat Nov  5 14:14:04 2016
@@ -33,7 +33,7 @@ under the License.
             </service>
         </actions>
         <field name="budgetId" widget-style="linktext" sort-field="true">
-            <hyperlink also-hidden="false" description="${budgetId}" target="EditBudget">
+            <hyperlink description="${budgetId}" target="EditBudget" also-hidden="false">
                 <parameter param-name="budgetId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sat Nov  5 14:14:04 2016
@@ -51,7 +51,7 @@ under the License.
         <section>
             <actions>
                 <set field="headerItem" value="FindFinAccount"/>
-                <entity-one value-field="finAccount" entity-name="FinAccount"/>
+                <entity-one entity-name="FinAccount" value-field="finAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CostForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CostForms.xml Sat Nov  5 14:14:04 2016
@@ -37,7 +37,7 @@ under the License.
         <field name="updateCostComponentCalc" title="${uiLabelMap.CommonUpdate}"><submit/></field>
         <field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId"/></field>
         <field name="deleteCostComponentCalc" title=" " widget-style="buttontext">
-            <hyperlink target="deleteCostComponentCalc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCostComponentCalc" also-hidden="false">
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Sat Nov  5 14:14:04 2016
@@ -47,7 +47,7 @@ under the License.
             </service>
         </actions>
         <field name="fixedAssetId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+            <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
@@ -79,7 +79,7 @@ under the License.
             </service>
         </actions>
         <field name="fixedAssetId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+            <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
@@ -106,7 +106,7 @@ under the License.
             </service>
         </actions>
         <field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')"/>
+            <hyperlink description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description"><display/></field>
         <field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><display/></field>
@@ -145,7 +145,7 @@ under the License.
             </service>
         </actions>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${glAccountId}" target="javascript:set_value('${glAccountId}')"/>
+            <hyperlink description="${glAccountId}" target="javascript:set_value('${glAccountId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="accountName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="GlAccountType"/></field>
@@ -173,7 +173,7 @@ under the License.
             </service>
         </actions>
         <field name="paymentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${paymentId}" target="javascript:set_value('${paymentId}')"/>
+            <hyperlink description="${paymentId}" target="javascript:set_value('${paymentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
         <field name="partyIdTo"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
@@ -217,7 +217,7 @@ under the License.
             </service>
         </actions>
         <field name="invoiceId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${invoiceId}" target="javascript:set_value('${invoiceId}')"/>
+            <hyperlink description="${invoiceId}" target="javascript:set_value('${invoiceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
@@ -247,7 +247,7 @@ under the License.
             </service>
         </actions>
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${agreementId}" target="javascript:set_value('${agreementId}')"/>
+            <hyperlink description="${agreementId}" target="javascript:set_value('${agreementId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="productId"><display/></field>
         <field name="partyIdFrom"><display/></field>
@@ -281,7 +281,7 @@ under the License.
         </actions>
         <field name="agreementId"><display/></field>
         <field name="agreementItemSeqId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')"/>
+            <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="agreementItemTypeId"><display/></field>
         <field name="currencyUomId"><display/></field>
@@ -307,7 +307,7 @@ under the License.
             </service>
         </actions>
         <field name="paymentGroupId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')"/>
+            <hyperlink description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="paymentId"><display/></field>
         <field name="sequenceNum"><display/></field>        
@@ -334,7 +334,7 @@ under the License.
             </service>
         </actions>
         <field name="glReconciliationId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')"/>
+            <hyperlink description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="glReconciliationName"><display/></field>
         <field name="organizationPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}[${partyId}]"/></field>
@@ -377,7 +377,7 @@ under the License.
             </service>
         </actions>
         <field name="customTimePeriodId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')"/>
+            <hyperlink description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="parentPeriodId"><display/></field>
         <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Sat Nov  5 14:14:04 2016
@@ -64,17 +64,17 @@ under the License.
             </hyperlink>
         </field>
         <field name="organizationPartyId">
-            <hyperlink target="/partymgr/control/viewprofile" description="${organizationPartyId}" target-type="inter-app">
+            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="organizationPartyId"/>
             </hyperlink>
         </field>
         <field name="ownerPartyId">
-            <hyperlink target="/partymgr/control/viewprofile" description="${ownerPartyId}" target-type="inter-app">
+            <hyperlink description="${ownerPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="ownerPartyId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFinAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFinAccount" also-hidden="false">
                 <parameter param-name="finAccountId"/>
             </hyperlink>
         </field>
@@ -155,7 +155,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFinAccountRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFinAccountRole" also-hidden="false">
                 <parameter param-name="finAccountId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
@@ -209,7 +209,7 @@ under the License.
         </field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}">
             <drop-down>
-                <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId">
+                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]">
                     <entity-constraint name="organizationPartyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="glAccountId"/>
                 </entity-options>
@@ -230,7 +230,7 @@ under the License.
         <field name="finAccountAuthId"><display/></field>
         <field name="finAccountId"><hidden/></field>
         <field name="expireLink" title=" " widget-style="buttontext">
-            <hyperlink target="expireFinAccountAuth" description="${uiLabelMap.CommonExpire}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonExpire}" target="expireFinAccountAuth" also-hidden="false">
                 <parameter param-name="finAccountId"/>
                 <parameter param-name="finAccountAuthId"/>
             </hyperlink>
@@ -265,7 +265,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
-            <hyperlink target="deleteDepositSlip" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonCancel}" target="deleteDepositSlip" also-hidden="false">
                 <parameter param-name="paymentGroupId"/>
                 <parameter param-name="finAccountId"/>
                 <parameter param-name="glReconciliationId"/>
@@ -287,7 +287,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="expireDepositSlipMember" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonCancel}" target="expireDepositSlipMember" also-hidden="false">
                 <parameter param-name="paymentGroupId"/>
                 <parameter param-name="paymentId"/>
                 <parameter param-name="fromDate"/>
@@ -424,19 +424,19 @@ under the License.
         </row-actions>
         <auto-fields-service service-name="updateGlReconciliation" default-field-type="display" map-name="glReconciliation"/>
         <field name="glReconciliationId">
-            <hyperlink target="ViewGlReconciliationWithTransaction" description="${glReconciliation.glReconciliationId}">
+            <hyperlink description="${glReconciliation.glReconciliationId}" target="ViewGlReconciliationWithTransaction">
                 <parameter param-name="glReconciliationId" from-field="glReconciliation.glReconciliationId"/>
                 <parameter param-name="finAccountId"/>
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="organizationPartyId" title="${uiLabelMap.PartyParty}">
-            <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyName.firstName} ${partyName.lastName}${partyName.groupName} [${partyName.partyId}]">
+            <hyperlink description="${partyName.firstName} ${partyName.lastName}${partyName.groupName} [${partyName.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="partyName.partyId"/>
             </hyperlink>
         </field>
         <field name="cancelButton" title="${uiLabelMap.AccountingCancelBankReconciliation}" use-when="${glReconciliation.statusId == 'GLREC_CREATED'}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="cancelReconciliation">
+            <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelReconciliation" also-hidden="false">
                 <parameter param-name="glReconciliationId" from-field="glReconciliation.glReconciliationId"/>
                 <parameter param-name="finAccountId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sat Nov  5 14:14:04 2016
@@ -27,7 +27,7 @@ under the License.
         <section>
             <actions>
                 <set field="headerItem" value="FindFinAccount"/>
-                <entity-one value-field="finAccount" entity-name="FinAccount"/>
+                <entity-one entity-name="FinAccount" value-field="finAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Sat Nov  5 14:14:04 2016
@@ -44,7 +44,7 @@ under the License.
             </service>
         </row-actions>
         <field name="fixedAssetId" widget-style="linktext" sort-field="true">
-            <hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset">
+            <hyperlink description="${fixedAssetId}" target="EditFixedAsset" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
             </hyperlink>
         </field>
@@ -135,7 +135,7 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeFixedAssetProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeFixedAssetProduct" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="productId"/>
                 <parameter param-name="fixedAssetProductTypeId"/>
@@ -212,7 +212,7 @@ under the License.
             </drop-down>
         </field>
         <field name="cancel" title=" " widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="cancelFixedAssetStdCost">
+           <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelFixedAssetStdCost" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="fixedAssetStdCostTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -257,7 +257,7 @@ under the License.
         </field>
         <field name="idValue" title="${uiLabelMap.AccountingFixedAssetIdentIdValue}"/>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeFixedAssetIdent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFixedAssetIdent" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="fixedAssetIdentTypeId"/>
             </hyperlink>
@@ -297,7 +297,7 @@ under the License.
         <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20"/></field>
         <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFixedAssetRegistration" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetRegistration" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="fromDate"/>
             </hyperlink>
@@ -329,7 +329,7 @@ under the License.
             </service>
         </actions>
         <field name="maintHistSeqId">
-            <hyperlink also-hidden="false" description="${maintHistSeqId}" target="EditFixedAssetMaint">
+            <hyperlink description="${maintHistSeqId}" target="EditFixedAssetMaint" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="maintHistSeqId"/>
             </hyperlink>
@@ -410,7 +410,7 @@ under the License.
             </drop-down>
         </field>
         <field name="scheduleWorkEffortId" widget-style="buttontext">
-            <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target-type="inter-app">
+            <hyperlink description="${fixedAssetMaint.scheduleWorkEffortId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/>
             </hyperlink>
         </field>
@@ -439,14 +439,14 @@ under the License.
         <field name="readingDate"><display/></field>
         <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text/></field>
         <field name="maintHistSeqId" title="${uiLabelMap.AccountingFixedAssetMaint}">
-            <hyperlink target="EditFixedAssetMaint" description="${maintHistSeqId}" also-hidden="false">
+            <hyperlink description="${maintHistSeqId}" target="EditFixedAssetMaint" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="maintHistSeqId"/>
             </hyperlink>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
-            <hyperlink target="deleteFixedAssetMeter" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteFixedAssetMeter" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="productMeterTypeId"/>
                 <parameter param-name="readingDate"/>
@@ -486,13 +486,13 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="/ordermgr/control/orderview" also-hidden="false" description="${orderId}" target-type="inter-app">
+            <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
         <field name="orderItemSeqId"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFixedAssetMaintOrder" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteFixedAssetMaintOrder" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="maintHistSeqId"/>
                 <parameter param-name="orderId"/>
@@ -546,7 +546,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deletePartyFixedAssetAssignment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyFixedAssetAssignment" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
@@ -606,7 +606,7 @@ under the License.
             <display-entity entity-name="CustomMethod" key-field-name="customMethodId"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFixedAssetDepMethod" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetDepMethod" also-hidden="false">
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="depreciationCustomMethodId"/>
                 <parameter param-name="fromDate"/>
@@ -631,7 +631,7 @@ under the License.
             </entity-condition>
         </actions>
         <field name="acctgTransId" widget-style="buttontext">
-            <hyperlink target="EditAcctgTrans" description="${acctgTransId}" also-hidden="false">
+            <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>
@@ -740,7 +740,7 @@ under the License.
         <field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
         <field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFixedAssetTypeGlAccountForFixedAsset" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetTypeGlAccountForFixedAsset" also-hidden="false">
                 <parameter param-name="fixedAssetTypeId"/>
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="organizationPartyId"/>

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Sat Nov  5 14:14:04 2016
@@ -616,7 +616,7 @@ under the License.
                 <set field="titleProperty" value="PageTitleFixedAssetGeoLocation"/>
                 <set field="tabButtonItem" value="FixedAssetGeoLocation"/>
                 <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
-                <entity-one value-field="fixedAsset" entity-name="FixedAsset"/>
+                <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
                 <script location="component://accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sat Nov  5 14:14:04 2016
@@ -101,7 +101,7 @@ under the License.
         </actions>
 
         <field name="acctgTransId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+            <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>
@@ -111,25 +111,25 @@ under the License.
         <field name="description"><display/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
         <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+            <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
                 <parameter param-name="invoiceId"/>
             </hyperlink>
         </field>
         <field name="invoiceId" use-when="invoiceId==null"><display/></field>
         <field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+            <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
                 <parameter param-name="paymentId"/>
             </hyperlink>
         </field>
         <field name="paymentId" use-when="paymentId==null"><display/></field>
         <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app">
+            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="workEffortId" use-when="workEffortId==null"><display/></field>
         <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
@@ -137,12 +137,12 @@ under the License.
         <field name="isPosted"><display/></field>
         <field name="postedDate"><display/></field>
         <field name="postAcctgTrans" title=" " use-when="'N'.equals(isPosted)" widget-style="buttontext">
-            <hyperlink target="postAcctgTrans" description="${uiLabelMap.AccountingPostTransaction}">
+            <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans">
                 <parameter param-name="acctgTransId"/>
             </hyperlink>
         </field>
         <field name="createTransactionDetailReportPDF" title=" " use-when="${isPosted=='Y'}" widget-style="buttontext">
-            <hyperlink target="acctgTransDetailReportPdf.pdf" target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}">
+            <hyperlink description="${uiLabelMap.AccountingInvoicePDF}" target="acctgTransDetailReportPdf.pdf" target-window="_BLANK">
                 <parameter param-name="acctgTransId"/>
             </hyperlink>
         </field>
@@ -152,7 +152,7 @@ under the License.
     <form name="ListUnpostedAcctgTrans" type="list" title="Unposted Accounting Transactions" list-name="transactions"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="acctgTransId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+            <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>
@@ -161,13 +161,13 @@ under the License.
         <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
         <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+            <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
                 <parameter param-name="invoiceId"/>
             </hyperlink>
         </field>
         <field name="invoiceId" use-when="invoiceId==null"><display/></field>
         <field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+            <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
                 <parameter param-name="paymentId"/>
             </hyperlink>
         </field>
@@ -288,7 +288,7 @@ under the License.
         </field>
 
         <field name="acctgTransId" widget-style="buttontext" position="2">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+            <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>
@@ -298,37 +298,37 @@ under the License.
         <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="2"><display-entity entity-name="AcctgTransType"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2"><display-entity entity-name="GlFiscalType"/></field>
         <field name="invoiceId" position="2" use-when="invoiceId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+            <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
                 <parameter param-name="invoiceId"/>
             </hyperlink>
         </field>
         <field name="invoiceId" position="2" use-when="invoiceId==null"><display/></field>
         <field name="paymentId" position="2" use-when="paymentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+            <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
                 <parameter param-name="paymentId"/>
             </hyperlink>
         </field>
         <field name="paymentId" position="2" use-when="paymentId==null"><display/></field>
         <field name="workEffortId" position="2" use-when="workEffortId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app">
+            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="workEffortId" position="2" use-when="workEffortId==null"><display/></field>
         <field name="shipmentId" position="2" use-when="shipmentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentId" position="2" use-when="shipmentId==null"><display/></field>
         <field name="partyId" position="2" use-when="partyId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
+            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="partyId" position="2" use-when="partyId==null"><display/></field>
         <field name="productId" position="2" use-when="productId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -365,7 +365,7 @@ under the License.
 
         <field name="transactionDate"><display/></field>
         <field name="acctgTransId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+            <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>
@@ -381,37 +381,37 @@ under the License.
             <display-entity entity-name="GlAccountClass"/>
         </field>
         <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+            <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
                 <parameter param-name="invoiceId"/>
             </hyperlink>
         </field>
         <field name="invoiceId" use-when="invoiceId==null"><display/></field>
         <field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+            <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
                 <parameter param-name="paymentId"/>
             </hyperlink>
         </field>
         <field name="paymentId" use-when="paymentId==null"><display/></field>
         <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app">
+            <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="workEffortId" use-when="workEffortId==null"><display/></field>
         <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app">
+            <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
         <field name="shipmentId" use-when="shipmentId==null"><display/></field>
         <field name="partyId" use-when="partyId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
+            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="partyId" use-when="partyId==null"><display/></field>
         <field name="productId" use-when="productId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
+            <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -796,7 +796,7 @@ under the License.
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId">
+                <entity-options entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]">
                     <entity-order-by field-name="accountCode"/>
                 </entity-options>
             </drop-down>
@@ -825,18 +825,18 @@ under the License.
         </field>
         <field name="acctgTransEntrySeqId"><display/></field>
         <field name="glAccountId">
-            <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+            <hyperlink description="${glAccountId}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
         <field name="partyId">
-            <hyperlink target="/partymgr/control/viewprofile" description="${partyIdTo}" target-type="inter-app">
+            <hyperlink description="${partyIdTo}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="productId"><display/></field>
         <field name="organizationPartyId">
-            <hyperlink target="/partymgr/control/viewprofile" description="${organizationPartyId}" target-type="inter-app">
+            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="organizationPartyId"/>
             </hyperlink>
         </field>
@@ -885,7 +885,7 @@ under the License.
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId">
+                <entity-options entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]">
                     <entity-order-by field-name="accountCode"/>
                 </entity-options>
             </drop-down>
@@ -907,7 +907,7 @@ under the License.
             </entity-condition>
         </actions>
         <field name="glReconciliationId">
-            <hyperlink also-hidden="false" description="${glReconciliationId}" target="EditGlReconciliations">
+            <hyperlink description="${glReconciliationId}" target="EditGlReconciliations" also-hidden="false">
                 <parameter param-name="glReconciliationId"/>
                 <parameter param-name="tabButtonItem" from-field="AccountReconciliations"/>
                 <parameter param-name="organizationPartyId"/>
@@ -918,12 +918,12 @@ under the License.
         <field name="createdByUserLogin"><display/></field>
         <field name="lastModifiedByUserLogin"><display/></field>
         <field name="glAccountId">
-            <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+            <hyperlink description="${glAccountId}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
         <field name="organizationPartyId">
-            <hyperlink target="/partymgr/control/viewprofile" description="${organizationPartyId}" target-type="inter-app">
+            <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="organizationPartyId"/>
             </hyperlink>
         </field>
@@ -956,8 +956,8 @@ under the License.
         <field name="postedDate" position="2"/>
         <field name="inventoryItemId" position="1"/>
         <field name="physicalInventoryId" position="2"/>
-        <field name="invoiceId" position="1"><hyperlink target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}" description="${acctgTrans.invoiceId}"/></field>
-        <field name="paymentId" position="2"><hyperlink target="paymentOverview?paymentId=${acctgTrans.paymentId}" description="${acctgTrans.paymentId}"/></field>
+        <field name="invoiceId" position="1"><hyperlink description="${acctgTrans.invoiceId}" target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}"/></field>
+        <field name="paymentId" position="2"><hyperlink description="${acctgTrans.paymentId}" target="paymentOverview?paymentId=${acctgTrans.paymentId}"/></field>
         <field name="receiptId" position="1"/>
         <field name="workEffortId" position="2"/>
         <field name="shipmentId" position="1"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sat Nov  5 14:14:04 2016
@@ -25,17 +25,17 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
         <field name="setup" title=" " use-when="hasPrefPermission" widget-style="buttontext">
-            <hyperlink target="AdminMain" description="${uiLabelMap.AccountingSetup}">
+            <hyperlink description="${uiLabelMap.AccountingSetup}" target="AdminMain">
                 <parameter param-name="organizationPartyId" from-field="partyId"/>
             </hyperlink>
         </field>
         <field name="accounting" title=" " use-when="hasBasicPermission" widget-style="buttontext">
-            <hyperlink target="PartyAccountsSummary" description="${uiLabelMap.AccountingAccounting}">
+            <hyperlink description="${uiLabelMap.AccountingAccounting}" target="PartyAccountsSummary">
                 <parameter param-name="organizationPartyId" from-field="partyId"/>
             </hyperlink>
         </field>
         <field name="importexport" title=" " use-when="hasBasicPermission" widget-style="buttontext">
-            <hyperlink target="ImportExport" description="${uiLabelMap.CommonImportExport}">
+            <hyperlink description="${uiLabelMap.CommonImportExport}" target="ImportExport">
                 <parameter param-name="organizationPartyId" from-field="partyId"/>
             </hyperlink>
         </field>
@@ -50,7 +50,7 @@ under the License.
             </entity-condition>
         </actions>
         <field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${accountCode}" target="GlAccountNavigate">
+            <hyperlink description="${accountCode}" target="GlAccountNavigate" also-hidden="false">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
@@ -483,14 +483,14 @@ under the License.
         <field name="invoiceItemTypeId"><hidden/></field>
         <field name="description"><display/></field>
         <field name="defaultGlAccountId">
-            <hyperlink target="GlAccountNavigate" description="${defaultGlAccountId}">
+            <hyperlink description="${defaultGlAccountId}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId" from-field="defaultGlAccountId"/>
             </hyperlink>
         </field>
         <field name="overrideGlAccountId"><display/></field>
         <field name="activeGlDescription"><display/></field>
         <field name="remove" title=" " widget-style="buttontext" use-when="defaultAccount==false">
-            <hyperlink target="removeSalInvoiceItemTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeSalInvoiceItemTypeGlAssignment">
                 <parameter param-name="organizationPartyId"/><parameter param-name="invoiceItemTypeId"/>
             </hyperlink>
         </field>
@@ -537,14 +537,14 @@ under the License.
         <field name="invoiceItemTypeId"><hidden/></field>
         <field name="description"><display/></field>
         <field name="defaultGlAccountId">
-            <hyperlink target="GlAccountNavigate" description="${defaultGlAccountId}">
+            <hyperlink description="${defaultGlAccountId}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId" from-field="defaultGlAccountId"/>
             </hyperlink>
         </field>
         <field name="overrideGlAccountId" title="${uiLabelMap.AccountingInvoiceOverrideExpenseGlAccountId}"><display/></field>
         <field name="activeGlDescription"><display/></field>
         <field name="remove" title=" " widget-style="buttontext" use-when="defaultAccount==false">
-            <hyperlink target="removePurInvoiceItemTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removePurInvoiceItemTypeGlAssignment">
                 <parameter param-name="organizationPartyId"/><parameter param-name="invoiceItemTypeId"/>
             </hyperlink>
         </field>
@@ -593,7 +593,7 @@ under the License.
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field>
         <field name="organizationPartyId"><hidden/></field>
         <field name="remove" title=" " widget-style="buttontext">
-            <hyperlink target="removePaymentTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentTypeGlAssignment">
                 <parameter param-name="organizationPartyId"/><parameter param-name="paymentTypeId"/>
             </hyperlink>
         </field>
@@ -646,12 +646,12 @@ under the License.
         </field>
         <field name="organizationPartyId"><hidden/></field>
         <field name="defaultGlAccountId">
-            <hyperlink target="GlAccountNavigate" description="${defaultGlAccountId} : ${description}">
+            <hyperlink description="${defaultGlAccountId} : ${description}" target="GlAccountNavigate">
                 <parameter param-name="glAccountId" from-field="defaultGlAccountId"/>
             </hyperlink>
         </field>
         <field name="remove" title=" " widget-style="buttontext">
-            <hyperlink target="removePaymentMethodTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentMethodTypeGlAssignment">
                 <parameter param-name="organizationPartyId"/><parameter param-name="paymentMethodTypeId"/>
             </hyperlink>
         </field>
@@ -705,7 +705,7 @@ under the License.
           <display-entity entity-name="CustomTimePeriod" key-field-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName}: ${fromDate} - ${thruDate}"/>
         </field>
         <field name="close" title=" " widget-style="buttontext">
-            <hyperlink target="closeFinancialTimePeriod" description="${uiLabelMap.CommonClose}">
+            <hyperlink description="${uiLabelMap.CommonClose}" target="closeFinancialTimePeriod">
                 <parameter param-name="organizationPartyId"/><parameter param-name="customTimePeriodId"/>
             </hyperlink>
         </field>
@@ -755,12 +755,12 @@ under the License.
         <auto-fields-entity entity-name="GlJournal" default-field-type="display"/>
         <field name="organizationPartyId"><hidden/></field>
         <field name="glJournalId" widget-style="buttontext">
-            <hyperlink target="SetupGlJournals" description="${glJournalId}">
+            <hyperlink description="${glJournalId}" target="SetupGlJournals">
                 <parameter param-name="organizationPartyId"/><parameter param-name="glJournalId"/>
             </hyperlink>
         </field>
         <field name="remove" title=" " widget-style="buttontext">
-            <hyperlink target="deleteGlJournal" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteGlJournal">
                 <parameter param-name="organizationPartyId"/><parameter param-name="glJournalId"/>
             </hyperlink>
         </field>
@@ -780,7 +780,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductGlAccount" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="productId"/><parameter param-name="glAccountTypeId"/>
             </hyperlink>
         </field>
@@ -825,7 +825,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFinAccountTypeGlAccount" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteFinAccountTypeGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="finAccountTypeId"/>
             </hyperlink>
         </field>
@@ -865,7 +865,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteProductCategoryGlAccount" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductCategoryGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="productCategoryId"/><parameter param-name="glAccountTypeId"/>
             </hyperlink>
         </field>
@@ -910,7 +910,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteVarianceReasonGlAccount" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteVarianceReasonGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="varianceReasonId"/>
             </hyperlink>
         </field>
@@ -951,7 +951,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteCreditCardTypeGlAccount" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteCreditCardTypeGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="cardType"/>
             </hyperlink>
         </field>
@@ -963,7 +963,7 @@ under the License.
         <field name="organizationPartyId"><hidden/></field>
         <field name="cardType">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${enumCode}">
                     <entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/>
                     <entity-order-by field-name="enumId"/>
                 </entity-options>
@@ -1003,7 +1003,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteOrganizationTaxAuthorityGlAccount" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteOrganizationTaxAuthorityGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="taxAuthGeoId"/><parameter param-name="taxAuthPartyId"/>
             </hyperlink>
         </field>
@@ -1039,7 +1039,7 @@ under the License.
         <auto-fields-service service-name="updatePartyGlAccount" default-field-type="display"/>
         <field name="organizationPartyId"><hidden/></field>
         <field name="partyId">
-            <hyperlink target="/partymgr/control/viewprofile" description="${partyId}" target-type="inter-app">
+            <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -1052,7 +1052,7 @@ under the License.
             </drop-down>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deletePartyGlAccount" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyGlAccount">
                 <parameter param-name="organizationPartyId"/><parameter param-name="partyId"/><parameter param-name="glAccountId"/><parameter param-name="roleTypeId"/><parameter param-name="glAccountTypeId"/>
             </hyperlink>
         </field>
@@ -1131,7 +1131,7 @@ under the License.
             </service>
         </actions>
         <field name="glAccountCategoryId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${glAccountCategoryId}" target="EditGlAccountCategory">
+            <hyperlink description="${glAccountCategoryId}" target="EditGlAccountCategory" also-hidden="false">
                 <parameter param-name="glAccountCategoryId"/>
                 <parameter param-name="glAccountCategoryTypeId"/>
             </hyperlink>
@@ -1166,7 +1166,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink target="deleteGlAccountCategoryMember" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteGlAccountCategoryMember" also-hidden="false">
                 <parameter param-name="glAccountId" from-field="glAccountId"/>
                 <parameter param-name="glAccountCategoryId" from-field="glAccountCategoryId"/>
                 <parameter param-name="fromDate" from-field="fromDate"/>
@@ -1281,7 +1281,7 @@ under the License.
         <field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
         <field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteFixedAssetTypeGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetTypeGlAccount" also-hidden="false">
                 <parameter param-name="fixedAssetTypeId"/>
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="organizationPartyId"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sat Nov  5 14:14:04 2016
@@ -35,7 +35,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
         <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate">
+            <hyperlink description="${glAccountId}" target="GlAccountNavigate" also-hidden="false">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
@@ -79,7 +79,7 @@ under the License.
             <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
         </actions>
         <field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${accountCode}" target="GlAccountNavigate">
+            <hyperlink description="${accountCode}" target="GlAccountNavigate" also-hidden="false">
                 <parameter param-name="glAccountId"/>
             </hyperlink>
         </field>
@@ -160,7 +160,7 @@ under the License.
     <form name="ListAcctgTransEntries" type="list" list-name="entries"  default-entity-name="AcctgTransEntry"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="acctgTransId">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries">
+            <hyperlink description="${acctgTransId}" target="ListAcctgTransEntries" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
             </hyperlink>
         </field>
@@ -187,7 +187,7 @@ under the License.
     <form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="backToAdmin" title=" ">
-            <hyperlink also-hidden="false" description="${uiLabelMap.AccountingBackToAdmin}" target="AdminMain">
+            <hyperlink description="${uiLabelMap.AccountingBackToAdmin}" target="AdminMain" also-hidden="false">
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>
         </field>
@@ -196,7 +196,7 @@ under the License.
     <form name="ListGlReconciliations" type="list" list-name="glReconciliations" default-entity-name="GlReconciliation"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="glReconciliationId">
-           <hyperlink also-hidden="false" description="${glReconciliationId}" target="EditGlReconciliation">
+           <hyperlink description="${glReconciliationId}" target="EditGlReconciliation" also-hidden="false">
                 <parameter param-name="glReconciliationId"/>
                 <parameter param-name="organizationPartyId"/>
                 <parameter param-name="glAccountId"/>
@@ -221,7 +221,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="glReconciliationId"><display/></field>
         <field name="acctgTransId">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries">
+            <hyperlink description="${acctgTransId}" target="ListAcctgTransEntries" also-hidden="false">
                 <parameter param-name="acctgTransId"/>
             </hyperlink>
         </field>
@@ -244,7 +244,7 @@ under the License.
         <field name="rateDescription"><display/></field>
         <field name="periodTypeId"><display description="${periodDescription}"/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" sort-field="true">
-            <hyperlink target="/partymgr/control/viewprofile" description="${groupName}${lastName} ${firstName} ${middleName}" target-type="inter-app">
+            <hyperlink description="${groupName}${lastName} ${firstName} ${middleName}" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>