svn commit: r1686674 [2/9] - in /ofbiz/trunk: applications/accounting/widget/ applications/accounting/widget/ap/forms/ applications/accounting/widget/ar/forms/ applications/commonext/widget/ofbizsetup/ applications/content/widget/cms/ applications/cont...

[nmalin]

Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Sat Jun 20 21:58:05 2015
@@ -28,14 +28,14 @@ under the License.
         <field name="comments"><text-find ignore-case="true"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -95,7 +95,7 @@ under the License.
         <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" entry-name="attributeMap.statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -140,12 +140,12 @@ under the License.
         <field name="partyIdTo" position="2"><lookup target-form-name="LookupPartyName"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
-                <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/>
+                <list-options list-name="paymentTypes" key-name="paymentTypeId"/>
             </drop-down>
         </field>
         <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="2">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethod" description="${description}">
+                <entity-options entity-name="PaymentMethod">
                     <entity-constraint name="partyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -175,7 +175,7 @@ under the License.
         <field name="partyIdFrom" position="2"><lookup target-form-name="LookupPartyName"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="RECEIPT"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -183,7 +183,7 @@ under the License.
         </field>
         <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="2">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethod" description="${description}">
+                <entity-options entity-name="PaymentMethod">
                     <entity-constraint name="partyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -216,7 +216,7 @@ under the License.
         <field name="paymentId"><hidden/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="${groovy:isDisbursement==true?&quot;DISBURSEMENT&quot;:&quot;RECEIPT&quot;}"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -268,7 +268,7 @@ under the License.
         <field name="paymentApplicationId"><hidden/></field>
         <field name="paymentId"><hidden/></field>
         <field name="invoiceId">
-            <display-entity entity-name="Invoice" description="${description}">
+            <display-entity entity-name="Invoice">
                 <sub-hyperlink target="invoiceOverview" description="[${invoiceId}]">
                     <parameter param-name="invoiceId"/>
                 </sub-hyperlink>
@@ -527,7 +527,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="termTypeId">
-            <display-entity entity-name="TermType" description="${description}"/>
+            <display-entity entity-name="TermType"/>
         </field>
         <field name="dueDate"><display/></field>
         <field name="amount"><display/></field>
@@ -536,7 +536,7 @@ under the License.
     </form>
     <form name="FinAccountTransAssociatedWithPayment" type="single" default-map-name="finAccountTrans" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="finAccountTransId" position="1"><display/></field>
-        <field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType" description="${description}"/></field>
+        <field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType"/></field>
         <field name="amount" position="1"><display type="currency" currency="${payment.currencyUomId}"/></field>
         <field name="glReconciliationId" position="2">
             <hyperlink target="ViewGlReconciliationWithTransaction" description="${finAccountTrans.glReconciliationId}">
@@ -545,6 +545,6 @@ under the License.
             </hyperlink>
         </field>
         <field name="transactionDate" position="1"><display/></field>
-        <field name="statusId"  position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+        <field name="statusId"  position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
     </form>
 </forms>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Sat Jun 20 21:58:05 2015
@@ -25,7 +25,7 @@ under the License.
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentGatewayConfigType" description="${description}" key-field-name="paymentGatewayConfigTypeId">
+                <entity-options entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -53,7 +53,7 @@ under the License.
             <hyperlink description="${description}" target="EditPaymentGatewayConfig?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
         </field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
-            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId"/>
         </field>
     </form>
     
@@ -61,7 +61,7 @@ under the License.
         <field name="paymentGatewayConfigId"><hidden/></field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
-            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
             <submit button-type="button"/>
@@ -439,7 +439,7 @@ under the License.
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
         <field name="parentTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentGatewayConfigType" description="${description}" key-field-name="paymentGatewayConfigTypeId">
+                <entity-options entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId">
                     <entity-constraint name="paymentGatewayConfigTypeId" operator="not-equals" env-name="paymentGatewayConfigTypeId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Sat Jun 20 21:58:05 2015
