You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/06/20 23:58:07 UTC
svn commit: r1686674 [4/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...
Modified: ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Sat Jun 20 21:58:05 2015
@@ -31,7 +31,7 @@ under the License.
<field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text/></field>
<field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
+ <entity-options entity-name="ContactListType" key-field-name="contactListTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -49,7 +49,7 @@ under the License.
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
<drop-down no-current-selected-key="EMAIL_ADDRESS">
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -88,14 +88,14 @@ under the License.
<field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
<field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
+ <entity-options entity-name="ContactListType" key-field-name="contactListTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -155,7 +155,7 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down no-current-selected-key="CLPT_ACCEPTED">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -182,7 +182,7 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -252,7 +252,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="PartyType" description="${description}">
+ <entity-options entity-name="PartyType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -260,7 +260,7 @@ under the License.
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down>
<option key="" description="${uiLabelMap.CommonAnyRoleType}"/>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -336,7 +336,7 @@ under the License.
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
<field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false" no-current-selected-key="COM_PENDING">
- <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="COM_EVENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -353,30 +353,30 @@ under the License.
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null">
<drop-down>
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType!=null">
<drop-down>
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType==null">
<drop-down>
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
<field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}" use-when="commEventRoleTypeIdFrom!=null">
<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>
</field>
<field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}" use-when="commEventRoleTypeIdTo!=null">
<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>
@@ -441,7 +441,7 @@ under the License.
<field name="commEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
</entity-options>
</drop-down>
@@ -473,10 +473,10 @@ under the License.
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
<display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
</field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+ <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="custReqestId" position="1"><display/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
@@ -489,14 +489,14 @@ under the License.
<field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
<field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
+ <entity-options entity-name="ContactListType" key-field-name="contactListTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -537,19 +537,19 @@ under the License.
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
</entity-options>
</drop-down>
</field>
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
<field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}">
<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="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field>
@@ -577,10 +577,10 @@ under the License.
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
<display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
</field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+ <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="custReqestId" position="1"><text size="20"/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
@@ -618,7 +618,7 @@ under the License.
</field>
<field name="contactMechId" title="${uiLabelMap.CommonEmailTo}"><display-entity entity-name="ContactMech" description="${infoString}"/></field>
<field name="lastUpdatedStamp" title="${uiLabelMap.FormFieldTitle_lastModifiedDate}"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
</form>
<form name="CreateWebSiteContactList" type="single" target="createWebSiteContactList"
default-map-name="contactList" title="" header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml Sat Jun 20 21:58:05 2015
@@ -30,7 +30,7 @@ under the License.
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="DataSourceType" key-field-name="dataSourceTypeId">
+ <entity-options entity-name="DataSourceType" key-field-name="dataSourceTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -112,7 +112,7 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="DataSourceType" key-field-name="dataSourceTypeId">
+ <entity-options entity-name="DataSourceType" key-field-name="dataSourceTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml Sat Jun 20 21:58:05 2015
@@ -42,7 +42,7 @@ under the License.
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="MKTG_CAMP_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -75,7 +75,7 @@ under the License.
</field>
<field name="campaignName" title="${uiLabelMap.MarketingCampaignName}"><display/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" description="${description}" also-hidden="true"/>
+ <display-entity entity-name="StatusItem" also-hidden="true"/>
</field>
<field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}"><display/></field>
</form>
@@ -107,7 +107,7 @@ under the License.
</field>
-->
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
- <display-entity entity-name="RoleType" description="${description}" also-hidden="true"/>
+ <display-entity entity-name="RoleType" also-hidden="true"/>
<!--<sub-hyperlink target="/partymgr/control/viewProfile" description="${partyId}" link-style="buttontext">
<parameter param-name="partyId"/>
</sub-hyperlink>
@@ -133,7 +133,7 @@ under the License.
</field>
<field name="roleTypeId">
<drop-down>
- <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
</entity-options>
</drop-down>
</field>
Modified: ofbiz/trunk/applications/marketing/widget/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ReportForms.xml Sat Jun 20 21:58:05 2015
@@ -82,7 +82,7 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
</entity-options>
</drop-down>
@@ -90,7 +90,7 @@ under the License.
<field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_ROL_STATUS"/>
</entity-options>
</drop-down>
@@ -121,7 +121,7 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
</entity-options>
</drop-down>
@@ -161,11 +161,11 @@ under the License.
<field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field>
<field name="communicationEventTypeId" title="${uiLabelMap.MarketingContactListCommEventTypeId}"><display description="${communicationEventType.description}"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" description="${description}"/>
+ <display-entity entity-name="StatusItem"/>
</field>
<field name="partyIdTo" title="${uiLabelMap.FormFieldTitle_toPartyId}"><display/></field>
<field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.FormFieldTitle_fromPartyId}"><display/></field>
<field name="entryDate" title="${uiLabelMap.PartyEnteredDate}"><display/></field>
Modified: ofbiz/trunk/applications/marketing/widget/SegmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentForms.xml Sat Jun 20 21:58:05 2015
@@ -37,7 +37,7 @@ under the License.
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
- <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType" description="${description}"/></field>
+ <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType"/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
@@ -57,7 +57,7 @@ under the License.
<field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId">
+ <entity-options entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -140,7 +140,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId">
<drop-down>
- <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>
Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml Sat Jun 20 21:58:05 2015
@@ -32,7 +32,7 @@ under the License.
<field name="comments" title="${uiLabelMap.MarketingTrackingCodeComments}"><textarea/></field>
<field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+ <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -102,7 +102,7 @@ under the License.
<field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display/></field>
<field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+ <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -123,7 +123,7 @@ under the License.
<field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field>
<field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+ <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -145,7 +145,7 @@ under the License.
<field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field>
<field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field>
- <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType" description="${description}"/></field>
+ <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
<field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"><display/></field>
</form>
@@ -158,7 +158,7 @@ under the License.
<field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
<drop-down>
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/>
</entity-options>
</drop-down>
@@ -173,7 +173,7 @@ under the License.
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
<field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
<drop-down>
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/>
</entity-options>
</drop-down>
@@ -209,7 +209,7 @@ under the License.
<field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><text-find/></field>
<field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
<drop-down>
- <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+ <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -276,8 +276,8 @@ under the License.
<field name="visitorId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitorId}">
<display-entity description="${partyId} ${userLoginId} [${visitorId}]" entity-name="Visitor" key-field-name="visitorId"/>
</field>
- <field name="contactMechTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="roleTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitRoleTypeId}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="contactMechTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+ <field name="roleTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitRoleTypeId}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="userLoginId" title="${uiLabelMap.MarketingTrackingCodeVisitUserLoginId}"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Sat Jun 20 21:58:05 2015
@@ -76,7 +76,7 @@ under the License.
<field name="contactMechTypeId" event="onchange" action="javascript:ajaxUpdateAreas('contactMechContainer,ContactMechTypeOnly,contactMechTypeId=' + this.value);">
<drop-down>
<option key="" description="${uiLabelMap.CommonNone}"/>
- <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId" description="${description}"/>
+ <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
<field name="contactMechContainer" id-name="contactMechContainer" title=" "><container/></field>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Sat Jun 20 21:58:05 2015
@@ -138,7 +138,7 @@ under the License.
<field name="contactListTitle" title="${uiLabelMap.MarketingContactList}" title-area-style="group-label"><display/></field>
<field name="contactListId" title="${uiLabelMap.MarketingContactList}">
<drop-down allow-empty="true">
- <entity-options entity-name="ContactList" description="${description}" key-field-name="contactListId"/>
+ <entity-options entity-name="ContactList" key-field-name="contactListId"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Jun 20 21:58:05 2015
@@ -69,7 +69,7 @@ under the License.
<field name="contactListTitle" title="${uiLabelMap.MarketingContactList}" title-area-style="group-label"><display/></field>
<field name="contactListId" title="${uiLabelMap.MarketingContactList}">
<drop-down allow-empty="true">
- <entity-options entity-name="ContactList" description="${description}" key-field-name="contactListId"/>
+ <entity-options entity-name="ContactList" key-field-name="contactListId"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sat Jun 20 21:58:05 2015
@@ -28,14 +28,14 @@ under the License.
<field name="partyId" title="${uiLabelMap.SfaLead}"><lookup target-form-name="LookupLeads"/></field>
<field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SalesOpportunityStage">
+ <entity-options entity-name="SalesOpportunityStage">
<entity-order-by field-name="sequenceNum"/>
</entity-options>
</drop-down>
</field>
<field name="typeEnumId" title="${uiLabelMap.SfaType}">
<drop-down allow-empty="true">
- <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration">
+ <entity-options key-field-name="enumId" entity-name="Enumeration">
<entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -73,7 +73,7 @@ under the License.
<parameter param-name="salesOpportunityId"/>
</hyperlink>
</field>
- <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display-entity entity-name="SalesOpportunityStage" description="${description}"/></field>
+ <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display-entity entity-name="SalesOpportunityStage"/></field>
<field name="partyId" title="${uiLabelMap.SfaLead}">
<display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${middleName} ${groupName}" key-field-name="partyId">
<sub-hyperlink target="viewprofile" description=" [${partyId}]">
@@ -122,14 +122,14 @@ under the License.
<field name="estimatedCloseDate" position="2" title="${uiLabelMap.SfaCloseDate}" widget-style="required"><date-time/></field>
<field name="opportunityStageId" position="1" title="${uiLabelMap.SfaInitialStage}" widget-style="required">
<drop-down>
- <entity-options description="${description}" entity-name="SalesOpportunityStage">
+ <entity-options entity-name="SalesOpportunityStage">
<entity-order-by field-name="sequenceNum"/>
</entity-options>
</drop-down>
</field>
<field name="typeEnumId" position="2" title="${uiLabelMap.SfaType}">
<drop-down allow-empty="true">
- <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration">
+ <entity-options key-field-name="enumId" entity-name="Enumeration">
<entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -137,7 +137,7 @@ under the License.
</field>
<field name="dataSourceId" use-when="communicationEvent==null" position="1" title="${uiLabelMap.SfaDataSourceLabel}">
<drop-down allow-empty="true">
- <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource">
+ <entity-options key-field-name="dataSourceId" entity-name="DataSource">
<entity-constraint name="dataSourceTypeId" operator="equals" value="LEAD_SOURCE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -145,7 +145,7 @@ under the License.
</field>
<field name="dataSourceId" use-when="communicationEvent!=null" position="1" title="${uiLabelMap.SfaDataSourceLabel}">
<drop-down allow-empty="false" no-current-selected-key="EMAIL">
- <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource">
+ <entity-options key-field-name="dataSourceId" entity-name="DataSource">
<entity-constraint name="dataSourceTypeId" operator="equals" value="LEAD_SOURCE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -170,7 +170,7 @@ under the License.
<field name="nextStepDate" position="1" title="${uiLabelMap.SfaNextStepDate}"><display/></field>
<field name="estimatedCloseDate" position="2" title="${uiLabelMap.SfaCloseDate}"><display/></field>
<field name="opportunityStageId" position="1" title="${uiLabelMap.SfaInitialStage}">
- <display-entity entity-name="SalesOpportunityStage" description="${description}"/>
+ <display-entity entity-name="SalesOpportunityStage"/>
</field>
<field name="typeEnumId" position="2" title="${uiLabelMap.SfaType}"><display/></field>
<field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"><display/></field>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Jun 20 21:58:05 2015
@@ -25,12 +25,12 @@ under the License.
<auto-fields-entity entity-name="CustRequest" default-field-type="find"/>
<field name="custRequestTypeId" position="2">
<drop-down allow-empty="true" allow-multiple="true">
- <entity-options description="${description}" entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
+ <entity-options entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
</drop-down>
</field>
<field name="statusId">
<drop-down allow-empty="true" allow-multiple="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -38,7 +38,7 @@ under the License.
</field>
<field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" position="2">
<drop-down allow-empty="true" allow-multiple="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" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -204,7 +204,7 @@ under the License.
<auto-fields-entity entity-name="CustRequestStatus" default-field-type="display"/>
<field name="custRequestId"><hidden/></field>
<field name="custRequestStatusId"><hidden/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
</form>
<form name="ViewRequestRoles" type="list"
@@ -217,8 +217,8 @@ under the License.
</actions>
<auto-fields-entity entity-name="CustRequestParty" default-field-type="display"/>
<field name="custRequestId"><hidden/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="fromDate"><display type="date"/></field>
<field name="thruDate"><display type="date"/></field>
</form>
@@ -231,7 +231,7 @@ under the License.
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
- <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="startDate"><display type="date"/></field>
<field name="completionDate"><display type="date"/></field>
</form>
@@ -246,13 +246,13 @@ under the License.
<field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field>
<field name="custRequestTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="CustRequestType" description="${description}"/>
+ <entity-options entity-name="CustRequestType"/>
</drop-down>
</field>
<field name="custRequestName" encode-output="false"><text default-value="${communicationEvent.subject}"/></field>
<field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<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" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -260,7 +260,7 @@ under the License.
</field>
<field name="custRequestCategoryId">
<drop-down allow-empty="true">
- <entity-options entity-name="CustRequestCategory" description="${description}"/>
+ <entity-options entity-name="CustRequestCategory"/>
</drop-down>
</field>
@@ -343,7 +343,7 @@ under the License.
<field name="custRequestResolutionId"><hidden/></field>
<field use-when="custRequestItem==null" name="statusId">
<drop-down allow-empty="false" current="first-in-list">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -394,12 +394,12 @@ under the License.
</field>
<field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
+ <entity-options entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
</drop-down>
</field>
<field name="skillTypeId" title="${uiLabelMap.OrderOrderQuoteSkillTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId"/>
+ <entity-options entity-name="SkillType" key-field-name="skillTypeId"/>
</drop-down>
</field>
<field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
@@ -549,8 +549,8 @@ under the License.
</service>
</actions>
<field name="custRequestId"><hidden/></field>
- <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType" description="${description}"/></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="fromPartyId" title="${uiLabelMap.PartyPartyId}">
<hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]">
<parameter param-name="partyId" from-field="custRequest.fromPartyId"/>
@@ -584,14 +584,14 @@ under the License.
</field>
<field name="contentTypeId">
<drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
- <entity-options description="${description}" entity-name="ContentType">
+ <entity-options entity-name="ContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" use-when="contentId==void">
<drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
- <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>
@@ -607,7 +607,7 @@ under the License.
</field>
<!--field name="mimeTypeId" >
<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="dataResourceName" title="${uiLabelMap.CommonUpload}*"><file/></field>
@@ -675,7 +675,7 @@ under the License.
<field name="fromPartyId">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${fromPartyId}])"/>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="priority" use-when="statusGroup!="OPEN""><display also-hidden="false"/></field>
<field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field>
@@ -698,7 +698,7 @@ under the License.
</hyperlink>
</field>
<field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="priority" use-when="!statusId.equals("CRQ_COMPLETED")">
<drop-down allow-empty="true">
<option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
@@ -740,7 +740,7 @@ under the License.
<form name="EditCustRetStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
<field name="statusId" entry-name="attributeMap.statusId">
<drop-down>
- <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="ORDER_RETURN_STTS"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Sat Jun 20 21:58:05 2015
@@ -27,14 +27,14 @@ under the License.
<field name="orderHeaderId"><text-find/></field>
<field name="orderTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
+ <entity-options entity-name="OrderType" key-field-name="orderTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="salesChannelEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -42,7 +42,7 @@ under the License.
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<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="ORDER_STATUS"/>
</entity-options>
</drop-down>
@@ -83,13 +83,13 @@ under the License.
<field name="orderId"><text-find/></field>
<field name="orderTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="OrderType" description="${description}"/>
+ <entity-options entity-name="OrderType"/>
</drop-down>
</field>
<field name="partyId"><text-find/></field>
<field name="shipmentMethodTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="ShipmentMethodType" description="${description}">
+ <entity-options entity-name="ShipmentMethodType">
</entity-options>
</drop-down>
</field>
@@ -156,7 +156,7 @@ under the License.
<field name="partyId"><text-find/></field>
<field name="shipmentMethodTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="ShipmentMethodType" description="${description}">
+ <entity-options entity-name="ShipmentMethodType">
</entity-options>
</drop-down>
</field>
@@ -193,12 +193,12 @@ under the License.
<auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/>
<field name="custRequestTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
+ <entity-options entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -215,7 +215,7 @@ under the License.
<!--
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -260,7 +260,7 @@ under the License.
<auto-fields-entity entity-name="CustRequestItem" default-field-type="find"/>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -268,7 +268,7 @@ under the License.
</field>
<field name="custRequestResolutionId" >
<drop-down allow-empty="true">
- <entity-options entity-name="CustRequestResolution" description="${description}">
+ <entity-options entity-name="CustRequestResolution">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -305,14 +305,14 @@ under the License.
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
+ <entity-options entity-name="QuoteType" key-field-name="quoteTypeId"/>
</drop-down>
</field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="QUOTE_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -375,12 +375,12 @@ under the License.
<field name="productFeatureId"><lookup target-form-name="LookupProductFeature"/></field>
<field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
+ <entity-options entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
</drop-down>
</field>
<field name="skillTypeId" title="${uiLabelMap.OrderOrderQuoteSkillTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId"/>
+ <entity-options entity-name="SkillType" key-field-name="skillTypeId"/>
</drop-down>
</field>
<field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
@@ -454,12 +454,12 @@ under the License.
<field name="requirementId"><text-find/></field>
<field name="requirementTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RequirementType" description="${description}"/>
+ <entity-options entity-name="RequirementType"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.OrderRequirementStatusId}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="REQUIREMENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -506,7 +506,7 @@ under the License.
<field name="shoppingListId"><text-find/></field>
<field name="shoppingListTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="ShoppingListType" description="${description}"/>
+ <entity-options entity-name="ShoppingListType"/>
</drop-down>
</field>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml Sat Jun 20 21:58:05 2015
@@ -28,21 +28,21 @@ under the License.
<field name="orderItemSeqId"><hidden/></field>
<field name="totalWeightUomId">
<drop-down>
- <entity-options key-field-name="uomId" entity-name="Uom" description="${description}">
+ <entity-options key-field-name="uomId" entity-name="Uom">
<entity-constraint name="uomTypeId" value="WEIGHT_MEASURE"/>
</entity-options>
</drop-down>
</field>
<field name="totalCubicUomId">
<drop-down>
- <entity-options key-field-name="uomId" entity-name="Uom" description="${description}">
+ <entity-options key-field-name="uomId" entity-name="Uom">
<entity-constraint name="uomTypeId" value="VOLUME_DRY_MEASURE"/>
</entity-options>
</drop-down>
</field>
<field name="statusId">
<drop-down>
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="ORDER_DEL_SCH"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sat Jun 20 21:58:05 2015
@@ -58,7 +58,7 @@ under the License.
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
+ <entity-options entity-name="QuoteType" key-field-name="quoteTypeId"/>
</drop-down>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml Sat Jun 20 21:58:05 2015
@@ -34,14 +34,14 @@ under the License.
<field name="orderId" use-when="orderHeader==null" ><ignored/></field>
<field name="orderTypeId">
<drop-down>
- <entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
+ <entity-options entity-name="OrderType" key-field-name="orderTypeId">
</entity-options>
</drop-down>
</field>
<field name="statusId" use-when="orderHeader==null" title="${uiLabelMap.CommonStatus}">
<drop-down>
- <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="ORDER_STATUS"/>
</entity-options>
</drop-down>
@@ -57,7 +57,7 @@ under the License.
<field name="salesChannelEnumId">
<drop-down>
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -126,7 +126,7 @@ under the License.
<field name="orderId"><hidden value="${parameters.orderId}"/></field>
<field name="termTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="TermType" description="${description}">
+ <entity-options entity-name="TermType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -237,7 +237,7 @@ under the License.
</entity-and>
</actions>
<field name="orderTypeId" title="${uiLabelMap.FormFieldTitle_orderTypeId}">
- <display-entity entity-name="OrderType" description="${description}"/>
+ <display-entity entity-name="OrderType"/>
</field>
<field name="orderId" title="${uiLabelMap.OrderOrderId}">
<hyperlink target="orderview" description="${orderId}">
@@ -247,13 +247,13 @@ under the License.
<field name="orderName" title="${uiLabelMap.OrderOrderName}"><display/></field>
<field name="remainingSubTotal" title="${uiLabelMap.FormFieldTitle_remainingSubTotal}"><display/></field>
<field name="grandTotal" title="${uiLabelMap.OrderGrandTotal}"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="orderDate" title="${uiLabelMap.OrderOrderDate}"><display/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity entity-name="PartyNameView" description="${groupName}"/>
</field>
<field name="roleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}">
- <display-entity entity-name="RoleType" description="${description}"/>
+ <display-entity entity-name="RoleType"/>
</field>
</form>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderShopListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderShopListForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderShopListForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderShopListForms.xml Sat Jun 20 21:58:05 2015
@@ -25,7 +25,7 @@ under the License.
<auto-fields-entity entity-name="ShoppingList"/>
<field name="shoppingListTypeId">
<drop-down>
- <entity-options entity-name="ShoppingListType" description="${description}">
+ <entity-options entity-name="ShoppingListType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml Sat Jun 20 21:58:05 2015
@@ -27,9 +27,7 @@ under the License.
</field>
<field name="optionalRoleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}">
<drop-down allow-empty="false">
- <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/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Sat Jun 20 21:58:05 2015
@@ -26,12 +26,12 @@ under the License.
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
+ <entity-options entity-name="QuoteType" key-field-name="quoteTypeId"/>
</drop-down>
</field>
<field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<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" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -43,7 +43,7 @@ under the License.
<field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="QUOTE_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -112,14 +112,14 @@ under the License.
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"><display/></field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId">
+ <entity-options entity-name="QuoteType" key-field-name="quoteTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<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" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -176,7 +176,7 @@ under the License.
<field name="quoteId"><hidden/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -240,14 +240,14 @@ under the License.
<field name="productFeatureId" title="${uiLabelMap.ProductFeatures}"><lookup target-form-name="LookupProductFeature"/></field>
<field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId">
+ <entity-options entity-name="DeliverableType" key-field-name="deliverableTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="skillTypeId" title="${uiLabelMap.OrderOrderQuoteSkillTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId">
+ <entity-options entity-name="SkillType" key-field-name="skillTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -417,7 +417,7 @@ under the License.
<field name="quoteAdjustmentTypeId" title="${uiLabelMap.OrderOrderQuoteAdjustmentType}">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/>
+ <entity-options entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -460,10 +460,10 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteTerms">
<auto-fields-entity entity-name="QuoteTerm" default-field-type="display"/>
<field name="termTypeId" >
- <display-entity entity-name="TermType" description="${description}" key-field-name="termTypeId"/>
+ <display-entity entity-name="TermType" key-field-name="termTypeId"/>
</field>
<field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
- <display-entity entity-name="Uom" description="${description}" key-field-name="uomId"/>
+ <display-entity entity-name="Uom" key-field-name="uomId"/>
</field>
<field name="editLink" title=" " widget-style="buttontext">
<hyperlink target="EditQuoteTerm" description="${uiLabelMap.CommonEdit}" also-hidden="false">
@@ -526,7 +526,7 @@ under the License.
<field name="quoteItemSeqId" use-when="quoteItemSeqId!=null" tooltip="${uiLabelMap.CommonRequired}"><display/></field>
<field name="termTypeId" tooltip="${uiLabelMap.CommonRequired}">
<drop-down current-description="">
- <entity-options description="${description}" entity-name="TermType" key-field-name="termTypeId"/>
+ <entity-options entity-name="TermType" key-field-name="termTypeId"/>
</drop-down>
</field>
<field name="termTypeId" use-when="termTypeId!=null" tooltip="${uiLabelMap.CommonRequired}">
@@ -536,7 +536,7 @@ under the License.
<field name="uomId">
<drop-down current-description="">
- <entity-options description="${description}" entity-name="Uom" key-field-name="uomId"/>
+ <entity-options entity-name="Uom" key-field-name="uomId"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Sat Jun 20 21:58:05 2015
@@ -33,10 +33,10 @@ under the License.
<parameter param-name="quoteId"/>
</hyperlink>
</field>
- <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+ <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
<field name="statusItemDescription"><display/></field>
<field name="description"><display/></field>
- <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType" description="${description}"/></field>
+ <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType"/></field>
<field name="actualStartDate"><display/></field>
<field name="actualEndDate"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Sat Jun 20 21:58:05 2015
@@ -33,7 +33,7 @@ under the License.
<field name="orderTypeId">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonAny} -"/>
- <entity-options entity-name="OrderType" description="${description}">
+ <entity-options entity-name="OrderType">
<entity-order-by field-name="orderTypeId"/>
</entity-options>
</drop-down>
@@ -51,7 +51,7 @@ under the License.
<field name="statusId">
<drop-down allow-empty="false" no-current-selected-key="ORDER_COMPLETED">
<option key="" description="- ${uiLabelMap.CommonAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint value="ORDER_STATUS" name="statusTypeId"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -87,7 +87,7 @@ under the License.
<field name="orderStatusId">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
</drop-down>
@@ -117,7 +117,7 @@ under the License.
<field name="orderStatusId">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
</drop-down>
@@ -186,7 +186,7 @@ under the License.
<field name="orderStatusId">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml Sat Jun 20 21:58:05 2015
@@ -26,12 +26,12 @@ under the License.
<field name="requirementId"><text-find/></field>
<field name="requirementTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RequirementType" description="${description}"/>
+ <entity-options entity-name="RequirementType"/>
</drop-down>
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="REQUIREMENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -81,7 +81,7 @@ under the License.
<parameter param-name="requirementId"/>
</hyperlink>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="requirementTypeId">
<display-entity entity-name="RequirementType"/>
</field>
@@ -117,12 +117,12 @@ under the License.
<field name="requirementId"><hidden/></field>
<field name="requirementTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="RequirementType" description="${description}"/>
+ <entity-options entity-name="RequirementType"/>
</drop-down>
</field>
<field name="statusId">
<drop-down allow-empty="false" no-current-selected-key="REQ_CREATED">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="REQUIREMENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -200,7 +200,7 @@ under the License.
<field name="roleTypeId" use-when="requirementRole!=null"><display-entity entity-name="RoleType"/></field>
<field name="roleTypeId" use-when="requirementRole==null">
<drop-down allow-empty="false" no-current-selected-key="SUPPLIER">
- <entity-options entity-name="RoleType" description="${description}"/>
+ <entity-options entity-name="RoleType"/>
</drop-down>
</field>
<field name="fromDate" use-when="requirementRole!=null"><display/></field>
@@ -215,7 +215,7 @@ under the License.
<field name="requirementId"><text-find/></field>
<field name="requirementTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RequirementType" description="${description}"/>
+ <entity-options entity-name="RequirementType"/>
</drop-down>
</field>
<field name="facilityId">