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 [5/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/order/widget/ordermgr/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml Sat Jun 20 21:58:05 2015
@@ -34,12 +34,12 @@ under the License.
<field use-when="returnHeader==null&&returnId==null" name="returnId"><ignored/></field>
<field name="returnHeaderTypeId" id-name="returnHeaderTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="ReturnHeaderType" description="${description}"/>
+ <entity-options entity-name="ReturnHeaderType"/>
</drop-down>
</field>
<field name="statusId" use-when="returnHeader==null" id-name="statusId">
<drop-down>
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="ORDER_RETURN_STTS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -123,7 +123,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<field name="returnHeaderTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="ReturnHeaderType" description="${description}"/>
+ <entity-options entity-name="ReturnHeaderType"/>
</drop-down>
</field>
<field name="returnId" title="${uiLabelMap.OrderReturnId}"><text-find/></field>
@@ -135,7 +135,7 @@ under the License.
</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="ORDER_RETURN_STTS"/>
</entity-options>
</drop-down>
@@ -181,7 +181,7 @@ under the License.
</hyperlink>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
</form>
@@ -189,7 +189,7 @@ under the License.
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="returnId"><display/></field>
<field name="returnItemSeqId"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="statusDatetime" title="${uiLabelMap.CommonDate}"><display/></field>
<field name="changeByUserLoginId" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
</form>
@@ -205,10 +205,10 @@ under the License.
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="returnId"><display description="${returnId}"/></field>
<field name="oldValueText">
- <display-entity entity-name="ReturnReason" description="${description}" key-field-name="returnReasonId"/>
+ <display-entity entity-name="ReturnReason" key-field-name="returnReasonId"/>
</field>
<field name="newValueText">
- <display-entity entity-name="ReturnReason" description="${description}" key-field-name="returnReasonId"/>
+ <display-entity entity-name="ReturnReason" key-field-name="returnReasonId"/>
</field>
<field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
@@ -217,10 +217,10 @@ under the License.
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="returnId"><display description="${returnId}"/></field>
<field name="oldValueText">
- <display-entity entity-name="ReturnType" description="${description}" key-field-name="returnTypeId"/>
+ <display-entity entity-name="ReturnType" key-field-name="returnTypeId"/>
</field>
<field name="newValueText">
- <display-entity entity-name="ReturnType" description="${description}" key-field-name="returnTypeId"/>
+ <display-entity entity-name="ReturnType" key-field-name="returnTypeId"/>
</field>
<field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Sat Jun 20 21:58:05 2015
@@ -34,7 +34,7 @@ under the License.
</field>
<field name="communicationEventTypeId" >
<drop-down>
- <entity-options entity-name="CommunicationEventType" description="${description}">
+ <entity-options entity-name="CommunicationEventType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -43,7 +43,7 @@ under the License.
<!-- status -->
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
<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="COM_EVENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -59,7 +59,7 @@ under the License.
<field name="contactMechTypeId">
<drop-down>
- <entity-options description="${description}" entity-name="ContactMechType"/>
+ <entity-options entity-name="ContactMechType"/>
</drop-down>
</field>
@@ -73,7 +73,7 @@ under the License.
<field name="roleTypeIdFrom" position="1">
<drop-down no-current-selected-key="_NA_">
- <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>
@@ -81,7 +81,7 @@ under the License.
<field name="roleTypeIdTo" position="2">
<drop-down no-current-selected-key="_NA_">
- <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>
@@ -102,7 +102,7 @@ under the License.
<field name="reasonEnumId" position="2">
<drop-down no-current-selected-key="" 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="CE_COMM_REASON"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -231,7 +231,7 @@ under the License.
<parameter param-name="communicationEventId" from-field="communicationEvent.communicationEventId"/>
</hyperlink>
</field>
- <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" description="${description}"/></field>
+ <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType"/></field>
<field name="contactListId" use-when="communicationEvent.get("contactListId")!=null"><display/></field>
<field name="partyIdFrom" use-when="communicationEvent.get("partyIdFrom")!=null">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechFrom.infoString})">
@@ -247,7 +247,7 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="lastUpdatedStamp" title="${uiLabelMap.FormFieldTitle_lastModifiedDate}"><display/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><display type="date"/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonEndDate}"><display type="date"/></field>
@@ -304,14 +304,14 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="contactMechTypeId" use-when=""my"==void"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field name="contactMechTypeId" use-when=""my"==void"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
<field name="contactMechIdFrom" use-when=""my"==void" title="${uiLabelMap.PartyFromContactMech}"><display/></field>
<field name="contactMechIdTo" use-when=""my"==void" title="${uiLabelMap.PartyToEmailAddress}">
<display-entity entity-name="ContactMech" key-field-name="contactMechId" description="${infoString}"/>
</field>
- <field name="roleTypeIdFrom" use-when=""my"==void"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo" use-when=""my"==void"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeIdFrom" use-when=""my"==void"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeIdTo" use-when=""my"==void"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
<field name="subject"><display/></field>
@@ -354,36 +354,36 @@ under the License.
<field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" position="2">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="RoleType">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="COMMEVENT_ROLE"/>
</entity-options>
</drop-down>
</field>
<field name="communicationEventTypeId" position="1">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
+ <entity-options entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
</drop-down>
</field>
<field name="statusId" 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="COM_EVENT_STATUS"/>
</entity-options>
</drop-down>
</field>
<!-- <field name="contactMechTypeId">
<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">
<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="roleTypeIdTo">
<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-->
@@ -391,7 +391,7 @@ under the License.
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
<field name="reasonEnumId">
<drop-down no-current-selected-key="" 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="CE_COMM_REASON"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -415,9 +415,9 @@ under the License.
<parameter param-name="headerItem" from-field="parameters.headerItem"/>
</hyperlink>
</field>
- <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}" sort-field="true"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
+ <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}" sort-field="true"><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
<field name="statusId" sort-field="true">
- <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="partyId" title="${uiLabelMap.CommonPartyId}" sort-field="true">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
@@ -427,10 +427,10 @@ under the License.
</display-entity>
</field>
<field name="roleTypeId" sort-field="true">
- <display-entity description="${description}" entity-name="RoleType"/>
+ <display-entity entity-name="RoleType"/>
</field>
<field name="roleStatusId" sort-field="true">
- <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="entryDate" title="${uiLabelMap.CommonCreated}" sort-field="true"><display type="date"/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonSent}" sort-field="true"><display type="date"/></field>
@@ -446,12 +446,12 @@ under the License.
<field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
<field name="communicationEventTypeId" position="2">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
+ <entity-options entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
</drop-down>
</field>
<field name="statusId" 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="COM_EVENT_STATUS"/>
</entity-options>
</drop-down>
@@ -522,7 +522,7 @@ under the License.
</hyperlink>
</field>
<field name="communicationEventTypeId">
- <display-entity entity-name="CommunicationEventType" description="${description}"/>
+ <display-entity entity-name="CommunicationEventType"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}" sort-field="true">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
@@ -539,7 +539,7 @@ under the License.
</display-entity>
</field>
<field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
- <display-entity entity-name="StatusItem" description="${description}">
+ <display-entity entity-name="StatusItem">
<sub-hyperlink target="setCommunicationEventRoleStatus"
description="${uiLabelMap.${toComplete}}">
<parameter param-name="communicationEventId"/>
@@ -551,7 +551,7 @@ under the License.
</display-entity>
</field>
<field name="entryDate" sort-field="true"><display type="date-time"/></field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="removeButton" widget-style="smallSubmit"><submit/></field>
</form>
<form name="ListPendingCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -654,7 +654,7 @@ under the License.
</entity-and>
</actions>
<field name="communicationEventPrpTypId">
- <display-entity description="${description}" entity-name="CommunicationEventPrpTyp"/>
+ <display-entity entity-name="CommunicationEventPrpTyp"/>
</field>
<field name="removeLink" title=" " widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose">
@@ -670,7 +670,7 @@ under the License.
<field name="partyId"><hidden/></field>
<field name="communicationEventPrpTypId" >
<drop-down>
- <entity-options description="${description}" entity-name="CommunicationEventPrpTyp" key-field-name="communicationEventPrpTypId">
+ <entity-options entity-name="CommunicationEventPrpTyp" key-field-name="communicationEventPrpTypId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -694,8 +694,8 @@ under the License.
</display-entity>
</field>
<field name="contactMechId"><display-entity description="${infoString}" entity-name="ContactMech"/></field>
- <field name="roleTypeId"><display-entity description="${description}" entity-name="RoleType"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="removeButton" widget-style="smallSubmit"><submit/></field>
</form>
@@ -715,7 +715,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}" position="1"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" position="2">
<drop-down>
- <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="COMMEVENT_ROLE"/>
<entity-constraint name="roleTypeId" operator="not-equals" value="ORIGINATOR"/>
<entity-order-by field-name="description"/>
@@ -816,7 +816,7 @@ under the License.
</field>
<field name="dataResourceTypeId" entry-name="drDataResourceTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="DataResourceType" description="${description}"/>
+ <entity-options entity-name="DataResourceType"/>
</drop-down>
</field>
<!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type"><display/></field> -->
@@ -965,7 +965,7 @@ under the License.
<field name="fromPartyId" entry-name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
<field name="custRequestTypeId" >
<drop-down>
- <entity-options entity-name="CustRequestType" description="${description}">
+ <entity-options entity-name="CustRequestType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -1028,7 +1028,7 @@ under the License.
</field>
<field name="communicationEventId"><hidden/></field>
<field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">
- <display-entity entity-name="OrderType" key-field-name="orderTypeId" description="${description}"/>
+ <display-entity entity-name="OrderType" key-field-name="orderTypeId"/>
</field>
<field name="createdBy" title="${uiLabelMap.CommonCreatedBy}">
<display description="${orderHeader.createdBy}"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml Sat Jun 20 21:58:05 2015
@@ -27,7 +27,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyType"/>
+ <entity-options entity-name="PartyType"/>
</drop-down>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -50,7 +50,7 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
- <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+ <display-entity also-hidden="false" entity-name="PartyType"/>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}"><display/></field>
@@ -62,7 +62,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyType"/>
+ <entity-options entity-name="PartyType"/>
</drop-down>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -99,7 +99,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyType"/>
+ <entity-options entity-name="PartyType"/>
</drop-down>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -120,7 +120,7 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
- <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+ <display-entity also-hidden="false" entity-name="PartyType"/>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}"><display/></field>
@@ -137,7 +137,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyType"/>
+ <entity-options entity-name="PartyType"/>
</drop-down>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -161,7 +161,7 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
- <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+ <display-entity also-hidden="false" entity-name="PartyType"/>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}"><display/></field>
@@ -285,7 +285,7 @@ under the License.
<auto-fields-entity entity-name="PartyClassificationGroup" default-field-type="find"/>
<field name="partyClassificationTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="PartyClassificationType" description="${description}">
+ <entity-options entity-name="PartyClassificationType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -321,28 +321,28 @@ 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">
<entity-order-by field-name="description"/>
</entity-options>
</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">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}">
<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>
@@ -375,10 +375,10 @@ under the License.
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
<display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" 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="custRequestId" position="1" title="${uiLabelMap.PartyServicemgntCustRequestId}"><display/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
@@ -389,14 +389,14 @@ under the License.
<field name="contactMechId"><text-find/></field>
<field name="contactMechTypeId">
<drop-down allow-empty="true" 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>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyType"/>
+ <entity-options entity-name="PartyType"/>
</drop-down>
</field>
<field name="infoString"><text-find/></field>
@@ -420,7 +420,7 @@ under the License.
<hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
- <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+ <display-entity also-hidden="false" entity-name="PartyType"/>
</field>
<field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
<field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Sat Jun 20 21:58:05 2015
@@ -55,7 +55,7 @@ under the License.
</hyperlink>
</field>
<field name="partyClassificationTypeId">
- <display-entity entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId" description="${description}"/>
+ <display-entity entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId"/>
</field>
<field name="parentGroupId"><display/></field>
<field name="description" title=" "><display/></field>
@@ -74,7 +74,7 @@ under the License.
<field use-when="partyClassificationGroup==null&&partyClassificationGroupId!=null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyClassificationGroupId}]"><display/></field>
<field name="partyClassificationTypeId">
<drop-down>
- <entity-options description="${description}" entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId">
+ <entity-options entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -89,7 +89,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
<field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
<drop-down>
- <entity-options description="${description}" entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId">
+ <entity-options entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -107,7 +107,7 @@ under the License.
<form name="AddPartyClassificationParty" type="single" target="createPartyClassificationParty" default-map-name="partyClassification"
header-row-style="header-row" default-table-style="basic-table">
<field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
- <display-entity entity-name="PartyClassificationGroup" description="${description}" key-field-name="partyClassificationGroupId"/>
+ <display-entity entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId"/>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml Sat Jun 20 21:58:05 2015
@@ -49,7 +49,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down>
- <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>
@@ -75,7 +75,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down no-current-selected-key="CLPT_PENDING">
- <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>
@@ -101,8 +101,8 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${contactListId}" target="javascript:set_value('${contactListId}')"/>
</field>
<field name="contactListName"><display/></field>
- <field name="contactListTypeId"><display-entity description="${description}" entity-name="ContactListType"/></field>
- <field name="contactMechTypeId" title="${uiLabelMap.PartyContactMechType}"><display-entity description="${description}" entity-name="ContactMechType"/></field>
+ <field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>
+ <field name="contactMechTypeId" title="${uiLabelMap.PartyContactMechType}"><display-entity entity-name="ContactMechType"/></field>
<field name="marketingCampaignId"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
</form>
</forms>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Jun 20 21:58:05 2015
@@ -46,20 +46,20 @@ under the License.
<field name="partyGroupName" title="${uiLabelMap.PartyGroupName}"><text size="15"/></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>
</field>
<field name="partyTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyType"/>
+ <entity-options entity-name="PartyType"/>
</drop-down>
</field>
<field name="idValue"><text size="15"/></field>
<field name="partyIdentificationTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="PartyIdentificationType"/>
+ <entity-options entity-name="PartyIdentificationType"/>
</drop-down>
</field>
<field name="address1"><text size="15"/></field>
@@ -79,7 +79,7 @@ under the License.
</field>
<field name="partyClassificationGroupId" title=" " use-when="parentTypeId == null">
<drop-down allow-multiple="true" size="20" allow-empty="true">
- <entity-options description="${description}" entity-name="PartyClassificationGroupAndType">
+ <entity-options entity-name="PartyClassificationGroupAndType">
<entity-order-by field-name="partyClassificationTypeId"/>
</entity-options>
</drop-down>
@@ -236,7 +236,7 @@ under the License.
<field name="statusId" use-when="person==null"><hidden/></field>
<field name="statusId" use-when="person!=null && leadDescription==null">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="PARTY_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -244,7 +244,7 @@ under the License.
</field>
<field name="statusId" use-when="person!=null && leadDescription!=null">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusId" operator="in" value="LEAD_ASSIGNED,PARTY_ENABLED,PARTY_DISABLED"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -279,7 +279,7 @@ under the License.
<field name="statusId" use-when="partyGroup==null"><hidden/></field>
<field name="statusId" use-when="partyGroup!=null">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="PARTY_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -300,9 +300,9 @@ under the License.
<field name="comments"><ignored/></field>
<field name="logoImageUrl"><ignored/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
- <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
+ <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
<field name="externalId"><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>
<sort-order>
<sort-field name="logo"/>
<sort-field name="partyId"/>
@@ -325,7 +325,7 @@ under the License.
<field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field>
<field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
<field name="externalId"><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>
</form>
<form name="ViewPartyPersonHistory" type="list" list-name="partyNameHistoryList"
@@ -425,14 +425,14 @@ under the License.
</field>
<field name="roleTypeIdValidFrom" title="${uiLabelMap.PartyRelationshipValidFromRoleType}">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="roleTypeIdValidTo" title="${uiLabelMap.PartyRelationshipValidToRoleType}">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -538,7 +538,7 @@ under the License.
<field name="partyId"><hidden/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD" allow-empty="false">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -581,7 +581,7 @@ under the License.
<field name="rateAmountFromDate"><hidden/></field>
<field name="rateCurrencyUomId"><hidden/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType" also-hidden="true"/></field>
- <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+ <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
<field name="rateDefaultAmount" use-when=""workEffort".equals(rateLevel)" tooltip="${uiLabelMap.PartyValueFromWorkEffortLevel}"><display type="currency" currency="${rateCurrencyUomId}"/></field>
<field name="rateDefaultAmount" use-when=""party".equals(rateLevel)" tooltip="${uiLabelMap.PartyValueFromPartyLevel}"><display type="currency" currency="${rateCurrencyUomId}"/></field>
<field name="rateDefaultAmount" use-when=""rateType".equals(rateLevel)" tooltip="${uiLabelMap.PartyValueFromRateTypeLevel}"><display type="currency" currency="${rateCurrencyUomId}"/></field>
@@ -677,7 +677,7 @@ under the License.
</display-entity>
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRole}">
- <display-entity entity-name="RoleType" description="${description}"/>
+ <display-entity entity-name="RoleType"/>
</field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
<hyperlink target="deleteSegmentGroupRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
@@ -696,7 +696,7 @@ under the License.
<field name="partyId"><hidden/></field>
<field name="roleTypeId">
<drop-down>
- <entity-options description="${description}" entity-name="RoleType">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -743,7 +743,7 @@ under the License.
<field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="partyContentTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="PartyContentType"/>
+ <entity-options entity-name="PartyContentType"/>
</drop-down>
</field>
<!-- note sure if these two are necessray, but they are kind of confusing in this context:
@@ -752,12 +752,12 @@ under the License.
-->
<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"/>
</drop-down>
</field>
<field name="statusId" use-when="content==null">
<drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -773,7 +773,7 @@ under the License.
</field>
<field name="mimeTypeId" >
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="MimeType"/>
+ <entity-options entity-name="MimeType"/>
</drop-down>
</field>
<field name="dataResourceName" title="${uiLabelMap.CommonUpload}"><file/></field>
@@ -912,17 +912,17 @@ under the License.
<form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table">
<field name="subscriptionId">
- <display-entity entity-name="Subscription" description="${description}">
+ <display-entity entity-name="Subscription">
<sub-hyperlink description="[${subscriptionId}]" target="/catalog/control/EditSubscription" target-type="inter-app">
<parameter param-name="subscriptionId"/>
</sub-hyperlink>
</display-entity>
</field>
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}">
- <display-entity entity-name="SubscriptionType" description="${description}"/>
+ <display-entity entity-name="SubscriptionType"/>
</field>
<field name="subscriptionResourceId">
- <display-entity entity-name="SubscriptionResource" description="${description}"/>
+ <display-entity entity-name="SubscriptionResource"/>
</field>
<field name="description"><display/></field>
<field name="productId">
@@ -970,7 +970,7 @@ under the License.
</display-entity>
</field>
<field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}">
- <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="partyRelationshipTypeId" title="${uiLabelMap.PartyIsA}"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
<field name="partyIdFrom" title="${uiLabelMap.PartyOfParty}">
@@ -981,7 +981,7 @@ under the License.
</display-entity>
</field>
<field name="roleTypeIdFrom" title="${uiLabelMap.PartyPartyInTheRoleOf}">
- <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="fromDate"><display type="date"/></field>
<field name="thruDate"><date-time/></field>
@@ -1002,7 +1002,7 @@ under the License.
<field name="partyIdTo" entry-name="parameters.partyId"><display/></field>
<field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}">
<drop-down allow-empty="false" no-current-selected-key="_NA_">
- <entity-options entity-name="RoleTypeAndParty" key-field-name="roleTypeId" description="${description}">
+ <entity-options entity-name="RoleTypeAndParty" key-field-name="roleTypeId">
<entity-constraint name="partyId" value="${partyId}"/>
<entity-order-by field-name="description"/>
<entity-order-by field-name="roleTypeId"/>
@@ -1019,14 +1019,14 @@ under the License.
<field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeIdFrom" title="${uiLabelMap.PartyPartyInTheRoleOf}">
<drop-down allow-empty="false" no-current-selected-key="_NA_">
- <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</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="PARTY_REL_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1036,7 +1036,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}">
<drop-down allow-empty="true" text-size="60">
- <entity-options entity-name="SecurityGroup" description="${description}">
+ <entity-options entity-name="SecurityGroup">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -1080,7 +1080,7 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
<field name="invoiceDate"><display type="date"/></field>
<field name="total"><display type="currency" currency="${actualCurrencyUomId}"/></field>
<field name="amountToApply"><display type="currency" currency="${actualCurrencyUomId}"/></field>
@@ -1104,14 +1104,14 @@ under the License.
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy"/>
</actions>
<field name="invoiceId">
- <display-entity entity-name="Invoice" description="${description}">
+ <display-entity entity-name="Invoice">
<sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" target-type="inter-app">
<parameter param-name="invoiceId"/>
</sub-hyperlink>
</display-entity>
</field>
<field name="invoiceParentTypeId">
- <display-entity entity-name="InvoiceType" key-field-name="invoiceTypeId" description="${description}"/>
+ <display-entity entity-name="InvoiceType" key-field-name="invoiceTypeId"/>
</field>
<field name="invoiceDate"><display type="date"/></field>
<field name="amount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field>
@@ -1134,10 +1134,10 @@ under the License.
</field>
<field name="effectiveDate"><display type="date"/></field>
<field name="paymentTypeId">
- <display-entity entity-name="PaymentType" description="${description}"/>
+ <display-entity entity-name="PaymentType"/>
</field>
<field name="paymentParentTypeId">
- <display-entity entity-name="PaymentType" key-field-name="paymentTypeId" description="${description}"/>
+ <display-entity entity-name="PaymentType" key-field-name="paymentTypeId"/>
</field>
<field name="amount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
<field name="unAppliedAmount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
@@ -1164,7 +1164,7 @@ under the License.
>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.PartyRole}"><display/></field>
- <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/></field>
+ <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="remove">
<hyperlink target="deleterole" description="${uiLabelMap.CommonRemove}">
<parameter param-name="partyId"/>
@@ -1193,7 +1193,7 @@ under the License.
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', jQuery('#AddPartyMainRole').serialize());" entry-name="dummy">
<drop-down allow-empty="false">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -1204,7 +1204,7 @@ under the License.
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="roleTypeId" entry-name="dummy">
<drop-down allow-empty="false">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="${parameters.roleTypeId}"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1248,7 +1248,7 @@ under the License.
</form>
<form name="PartyReturns" type="list" list-name="returnList" default-table-style="basic-table hover-bar">
<field name="returnId"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="fromPartyId"><display/></field>
<field name="toPartyId"><display/></field>
</form>
@@ -1258,7 +1258,7 @@ under the License.
<parameter param-name="salesOpportunityId"/>
</hyperlink>
</field>
- <field name="opportunityStageId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="SalesOpportunityStage" description="${description}"/></field>
+ <field name="opportunityStageId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="SalesOpportunityStage"/></field>
<field name="estimatedAmount" title="${uiLabelMap.SfaEstimatedAmount}"><display/></field>
<field name="partyId"><display/></field>
</form>
@@ -1288,7 +1288,7 @@ under the License.
<alt-target use-when="partyIdentification !=null" target="updatePartyIdentification"/>
<field name="partyIdentificationTypeId" use-when="partyIdentification == null">
<drop-down>
- <entity-options description="${description}" entity-name="PartyIdentificationType">
+ <entity-options entity-name="PartyIdentificationType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Sat Jun 20 21:58:05 2015
@@ -30,7 +30,7 @@ under the License.
<field position="2" name="datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></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" operator="equals" value="PARTY_INV_STATUS"/>
<entity-order-by field-name="statusId"/>
</entity-options>
@@ -66,7 +66,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
<field name="toName" title="${uiLabelMap.PartyToName}"><display/></field>
<field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="lastInviteDate"><display/></field>
<field name="remove" title=" " widget-style="buttontext">
<hyperlink target="deletePartyInvitation" description="${uiLabelMap.CommonDelete}">
@@ -88,7 +88,7 @@ under the License.
</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" operator="equals" value="PARTY_INV_STATUS"/>
<entity-order-by field-name="statusId"/>
</entity-options>
@@ -169,7 +169,7 @@ under the License.
<field name="partyInvitationId"><hidden/> </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="roleTypeId"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml Sat Jun 20 21:58:05 2015
@@ -48,7 +48,7 @@ under the License.
</field>
<field name="prodCatContentTypeId">
<drop-down>
- <entity-options entity-name="ProductCategoryContentType" description="${description}">
+ <entity-options entity-name="ProductCategoryContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -62,7 +62,7 @@ under the License.
<field name="productCategoryId" map-name="productCategory"><hidden/></field>
<field name="prodCatContentTypeId">
<drop-down>
- <entity-options entity-name="ProductCategoryContentType" description="${description}">
+ <entity-options entity-name="ProductCategoryContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -75,7 +75,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId"><hidden/></field>
<field name="contentId" title="${uiLabelMap.ProductContent}">
- <display-entity entity-name="Content" description="${description}" also-hidden="true">
+ <display-entity entity-name="Content" also-hidden="true">
<sub-hyperlink target="EditCategoryContentContent" description="${contentId}" link-style="buttontext">
<parameter param-name="productCategoryId"/>
<parameter param-name="contentId"/>
@@ -85,7 +85,7 @@ under the License.
</display-entity>
</field>
<field name="prodCatContentTypeId" title="${uiLabelMap.ProductType}">
- <display-entity entity-name="ProductCategoryContentType" also-hidden="false" description="${description}"/>
+ <display-entity entity-name="ProductCategoryContentType" also-hidden="false"/>
</field>
<field name="fromDate"><display/></field>
<field name="thruDate"><display/></field>
@@ -94,7 +94,7 @@ under the License.
<field name="thruDate"><date-time type="timestamp"/></field>
<field name="prodCatContentTypeId">
<drop-down>
- <entity-options entity-name="ProductCategoryContentType" description="${description}">
+ <entity-options entity-name="ProductCategoryContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -250,7 +250,7 @@ under the License.
</hyperlink>
</field>
- <field name="productCategoryTypeId" sort-field="true"><display-entity entity-name="ProductCategoryType" description="${description}"/></field>
+ <field name="productCategoryTypeId" sort-field="true"><display-entity entity-name="ProductCategoryType"/></field>
<field name="primaryParentCategoryId" sort-field="true"><display/></field>
<field name="categoryName" sort-field="true"><display/></field>
<field name="description" sort-field="true"><display/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml Sat Jun 20 21:58:05 2015
@@ -119,7 +119,7 @@ under the License.
<field name="contentId" title="${uiLabelMap.ProductContentId}" ></field>
<field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}">
<drop-down>
- <entity-options entity-name="ProdConfItemContentType" description="${description}">
+ <entity-options entity-name="ProdConfItemContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -137,7 +137,7 @@ under the License.
<field name="configItemId" map-name="productConfigItem"><hidden/></field>
<field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}">
<drop-down>
- <entity-options entity-name="ProdConfItemContentType" description="${description}">
+ <entity-options entity-name="ProdConfItemContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -158,7 +158,7 @@ under the License.
</field>
<field name="confItemContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}">
<drop-down>
- <entity-options entity-name="ProdConfItemContentType" description="${description}">
+ <entity-options entity-name="ProdConfItemContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml Sat Jun 20 21:58:05 2015
@@ -34,7 +34,7 @@
<field name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}">
<drop-down>
- <entity-options entity-name="ProductFeatureType" description="${description}">
+ <entity-options entity-name="ProductFeatureType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -133,7 +133,7 @@
</field>
<field name="description"><display/></field>
<field name="parentTypeId">
- <display-entity entity-name="ProductFeatureType" description="${description}" key-field-name="productFeatureTypeId">
+ <display-entity entity-name="ProductFeatureType" key-field-name="productFeatureTypeId">
<sub-hyperlink target="EditFeatureType" description="${parentTypeId}">
<parameter param-name="productFeatureTypeId" from-field="parentTypeId"/>
</sub-hyperlink>
@@ -153,7 +153,7 @@
<field use-when="productFeatureType==null&&productFeatureTypeId!=null" name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}" tooltip="${uiLabelMap.ProductCouldNotFindProductFeatureType} [${productFeatureTypeId}]"><text size="20" maxlength="20"/></field>
<field name="parentTypeId" title="${uiLabelMap.ProductParentType}">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductFeatureType" key-field-name="productFeatureTypeId" description="${description}">
+ <entity-options entity-name="ProductFeatureType" key-field-name="productFeatureTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -181,14 +181,14 @@
</actions>
<field name="productFeatureId">
- <display-entity entity-name="ProductFeature" description="${description}">
+ <display-entity entity-name="ProductFeature">
<sub-hyperlink target="EditFeature" description="[${productFeatureId}]">
<parameter param-name="productFeatureId"/>
</sub-hyperlink>
</display-entity>
</field>
<field name="productFeatureIdTo">
- <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId">
+ <display-entity entity-name="ProductFeature" key-field-name="productFeatureId">
<sub-hyperlink target="EditFeature" description="[${productFeatureIdTo}]">
<parameter param-name="productFeatureId" from-field="productFeatureIdTo"/>
</sub-hyperlink>
@@ -223,7 +223,7 @@
</field>
<field name="productFeatureIactnTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="ProductFeatureIactnType">
+ <entity-options entity-name="ProductFeatureIactnType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -267,7 +267,7 @@
<field name="productFeatureGroupId"><hidden/></field>
<field name="productFeatureCategoryId">
<drop-down>
- <list-options key-name="productFeatureCategoryId" list-name="productFeatureCategories" description="${description}"/>
+ <list-options key-name="productFeatureCategoryId" list-name="productFeatureCategories"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonContinue}" widget-style="smallSubmit">
@@ -322,7 +322,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}*"><text size="25"></text></field>
<field name="parentCategory" title="${uiLabelMap.ProductParentCategory}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ProductFeatureCategory" key-field-name="description">
+ <entity-options entity-name="ProductFeatureCategory" key-field-name="description">
</entity-options>
</drop-down>
</field>
@@ -360,7 +360,7 @@
<field name="productFeatureId"><hidden/></field>
<field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}">
<drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE">
- <entity-options entity-name="ProductPriceType" description="${description}">
+ <entity-options entity-name="ProductPriceType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml Sat Jun 20 21:58:05 2015
@@ -28,14 +28,14 @@ under the License.
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductType" description="${description}">
+ <entity-options entity-name="ProductType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ProductCategory" key-field-name="productCategoryId">
+ <entity-options entity-name="ProductCategory" key-field-name="productCategoryId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -78,7 +78,7 @@ under the License.
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductType" description="${description}">
+ <entity-options entity-name="ProductType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -135,7 +135,7 @@ under the License.
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductType" description="${description}">
+ <entity-options entity-name="ProductType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -143,7 +143,7 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="primaryProductCategoryId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ProductCategory" key-field-name="productCategoryId">
+ <entity-options entity-name="ProductCategory" key-field-name="productCategoryId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -158,13 +158,13 @@ under the License.
</field>
<field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}">
<drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE">
- <entity-options description="${description}" entity-name="ProductPriceType" key-field-name="productPriceTypeId">
+ <entity-options entity-name="ProductPriceType" key-field-name="productPriceTypeId">
</entity-options>
</drop-down>
</field>
<field name="productPricePurposeId">
<drop-down allow-empty="false" no-current-selected-key="PURCHASE">
- <entity-options description="${description}" entity-name="ProductPricePurpose" key-field-name="productPricePurposeId">
+ <entity-options entity-name="ProductPricePurpose" key-field-name="productPricePurposeId">
</entity-options>
</drop-down>
</field>
@@ -215,7 +215,7 @@ under the License.
<auto-fields-entity entity-name="ProductCategory" default-field-type="find"/>
<field name="productCategoryTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ProductCategoryType">
+ <entity-options entity-name="ProductCategoryType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -274,14 +274,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>
@@ -344,14 +344,14 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}">
<drop-down allow-empty="true">
- <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+ <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}">
<drop-down allow-empty="true">
- <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+ <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>