@@ -84,11 +84,11 @@ under the License.
         <field use-when="paymentGroup==null @and paymentGroupId!=null" name="paymentGroupId"><display description="${uiLabelMap.CommonCannotBeFound}: [${paymentGroupId}]" also-hidden="false"/></field>
         <field name="paymentGroupId" use-when="display==true"><display/></field>
         <field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}">
-            <display-entity entity-name="PaymentGroupType" description="${description}"/>
+            <display-entity entity-name="PaymentGroupType"/>
         </field>
         <field name="paymentGroupTypeId" use-when="paymentGroup==null" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentGroupType" description="${description}">
+                <entity-options entity-name="PaymentGroupType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -138,12 +138,12 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType" description="${description}"/></field>
+        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType"/></field>
         <field name="paymentMethodTypeId" use-when="cardType!=null">
             <display-entity entity-name="PaymentMethodType" description="${description} (${cardType})"/>
         </field>
         <field name="paymentMethodTypeId" use-when="cardType==null">
-            <display-entity entity-name="PaymentMethodType" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType"/>
         </field>
         <field name="amount"><display currency="${payment.currencyUomId}" type="currency"/></field>
         <field name="fromDate"><display/></field>
@@ -194,7 +194,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType" description="${description}"/></field>
+        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType"/></field>
         <field name="statusId" title="${uiLabelMap.AccountingPaymentStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="amount"><display also-hidden="false" type="currency" currency="${payment.currencyUomId}"/></field>
         <field name="fromDate"><display/></field>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sat Jun 20 21:58:05 2015
@@ -82,14 +82,14 @@ under the License.
     <form name="TransactionSelectionForm" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="selectedMonth" title="${uiLabelMap.CommonMonth}">
             <drop-down allow-empty="true">
-                <list-options list-name="monthList" key-name="value" description="${description}"/>
+                <list-options list-name="monthList" key-name="value"/>
             </drop-down>
         </field>
         <field name="fromDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="thruDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -138,14 +138,14 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true" position="2"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId" position="1">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="period2GlFiscalTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -159,7 +159,7 @@ under the License.
         <field name="period1ThruDate" title="${uiLabelMap.FormFieldTitle_period1ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -168,7 +168,7 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period2GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -218,7 +218,7 @@ under the License.
         <field name="thruDate"><date-time default-value="${nowTimestamp}"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -273,14 +273,14 @@ under the License.
         <field name="period2ThruDate" position="2"><date-time/></field>
         <field name="period1GlFiscalTypeId" position="1">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="period2GlFiscalTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -294,7 +294,7 @@ under the License.
         <field name="period1ThruDate"><date-time/></field>
         <field name="period1GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -302,7 +302,7 @@ under the License.
         <field name="period2ThruDate"><date-time/></field>
         <field name="period2GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -360,7 +360,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -375,7 +375,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -559,14 +559,14 @@ under the License.
     <form name="CashFlowStatementParameters" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="selectedMonth" title="${uiLabelMap.CommonMonth}">
             <drop-down allow-empty="true">
-                <list-options list-name="monthList" key-name="value" description="${description}"/>
+                <list-options list-name="monthList" key-name="value"/>
             </drop-down>
         </field>
         <field name="fromDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="thruDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -625,7 +625,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -640,14 +640,14 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true" position="2"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId" position="1">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="period2GlFiscalTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -710,7 +710,7 @@ under the License.
         <field name="period1ThruDate" title="${uiLabelMap.FormFieldTitle_period1ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -719,7 +719,7 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period2GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sat Jun 20 21:58:05 2015
@@ -86,7 +86,7 @@ under the License.
         <field name="taxAuthPartyId"><hidden/></field>
         <field name="taxAuthGeoId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategory}">
-            <display-entity entity-name="ProductCategory" description="${description}">
+            <display-entity entity-name="ProductCategory">
                 <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="productCategoryId"/>
                 </sub-hyperlink>
@@ -138,7 +138,7 @@ under the License.
 
         <field name="taxAuthorityAssocTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="TaxAuthorityAssocType" description="${description}">
+                <entity-options entity-name="TaxAuthorityAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -165,7 +165,7 @@ under the License.
 
         <field name="taxAuthorityAssocTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="TaxAuthorityAssocType" description="${description}">
+                <entity-options entity-name="TaxAuthorityAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -241,7 +241,7 @@ under the License.
 
         <field name="taxAuthorityRateTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TaxAuthorityRateType" description="${description}">
+                <entity-options entity-name="TaxAuthorityRateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -283,7 +283,7 @@ under the License.
 
         <field name="taxAuthorityRateTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TaxAuthorityRateType" description="${description}">
+                <entity-options entity-name="TaxAuthorityRateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Sat Jun 20 21:58:05 2015
@@ -27,7 +27,7 @@ under the License.
         </field>
         <field name="paymentServiceTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PRDS_PAYSVC"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -38,14 +38,14 @@ under the License.
         </field>
         <field name="paymentMethodTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId">
+                <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="transCodeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PGT_CODE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -83,13 +83,13 @@ under the License.
             </hyperlink>
         </field>
         <field name="paymentServiceTypeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="paymentMethodTypeId">
-            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
         </field>
         <field name="transCodeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
     </form>
     
@@ -139,13 +139,13 @@ under the License.
         <field name="submitButton" use-when="paymentGatewayResponse!=null&amp;&amp;paymentGatewayResponse.getString(&quot;gatewayFlag&quot;).equals(&quot;A&quot;)" title="${uiLabelMap.AccountingCapture}" widget-style="smallSubmit"><submit button-type="button"/></field>
         -->
         <field name="paymentServiceTypeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="paymentMethodTypeId">
-            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
         </field>
         <field name="transCodeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
     </form>
     
@@ -156,7 +156,7 @@ under the License.
         <field name="orderPaymentPreferenceId"><text/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}"/>
+                <entity-options entity-name="PaymentMethodType"/>
             </drop-down>
         </field>
         <field name="overrideAmount" title="${uiLabelMap.AccountingAmount}"><text/></field>
@@ -170,12 +170,12 @@ under the License.
         <field name="orderPaymentPreferenceId"><text/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}"/>
+                <entity-options entity-name="PaymentMethodType"/>
             </drop-down>
         </field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="RECEIPT"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Sat Jun 20 21:58:05 2015
@@ -69,7 +69,7 @@ under the License.
         <field name="parentTypeId"><hidden value="PURCHASE_INVOICE"/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceType" description="${description}">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/>
                 </entity-options>
             </drop-down>
@@ -83,7 +83,7 @@ under the License.
         <field name="partyIdFrom" title="${uiLabelMap.AccountingVendorParty}" position="1"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -95,7 +95,7 @@ under the License.
         <field name="thruDueDate" position="2"><date-time/></field>
         <field name="invoiceTypeId" position="1">
             <drop-down allow-empty="false">
-                <entity-options entity-name="InvoiceType" description="${description}">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml Sat Jun 20 21:58:05 2015
@@ -26,14 +26,14 @@ under the License.
         <field position="1" name="invoiceId"><text-find/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true" no-current-selected-key="PURCHASE_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId">
+                <entity-options entity-name="InvoiceType" key-field-name="invoiceTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="PURCHASE_INVOICE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="INVOICE_SENT"/>
                 </entity-options>
@@ -54,7 +54,7 @@ under the License.
         <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
         <field name="paymentTypeId">
             <drop-down allow-empty="true" no-current-selected-key="VENDOR_PAYMENT">
-                <entity-options description="${description}" entity-name="PaymentType" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="DISBURSEMENT"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Sat Jun 20 21:58:05 2015
@@ -73,7 +73,7 @@ under the License.
         <field name="parentTypeId"><hidden value="DISBURSEMENT"/></field>
         <field name="paymentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentType" description="${description}">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="DISBURSEMENT"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Sat Jun 20 21:58:05 2015
@@ -28,7 +28,7 @@ under the License.
         </actions>
         <field name="paymentMethodTypeId" title="${uiLabelMap.FormFieldTitle_paymentMethodTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentMethodType" description="${description}">
+                <entity-options entity-name="PaymentMethodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -57,7 +57,7 @@ under the License.
         <field name="parentTypeId"><hidden value="RECEIPT"/></field>
         <field name="paymentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentType" description="${description}">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="RECEIPT"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Sat Jun 20 21:58:05 2015
@@ -70,7 +70,7 @@ under the License.
         <field name="parentTypeId"><hidden value="SALES_INVOICE"/></field>
         <field name="invoiceTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceType" description="${description}">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="SALES_INVOICE"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml Sat Jun 20 21:58:05 2015
@@ -26,14 +26,14 @@ under the License.
         <field position="1" name="invoiceId"><text-find/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true" no-current-selected-key="SALES_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId">
+                <entity-options entity-name="InvoiceType" key-field-name="invoiceTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="SALES_INVOICE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="INVOICE_RECEIVED"/>
                 </entity-options>
@@ -54,7 +54,7 @@ under the License.
         <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
         <field name="paymentTypeId">
             <drop-down allow-empty="true" no-current-selected-key="CUSTOMER_PAYMENT">
-                <entity-options description="${description}" entity-name="PaymentType" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="RECEIPT"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Sat Jun 20 21:58:05 2015
@@ -79,8 +79,8 @@
     <form name="ViewOrganization" type="single" default-map-name="lookupGroup">
         <field name="partyId" title="${uiLabelMap.SetupOrganizationPartyId}"><display/></field>
         <field name="groupName" title="${uiLabelMap.SetupOrganizationName}"><display/></field>
-        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
     </form>
     
     <form name="EditFacility" type="single" target="UpdateFacility" default-map-name="facility"

Modified: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSForms.xml Sat Jun 20 21:58:05 2015
@@ -108,22 +108,22 @@ under the License.
         <field name="textData" id-name="textData"><textarea rows="20" cols="60"/></field>
         <field name="statusId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="statusList" key-name="statusId" description="${description}"/>
+                <list-options list-name="statusList" key-name="statusId"/>
             </drop-down>
         </field>
         <field name="privilegeEnumId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="privilegeList" key-name="enumId" description="${description}"/>
+                <list-options list-name="privilegeList" key-name="enumId"/>
             </drop-down>
         </field>
         <field name="section" >
             <drop-down no-current-selected-key="${targetSection}" allow-empty="true">
-                <list-options list-name="sectionList" key-name="contentId" description="${description}"/>
+                <list-options list-name="sectionList" key-name="contentId"/>
             </drop-down>
         </field>
         <field name="topic" position="1">
             <drop-down  no-current-selected-key="${targetTopic}" allow-empty="true">
-                <list-options list-name="topicList" key-name="contentId" description="${description}"/>
+                <list-options list-name="topicList" key-name="contentId"/>
             </drop-down>
         </field>
         <!--
@@ -199,27 +199,24 @@ under the License.
         <auto-fields-service service-name="createContentPurposeOperation"/>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
+                <entity-options entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
             </drop-down>
         </field>
         <field name="contentOperationId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="ContentOperation" key-field-name="contentOperationId"/>
+                <entity-options entity-name="ContentOperation" key-field-name="contentOperationId"/>
             </drop-down>
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
-                <entity-options description="${description}"
-                    entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
-                <entity-options description="${description}"
+                <entity-options
                     entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
                 </entity-options>
@@ -228,8 +225,7 @@ under the License.
         <field name="privilegeEnumId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
-                <entity-options description="${description}"
-                    entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="SUBSCRIPTION_TYPE"/>
                 </entity-options>
             </drop-down>
@@ -416,12 +412,12 @@ under the License.
         <field name="caContentAssocTypeId" position="1"
             use-when="&quot;${caContentAssocTypeId}&quot;.length()==0" >
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/>
+                <entity-options entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/>
             </drop-down>
         </field>
         <field name="caContentAssocPredicateId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
+                <entity-options entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
             </drop-down>
         </field>
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" widget-style="buttontext" position="1" use-when="&quot;${caFromDate}&quot;.length()>0">
@@ -454,7 +450,7 @@ under the License.
         </field>
         <field name="contentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId"/>
             </drop-down>
         </field>
         <field name="ownerContentId" position="2">
@@ -475,7 +471,7 @@ under the License.
         </field>
         <field name="characterSetId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="localeString" position="3">
@@ -483,7 +479,7 @@ under the License.
         </field>
         <field name="statusId" position="1">
             <drop-down allow-empty="true" >
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -491,7 +487,7 @@ under the License.
         </field>
         <field name="privilegeEnumId" position="2">
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="privilegeList" key-name="enumId" description="${description}"/>
+                <list-options list-name="privilegeList" key-name="enumId"/>
             </drop-down>
         </field>
 
@@ -515,7 +511,7 @@ under the License.
         </field>
         <field name="drDataResourceTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}" position="2">
@@ -523,7 +519,7 @@ under the License.
         </field>
         <field name="drDataTemplateTypeId" position="3">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="drMimeTypeId" position="1">
@@ -535,7 +531,7 @@ under the License.
         </field>
         <field name="drCharacterSetId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="drLocaleString" position="3">

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Jun 20 21:58:05 2015
@@ -127,7 +127,7 @@ under the License.
         <field name="contentRevisionSeqId" widget-style="inputBox"><text/></field>
 <!--         <field name="contentRevisionSeqId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="" key-field-name="contentRevisionSeqId"/>
+                <entity-options entity-name="" key-field-name="contentRevisionSeqId"/>
             </drop-down>
         </field>
 -->
@@ -231,7 +231,7 @@ under the License.
         <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <!-- <entity-constraint name="parentTypeId" value=""/> -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -258,7 +258,7 @@ under the License.
         <field name="partyId" map-name="empty" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <!-- <entity-constraint name="parentTypeId" value=""/> -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -280,7 +280,7 @@ under the License.
         <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <!-- <entity-constraint name="parentTypeId" value=""/> -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -315,7 +315,7 @@ under the License.
         <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -393,7 +393,7 @@ under the License.
             <display description="Survey Response"/>
         </field>
         <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; !&quot;SURVEY&quot;.equals(templateDataResourceTypeId)">
-            <display-entity entity-name="MimeType" description="${description}"/>
+            <display-entity entity-name="MimeType"/>
         </field>
         <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;TEMPLATE&quot;.equals(contentTypeId)" widget-style="smallSelect">
             <drop-down allow-empty="false">
@@ -443,7 +443,7 @@ under the License.
         </field>
         <field name="mimeTypeId" map-name="dataResource"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; mimeTypeId!=null &amp;&amp; !&quot;application/vnd.ofbiz.survey&quot;.equals(mimeTypeId)">
-            <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
+            <display-entity entity-name="MimeType" key-field-name="mimeTypeId"/>
         </field>
         <field name="mimeTypeId" map-name="dataResource"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; mimeTypeId!=null &amp;&amp; &quot;application/vnd.ofbiz.survey&quot;.equals(mimeTypeId)">
@@ -507,7 +507,7 @@ under the License.
         <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
 
        <field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}" >
-            <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
+            <display-entity entity-name="MimeType" key-field-name="mimeTypeId"/>
         </field>
         <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&amp;&amp;&quot;SURVEY&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">
             <display/>

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Jun 20 21:58:05 2015
@@ -30,14 +30,14 @@ under the License.
         <field name="description"><text-find ignore-case="true"/></field>
         <field name="contentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId">
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="mimeTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId">
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -50,7 +50,7 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -146,7 +146,7 @@ under the License.
         <field use-when="currentValue==null&amp;&amp;contentId!=null" name="contentId"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId">
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -201,7 +201,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="statusId" use-when="currentValue==null"><ignored/></field>
@@ -254,14 +254,14 @@ under the License.
         </field>
         <field name="contentAssocTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentAssocType">
+                <entity-options entity-name="ContentAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="metaDataPredicateId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate"/>
+                <entity-options entity-name="MetaDataPredicate"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
@@ -288,7 +288,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field>
+        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"></display-entity></field>
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -319,7 +319,7 @@ under the License.
             </display-entity>
         </field>
         <field name="contentIdTo"><hidden/></field>
-        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field>
+        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"></display-entity></field>
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -346,7 +346,7 @@ under the License.
         <field name="partyId" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -390,7 +390,7 @@ under the License.
         <field name="contentId" title=" " widget-style="buttontext" ><lookup target-form-name="LookupContent"/></field>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId">
+                <entity-options entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -450,7 +450,7 @@ under the License.
         </field>
         <field name="metaDataPredicateId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
+                <entity-options entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -464,7 +464,7 @@ under the License.
         </field>
         <field name="siteName" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
         <field name="httpHost" sort-field="true"><display/></field>
-        <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType" description="${description}"/></field>
+        <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType"/></field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
     </form>
@@ -515,7 +515,7 @@ under the License.
         </field>
         <field name="workEffortContentTypeId">
             <drop-down no-current-selected-key="">
-                <entity-options entity-name="WorkEffortContentType" description="${description}" key-field-name="workEffortContentTypeId">
+                <entity-options entity-name="WorkEffortContentType" key-field-name="workEffortContentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -538,7 +538,7 @@ under the License.
             </display-entity>
         </field>
         <field name="contentId"><hidden/></field>
-        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
+        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
         <field name="fromDate"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -559,13 +559,13 @@ under the License.
             <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank"/>
         </field>
         <field name="contentTypeId">
-            <display-entity entity-name="ContentType" key-field-name="contentTypeId" description="${description}"/>
+            <display-entity entity-name="ContentType" key-field-name="contentTypeId"/>
         </field>
         <field name="mimeTypeId">
-            <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
+            <display-entity entity-name="MimeType" key-field-name="mimeTypeId"/>
         </field>
         <field name="statusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="caCreatedDate"><display/></field>
         <field name="delete" title="${uiLabelMap.CommonDelete}">
@@ -589,7 +589,7 @@ under the License.
         <field name="contentName"><text/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentType">
+                <entity-options entity-name="ContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -604,7 +604,7 @@ under the License.
         <field name="leftCoordinate"><text/></field>
         <field name="metaDataPredicateId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate"/>
+                <entity-options entity-name="MetaDataPredicate"/>
             </drop-down>
         </field>
         <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sat Jun 20 21:58:05 2015
@@ -28,7 +28,7 @@ under the License.
         <field name="dataResourceName"><text-find ignore-case="true"/></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId">
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -42,7 +42,7 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -88,9 +88,9 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="dataResourceTypeId" sort-field="true"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
-        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType" description="${description}"></display-entity></field>
-        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+        <field name="dataResourceTypeId" sort-field="true"><display-entity entity-name="DataResourceType"></display-entity></field>
+        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType"></display-entity></field>
+        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem"></display-entity></field>
         <field name="localeString" sort-field="true"><display-entity entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
         <field name="createdByUserLogin" sort-field="true"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
         <field name="dataCategoryId" sort-field="true"><display-entity entity-name="DataCategory" description="${categoryName}[${dataCategoryId}]"></display-entity></field>
@@ -167,14 +167,14 @@ under the License.
         <field use-when="currentValue==null&amp;&amp;dataResourceId!=null" name="dataResourceId"><display description="${uiLabelMap.CommonCannotBeFound}: [${dataResourceId}]" also-hidden="false"/></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId">
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="dataTemplateTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId">
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -205,7 +205,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
 
@@ -241,17 +241,17 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="dataTemplateTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -274,7 +274,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="createdDate"><display/></field>
@@ -390,7 +390,7 @@ under the License.
         <field name="partyId" title=" "><lookup target-form-name="LookupPerson"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -449,14 +449,14 @@ under the License.
         <auto-fields-entity entity-name="ProductFeature" default-field-type="find"/>
         <field name="productFeatureTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureType">
+                <entity-options entity-name="ProductFeatureType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="productFeatureCategoryId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureCategory">
+                <entity-options entity-name="ProductFeatureCategory">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml Sat Jun 20 21:58:05 2015
@@ -53,8 +53,7 @@ under the License.
         <auto-fields-service service-name="createContentTypeAttr"/>
         <field entity-name="ContentType" name="contentTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="ContentType" key-field-name="contentTypeId"/>
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
@@ -194,20 +193,18 @@ under the License.
         <auto-fields-service service-name="createContentPurposeOperation"/>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}"
+                <entity-options
                     entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
             </drop-down>
         </field>
         <field name="contentOperationId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}"
-                    entity-name="ContentOperation" key-field-name="contentOperationId"/>
+                <entity-options entity-name="ContentOperation" key-field-name="contentOperationId"/>
             </drop-down>
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}"
-                    entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">

Modified: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml Sat Jun 20 21:58:05 2015
@@ -53,8 +53,7 @@ under the License.
         <auto-fields-service service-name="createDataResourceTypeAttr"/>
         <field entity-name="DataResource" name="dataResourceTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
@@ -153,7 +152,7 @@ under the License.
         <auto-fields-service service-name="createFileExtension"/>
         <field name="mimeTypeId" title=" ">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
+                <entity-options
                     entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
@@ -172,8 +171,7 @@ under the License.
         </field>
         <field name="mimeTypeId" title=" ">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
@@ -246,7 +244,7 @@ under the License.
         <auto-fields-service service-name="createMimeTypeHtmlTemplate"/>
         <field name="mimeTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sat Jun 20 21:58:05 2015
@@ -86,7 +86,7 @@ under the License.
         <auto-fields-entity entity-name="ContentPurpose" default-field-type="edit"/>
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
-        <field name="contentPurposeTypeId"><display-entity entity-name="ContentPurposeType" description="${description}"/></field>
+        <field name="contentPurposeTypeId"><display-entity entity-name="ContentPurposeType"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="AddForumGroupPurpose" type="single" target="createForumGroupPurpose" title=""
@@ -96,7 +96,7 @@ under the License.
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentPurposeTypeId">
             <drop-down>
-                <entity-options entity-name="ContentPurposeType" description="${description}"></entity-options>
+                <entity-options entity-name="ContentPurposeType"></entity-options>
             </drop-down></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -107,7 +107,7 @@ under the License.
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="partyId"><display-entity entity-name="PartyNameView" description="${groupName}${firstName} ${lastName}"/></field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate"><display/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="deleteForumGroupRole">
@@ -129,7 +129,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}"></entity-options>
+                <entity-options entity-name="RoleType"></entity-options>
             </drop-down></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>

Modified: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml Sat Jun 20 21:58:05 2015
@@ -427,8 +427,7 @@ under the License.
         </field>
         <field name="drDataTemplateTypeId" >
             <drop-down no-current-selected-key="NONE">
-                <entity-options description="${description}"
-                    entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="drMimeTypeId">

Modified: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml Sat Jun 20 21:58:05 2015
@@ -178,7 +178,7 @@ under the License.
         <field name="surveyQuestionSeqId" title="${uiLabelMap.ContentSurveyQuestionNumber}"><display/></field>
         <field name="surveyQuestionTypeId">
             <drop-down allow-empty="false">
-               <entity-options entity-name="SurveyQuestionType" description="${description}"/>
+               <entity-options entity-name="SurveyQuestionType"/>
             </drop-down>
         </field>
 
@@ -196,12 +196,12 @@ under the License.
         <field name="surveyQuestionSeqId"><ignored/></field>
         <field name="surveyQuestionCategoryId">
             <drop-down allow-empty="false">
-               <entity-options entity-name="SurveyQuestionCategory" description="${description}"/>
+               <entity-options entity-name="SurveyQuestionCategory"/>
             </drop-down>
         </field>
         <field name="surveyQuestionTypeId">
             <drop-down allow-empty="false">
-               <entity-options entity-name="SurveyQuestionType" description="${description}"/>
+               <entity-options entity-name="SurveyQuestionType"/>
             </drop-down>
         </field>
 

Modified: ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml Sat Jun 20 21:58:05 2015
@@ -61,7 +61,7 @@ under the License.
         </field>
         <field use-when="webAnalyticsConfig==null&amp;&amp;webAnalyticsTypeId==null" name="webAnalyticsTypeId" title="${uiLabelMap.CatalogWebAnalyticsType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="WebAnalyticsType" description="${description}">
+                <entity-options entity-name="WebAnalyticsType">
                     <entity-order-by field-name="webAnalyticsTypeId"/>
                 </entity-options>
             </drop-down>