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 [7/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/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sat Jun 20 21:58:05 2015
@@ -28,14 +28,14 @@ under the License.
<field name="subscriptionResourceId">
<drop-down allow-empty="true">
- <entity-options entity-name="SubscriptionResource" description="${description}">
+ <entity-options entity-name="SubscriptionResource">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
<drop-down allow-empty="true">
- <entity-options entity-name="SubscriptionType" description="${description}">
+ <entity-options entity-name="SubscriptionType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -44,7 +44,7 @@ under the License.
<field name="originatedFromPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="originatedFromRoleTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -53,7 +53,7 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId">
<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>
@@ -107,14 +107,14 @@ under the License.
<auto-fields-entity entity-name="Subscription" default-field-type="display"/>
<field name="subscriptionResourceId">
- <display-entity entity-name="SubscriptionResource" description="${description}">
+ <display-entity entity-name="SubscriptionResource">
<sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext">
<parameter param-name="subscriptionResourceId"/>
</sub-hyperlink>
</display-entity>
</field>
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
- <display-entity entity-name="SubscriptionType" description="${description}"/>
+ <display-entity entity-name="SubscriptionType"/>
</field>
<field name="originatedFromPartyId">
@@ -124,7 +124,7 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="originatedFromRoleTypeId"><display-entity entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/></field>
+ <field name="originatedFromRoleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="partyId">
<display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}">
@@ -133,7 +133,7 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="orderId" widget-style="buttontext">
<hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
@@ -194,14 +194,14 @@ under the License.
<field name="subscriptionResourceId">
<drop-down allow-empty="false">
- <entity-options entity-name="SubscriptionResource" description="${description}">
+ <entity-options entity-name="SubscriptionResource">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
<drop-down allow-empty="true">
- <entity-options entity-name="SubscriptionType" description="${description}">
+ <entity-options entity-name="SubscriptionType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -216,7 +216,7 @@ under the License.
</field>
<field name="originatedFromRoleTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -231,7 +231,7 @@ under the License.
</field>
<field name="roleTypeId">
<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>
@@ -246,7 +246,7 @@ under the License.
</field>
<field name="needTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="NeedType" description="${description}">
+ <entity-options entity-name="NeedType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -275,7 +275,7 @@ under the License.
</field>
<field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}">
<drop-down allow-empty="true">
- <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -290,7 +290,7 @@ under the License.
<field name="canclAutmExtTime" title="Cancel time"></field>
<field name="canclAutmExtTimeUomId" title="Cancel UOM time">
<drop-down allow-empty="true">
- <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -298,7 +298,7 @@ under the License.
</field>
<field name="gracePeriodOnExpiryUomId" title="${uiLabelMap.ProductGracePeriodUomId}">
<drop-down allow-empty="true">
- <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -390,7 +390,7 @@ under the License.
</field>
<field name="useRoleTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -403,7 +403,7 @@ under the License.
</field>
<field name="canclAutmExtTimeUomId">
<drop-down allow-empty="true">
- <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -434,7 +434,7 @@ under the License.
</field>
<field name="useRoleTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -447,7 +447,7 @@ under the License.
</field>
<field name="canclAutmExtTimeUomId">
<drop-down allow-empty="true">
- <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -490,11 +490,11 @@ under the License.
<field name="partyIdTo">
<display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
</field>
- <field name="communicationEventTypeId" ><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="roleTypeIdFrom"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="communicationEventTypeId" ><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field name="contactMechTypeId"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+ <field name="roleTypeIdFrom"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeIdTo"><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="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Sat Jun 20 21:58:05 2015
@@ -37,7 +37,7 @@ under the License.
</field>
<field name="facilityName"><display/></field>
<field name="facilityTypeId" title="${uiLabelMap.ProductFacilityType}">
- <display-entity entity-name="FacilityType" description="${description}"/>
+ <display-entity entity-name="FacilityType"/>
</field>
<field name="ownerPartyId" title="${uiLabelMap.ProductFacilityOwner}"><display/></field>
<field name="FacilitySize" title="${uiLabelMap.ProductFacilitySize}"><display/></field>
@@ -74,10 +74,10 @@ under the License.
<field name="inventoryItemId"><text-find/></field>
<field name="statusId">
<drop-down allow-empty="true">
- <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="INV_NON_SER_STTS"/>
</entity-options>
- <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="INV_SERIALIZED_STTS"/>
</entity-options>
</drop-down>
@@ -197,7 +197,7 @@ under the License.
<field name="workEffortId"><text/></field>
<field name="reasonEnumId">
<drop-down allow-empty="true">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="IID_REASON"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -258,7 +258,7 @@ under the License.
<field name="availableToPromiseDiff" position="2"><display/></field>
<field name="reasonEnumId" position="2">
- <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="description" position="2"><display/></field>
<field name="orderId" widget-style="buttontext" position="2">
@@ -314,7 +314,7 @@ under the License.
<field name="availableToPromiseDiff" position="2"><display/></field>
<field name="reasonEnumId" position="2">
- <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="description" position="2"><display/></field>
<field name="orderId" widget-style="buttontext" position="2">
@@ -366,7 +366,7 @@ under the License.
<field name="availableToPromiseDiff"><display/></field>
<field name="reasonEnumId">
- <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="description"><display/></field>
<field name="orderId" widget-style="buttontext">
@@ -402,7 +402,7 @@ under the License.
</field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}">
<drop-down allow-empty="true" no-current-selected-key="FINISHED_GOOD">
- <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] -->
+ <entity-options entity-name="ProductType"> <!-- [${productTypeId}] -->
<entity-constraint name="isPhysical" value="Y" operator="equals"/>
<entity-constraint name="parentTypeId" value="GOOD" operator="equals"/>
<entity-order-by field-name="description"/>
@@ -420,10 +420,10 @@ under the License.
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <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="INV_NON_SER_STTS"/>
</entity-options>
- <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="INV_SERIALIZED_STTS"/>
</entity-options>
</drop-down>
@@ -501,14 +501,14 @@ under the License.
</field>
<field name="shipmentMethodTypeId" title="${uiLabelMap.ProductShipmentMethodType}">
<drop-down allow-empty="false">
- <entity-options entity-name="ShipmentMethodType" description="${description}"/>
+ <entity-options entity-name="ShipmentMethodType"/>
</drop-down>
</field>
<field name="billingWeight" title="${uiLabelMap.CommonWeight}"><text size="10"/></field>
<field name="billingWeightUomId" title="${uiLabelMap.ProductWeightUomId}">
<drop-down allow-empty="false">
<option key="${defaultWeightUom.uomId}" description="${defaultWeightUom.description}"/>
- <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="WEIGHT_MEASURE"/>
</entity-options>
</drop-down>
@@ -586,7 +586,7 @@ under the License.
<field name="productQOH" title="${uiLabelMap.ProductProductQOH}"><display/></field>
<field name="varianceReasonId">
<drop-down allow-empty="false">
- <entity-options entity-name="VarianceReason" description="${description}"/>
+ <entity-options entity-name="VarianceReason"/>
</drop-down>
</field>
<field name="availableToPromiseVar" title="${uiLabelMap.ProductProductATPVar}" event="onchange" action="document.ListPhysicalInventory._rowSubmit_o_${itemIndex}.checked = true"><text size="6"/></field>
@@ -638,7 +638,7 @@ under the License.
<display-entity description="${groupName} ${firstName} ${lastName} [${partyId}]" entity-name="PartyNameView"/>
</field>
<field name="roleTypeId">
- <display-entity entity-name="RoleType" description="${description}"/>
+ <display-entity entity-name="RoleType"/>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
@@ -660,7 +660,7 @@ under the License.
</field>
<field name="roleTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="RoleType" description="${description}"/>
+ <entity-options entity-name="RoleType"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
@@ -863,14 +863,14 @@ under the License.
</field>
<field name="contentTypeId" title="${uiLabelMap.FormFieldTitle_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" title="${uiLabelMap.CommonStatus}">
<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>
@@ -908,7 +908,7 @@ under the License.
<field name="geoPointId"><hidden/></field>
<field name="dataSourceId">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="DataSource">
+ <entity-options entity-name="DataSource">
<entity-constraint name="dataSourceTypeId" value="GEOPOINT_SUPPLIER"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -919,7 +919,7 @@ under the License.
<field name="elevation"><text/></field>
<field name="elevationUomId">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="Uom" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" value="LENGTH_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml Sat Jun 20 21:58:05 2015
@@ -40,7 +40,7 @@ under the License.
<field name="facilityGroupId" use-when="facilityGroup==null"><hidden/></field>
<field name="facilityGroupTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="FacilityGroupType" key-field-name="facilityGroupTypeId" description="${description}">
+ <entity-options entity-name="FacilityGroupType" key-field-name="facilityGroupTypeId">
</entity-options>
</drop-down>
</field>
@@ -171,7 +171,7 @@ under the License.
</display-entity>
</field>
<field name="roleTypeId">
- <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removePartyFromFacilityGroup" description="${uiLabelMap.CommonRemove}" also-hidden="false">
Modified: ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml Sat Jun 20 21:58:05 2015
@@ -28,7 +28,7 @@ under the License.
<field name="parentFacilityId"><text-find/></field>
<field name="facilityTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="FacilityType" key-field-name="facilityTypeId">
+ <entity-options entity-name="FacilityType" key-field-name="facilityTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -65,7 +65,7 @@ under the License.
</field>
<field name="locationTypeEnumId">
<drop-down allow-empty="false">
- <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="FACLOC_TYPE"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -91,7 +91,7 @@ under the License.
</field>
<field name="facilityId"><hidden/></field>
<field name="locationTypeEnumId">
- <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
</form>
@@ -100,12 +100,12 @@ under the License.
<field position="1" name="shipmentId"><text-find/></field>
<field position="1" name="shipmentTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ShipmentType"/>
+ <entity-options entity-name="ShipmentType"/>
</drop-down>
</field>
<field position="2" name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="SHIPMENT_STATUS"/>
</entity-options>
</drop-down>
@@ -131,7 +131,7 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${shipmentId}" target="javascript:set_value('${shipmentId}')"/>
</field>
<field name="shipmentTypeId"><display-entity entity-name="ShipmentType"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
</form>
@@ -142,7 +142,7 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')"/>
</field>
<field name="locationTypeEnumId">
- <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="quantityOnHandTotal" title="${uiLabelMap.ProductQoh}"><display/></field>
<field name="availableToPromiseTotal" title="${uiLabelMap.ProductAtp}"><display/></field>
Modified: ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml Sat Jun 20 21:58:05 2015
@@ -44,7 +44,7 @@ under the License.
<field name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
<field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}">
<drop-down allow-empty="false">
- <entity-options entity-name="InventoryItemType" description="${description}" key-field-name="inventoryItemTypeId"/>
+ <entity-options entity-name="InventoryItemType" key-field-name="inventoryItemTypeId"/>
</drop-down>
</field>
<field name="productId" required-field="true" position="1">
@@ -56,24 +56,24 @@ under the License.
</field>
<field name="statusId" use-when="inventoryItem==null">
<drop-down allow-empty="true">
- <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="INV_NON_SER_STTS"/>
</entity-options>
- <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="INV_SERIALIZED_STTS"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" use-when="inventoryItem!=null&&"SERIALIZED_INV_ITEM".equals(inventoryItem.getString("inventoryItemTypeId"))">
<drop-down allow-empty="false">
- <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="INV_SERIALIZED_STTS"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" use-when="inventoryItem!=null&&"NON_SERIAL_INV_ITEM".equals(inventoryItem.getString("inventoryItemTypeId"))">
<drop-down allow-empty="true">
- <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="INV_NON_SER_STTS"/>
</entity-options>
</drop-down>
@@ -160,7 +160,7 @@ under the License.
<field name="inventoryItemId" map-name="inventoryItem"><hidden/></field>
<field name="varianceReasonId">
<drop-down>
- <entity-options entity-name="VarianceReason" description="${description}">
+ <entity-options entity-name="VarianceReason">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -201,7 +201,7 @@ under the License.
</hyperlink>
</field>
<field name="reasonEnumId">
- <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<!-- workEffortId - not sure if it's better to show manufacturing or workeffort app
itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml Sat Jun 20 21:58:05 2015
@@ -32,12 +32,12 @@ under the License.
<field name="shipmentTypeId" title="${uiLabelMap.ProductShipmentTypeId}">
<drop-down allow-empty="false" current="first-in-list">
- <entity-options entity-name="ShipmentType" description="${description}"/>
+ <entity-options entity-name="ShipmentType"/>
</drop-down>
</field>
<field use-when="shipment==null" name="statusId" title="${uiLabelMap.ProductStatusId}">
<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="${statusItemTypeId}"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml Sat Jun 20 21:58:05 2015
@@ -25,7 +25,7 @@ under the License.
<field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
<field name="shipmentGatewayConfTypeId" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
<drop-down allow-empty="true">
- <entity-options entity-name="ShipmentGatewayConfigType" description="${description}" key-field-name="shipmentGatewayConfTypeId">
+ <entity-options entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -53,7 +53,7 @@ under the License.
<hyperlink description="${description}" target="EditShipmentGatewayConfig?shipmentGatewayConfigId=${shipmentGatewayConfigId}"/>
</field>
<field name="shipmentGatewayConfTypeId" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
- <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId" description="${description}"/>
+ <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId"/>
</field>
</form>
@@ -61,7 +61,7 @@ under the License.
<field name="shipmentGatewayConfigId"><hidden/></field>
<field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
<field name="shipmentGatewayConfTypeId" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
- <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId" description="${description}"/>
+ <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
<submit button-type="button"/>
@@ -335,7 +335,7 @@ under the License.
<field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
<field name="parentTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="ShipmentGatewayConfigType" description="${description}" key-field-name="shipmentGatewayConfTypeId">
+ <entity-options entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId">
<entity-constraint name="shipmentGatewayConfTypeId" operator="not-equals" env-name="shipmentGatewayConfTypeId"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml Sat Jun 20 21:58:05 2015
@@ -24,7 +24,7 @@ under the License.
<form name="FilterCalendarEvents" type="single" target="calendar">
<field name="calendarType">
<drop-down allow-empty="false">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="CALENDAR_TYPE"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -35,7 +35,7 @@ under the License.
</field>
<field name="workEffortTypeId" title="${uiLabelMap.PartyEventType}">
<drop-down allow-empty="true">
- <entity-options entity-name="WorkEffortType" description="${description}">
+ <entity-options entity-name="WorkEffortType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -91,7 +91,7 @@ under the License.
<!-- This is wrong. A calendar item work effort type is an EVENT. "Meeting" is a work effort purpose. -->
<field name="workEffortTypeId" use-when="parentTypeId!=void" title="${uiLabelMap.PartyEventType}">
<drop-down no-current-selected-key="MEETING">
- <entity-options entity-name="WorkEffortType" description="${description}">
+ <entity-options entity-name="WorkEffortType">
<entity-constraint name="parentTypeId" env-name="parentTypeId" />
<entity-order-by field-name="description" />
</entity-options>
@@ -99,21 +99,21 @@ under the License.
</field>
<field name="workEffortTypeId" use-when="parentTypeId==void" title="${uiLabelMap.PartyEventType}">
<drop-down>
- <entity-options entity-name="WorkEffortType" description="${description}">
+ <entity-options entity-name="WorkEffortType">
<entity-order-by field-name="description" />
</entity-options>
</drop-down>
</field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
<drop-down no-current-selected-key="CAL_TENTATIVE">
- <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="in" env-name="statusTypeIds"/>
</entity-options>
</drop-down>
</field>
<field name="scopeEnumId">
<drop-down no-current-selected-key="WES_PRIVATE">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE" />
<entity-order-by field-name="description" />
</entity-options>
@@ -137,13 +137,13 @@ under the License.
<field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="workEffortTypeId" title="${uiLabelMap.PartyEventType}">
- <display-entity entity-name="WorkEffortType" description="${description}"/>
+ <display-entity entity-name="WorkEffortType"/>
</field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="scopeEnumId">
- <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ <display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="estimatedStartDate"><display type="date-time"></display></field>
<field name="estimatedCompletionDate"><display type="date-time"></display></field>
@@ -163,9 +163,9 @@ under the License.
<field name="partyId" >
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName} ${firstName} ${middleName}"/>
</field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="statusId" use-when="workEffort!=null">
- <display-entity entity-name="StatusItem" description="${description}"/>
+ <display-entity entity-name="StatusItem"/>
</field>
</form>
<form name="showCalEventRolesDel" type="list" extends="showCalEventRoles" target="deleteWorkEffortPartyAssign">
@@ -177,7 +177,7 @@ under the License.
<field name="partyId" position="1"><lookup target-form-name="LookupPartyName" size="10"></lookup></field>
<field name="roleTypeId" position="2">
<drop-down no-current-selected-key="CAL_ATTENDEE">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="CALENDAR_ROLE"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Sat Jun 20 21:58:05 2015
@@ -29,14 +29,14 @@ under the License.
<field name="workEffortName"><text-find/></field>
<field name="workEffortTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+ <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="workEffortPurposeTypeId" >
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -63,7 +63,7 @@ under the License.
<field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="scopeEnumId">
<drop-down allow-empty="true">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -97,14 +97,14 @@ under the License.
<field name="workEffortName"><text-find/></field>
<field name="workEffortTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+ <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="workEffortPurposeTypeId" >
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Sat Jun 20 21:58:05 2015
@@ -54,7 +54,7 @@ under the License.
<field name="partyId" map-name="userLogin"><hidden/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD" >
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -106,7 +106,7 @@ under the License.
<field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}*" position="1">
<drop-down no-current-selected-key="TIMESHEET_IN_PROCESS">
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -188,7 +188,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRole}">
<drop-down>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -215,7 +215,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down>
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -253,7 +253,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Jun 20 21:58:05 2015
@@ -24,7 +24,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<field name="statusId">
<drop-down no-current-selected-key="SERVICE_RUNNING">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="SERVICE_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -36,7 +36,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
<field name="statusId">
- <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+ <display-entity entity-name="StatusItem"></display-entity>
</field>
<field name="poolId"><hidden/></field>
<field name="parentJobId"><hidden/></field>
@@ -61,14 +61,14 @@ under the License.
<field name="workEffortName" title="${uiLabelMap.CommonName}*"/>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}*" position="1">
<drop-down>
- <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+ <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}" position="2">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -106,7 +106,7 @@ under the License.
</field>
<field name="scopeEnumId" position="2">
<drop-down no-current-selected-key="WES_PRIVATE">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -191,14 +191,14 @@ under the License.
<field name="workEffortParentId" position="2"><text-find/></field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+ <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="workEffortPurposeTypeId" position="2" title="${uiLabelMap.CommonPurpose}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -238,7 +238,7 @@ under the License.
<field name="fixedAssetId" position="2"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="scopeEnumId">
<drop-down allow-empty="true">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -294,7 +294,7 @@ under the License.
<field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="workEffortAssocTypeId">
<drop-down>
- <entity-options entity-name="WorkEffortAssocType" description="${description}">
+ <entity-options entity-name="WorkEffortAssocType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -322,7 +322,7 @@ under the License.
<field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="workEffortAssocTypeId">
<drop-down>
- <entity-options entity-name="WorkEffortAssocType" description="${description}">
+ <entity-options entity-name="WorkEffortAssocType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -416,7 +416,7 @@ under the License.
</hyperlink>
</field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
- <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="WorkEffortPurposeType"/></field>
<field name="description"><display/></field>
<field name="priority"><display/></field>
@@ -483,7 +483,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down no-current-selected-key="CLPT_PENDING">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -552,7 +552,7 @@ under the License.
<field name="communicationEventId" use-when="communicationEvent!=null"><display/></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>
@@ -562,7 +562,7 @@ under the License.
<field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
<field name="statusId" use-when="communicationEvent==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="COM_EVENT_STATUS"/>
</entity-options>
</drop-down>
@@ -578,21 +578,21 @@ under the License.
<field name="contactMechTypeId" 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">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="contactMechTypeId" 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">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="contactMechTypeId" 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">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -600,14 +600,14 @@ under the License.
<field name="roleTypeIdFrom" use-when="commEventRoleTypeIdFrom!=null">
<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>
</field>
<field name="roleTypeIdTo" use-when="commEventRoleTypeIdTo!=null">
<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>
@@ -668,16 +668,16 @@ under the License.
<display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
</field>
<field name="statusId">
- <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="contactMechTypeId">
- <display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ <display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</field>
<field name="roleTypeIdFrom">
- <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="roleTypeIdTo">
- <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+ <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>
@@ -704,21 +704,21 @@ under the License.
<field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="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">
<entity-order-by field-name="description"/>
</entity-options>
</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">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -749,16 +749,16 @@ under the License.
<display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
</field>
<field name="statusId">
- <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="contactMechTypeId">
- <display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ <display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</field>
<field name="roleTypeIdFrom">
- <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="roleTypeIdTo">
- <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+ <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="custReqestId" position="1"><text size="20"/>
</field>
@@ -782,7 +782,7 @@ under the License.
<field name="rateCurrencyUomId"><hidden/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType"/></field>
<field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
- <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+ <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
<field name="deleteButton" widget-style="smallSubmit"><submit /></field>
</form>
<form name="AddWorkEffortRate" type="single" target="updateWorkEffortRate" title=""
@@ -794,14 +794,14 @@ under the License.
<field name="workEffortId"><hidden/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="periodTypeId" position="2">
<drop-down>
- <entity-options entity-name="PeriodType" description="${description}">
+ <entity-options entity-name="PeriodType">
<entity-constraint name="periodTypeId" operator="like" value="RATE_%"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -843,7 +843,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -876,7 +876,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -970,7 +970,7 @@ under the License.
</field>
<field name="workEffortContentTypeId">
<drop-down no-current-selected-key="">
- <entity-options entity-name="WorkEffortContentType" description="${description}" key-field-name="workEffortContentTypeId">
+ <entity-options entity-name="WorkEffortContentType" key-field-name="workEffortContentTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -993,7 +993,7 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
+ <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
@@ -1016,14 +1016,14 @@ under the License.
</field>
<field name="workEffortGoodStdTypeId">
<drop-down no-current-selected-key="">
- <entity-options entity-name="WorkEffortGoodStandardType" description="${description}" key-field-name="workEffortGoodStdTypeId">
+ <entity-options entity-name="WorkEffortGoodStandardType" key-field-name="workEffortGoodStdTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1040,7 +1040,7 @@ under the License.
</actions>
<auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
- <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
+ <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType"/></field>
<field name="productId">
<display-entity entity-name="Product" key-field-name="productId" description="${productName}" also-hidden="true">
<sub-hyperlink target="/catalog/control/EditProduct" description="${productId}" link-style="buttontext" target-type="inter-app">
@@ -1051,7 +1051,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1079,7 +1079,7 @@ under the License.
<field name="reviewDate"><date-time/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}*" position="1">
<drop-down>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="WEFF_REVIEW_STTS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1107,7 +1107,7 @@ under the License.
<field name="reviewDate"><display/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}*">
<drop-down>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="WEFF_REVIEW_STTS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1239,7 +1239,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="FA_ASGN_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -1247,7 +1247,7 @@ under the License.
</field>
<field name="availabilityStatusId">
<drop-down no-current-selected-key="WEFA_IN_USE">
- <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="WEFA_AVAILABILITY"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -1291,7 +1291,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="FA_ASGN_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -1299,7 +1299,7 @@ under the License.
</field>
<field name="availabilityStatusId">
<drop-down no-current-selected-key="WEFA_IN_USE">
- <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="WEFA_AVAILABILITY"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -1362,7 +1362,7 @@ under the License.
<field name="workEffortName" title="${uiLabelMap.WorkEffortICalendarName}" widget-style="required" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
<field name="scopeEnumId" title="${uiLabelMap.WorkEffortICalendarVisibility}">
<drop-down no-current-selected-key="WES_PRIVATE">
- <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1400,7 +1400,7 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down allow-empty="false">
- <list-options list-name="roleList" key-name="roleTypeId" description="${description}"/>
+ <list-options list-name="roleList" key-name="roleTypeId"/>
</drop-down>
</field>
<field name="fromDate"><date-time/></field>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml Sat Jun 20 21:58:05 2015
@@ -42,7 +42,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down no-current-selected-key="PARTYASSIGN_UNASSIGNED">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="PRTYASGN_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -50,7 +50,7 @@ under the License.
</field>
<field name="availabilityStatusId">
<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="WEPA_AVAILABILITY"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -58,7 +58,7 @@ under the License.
</field>
<field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
<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="WORK_EFF_EXPECT"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -66,7 +66,7 @@ under the License.
</field>
<field name="delegateReasonEnumId" title="${uiLabelMap.WorkEffortDelegateReason}">
<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="WORK_EFF_DEL_REAS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -84,7 +84,7 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -93,7 +93,7 @@ under the License.
<field name="thruDate"><date-time/></field>
<field name="statusId">
<drop-down no-current-selected-key="PRTYASGN_ASSIGNED">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="PRTYASGN_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -101,7 +101,7 @@ under the License.
</field>
<field name="availabilityStatusId">
<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="WEPA_AVAILABILITY"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -109,7 +109,7 @@ under the License.
</field>
<field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
<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="WORK_EFF_EXPECT"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -117,7 +117,7 @@ under the License.
</field>
<field name="delegateReasonEnumId" title="${uiLabelMap.WorkEffortDelegateReason}">
<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="WORK_EFF_DEL_REAS"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Sat Jun 20 21:58:05 2015
@@ -50,7 +50,7 @@ under the License.
<field name="requirementId"><lookup target-form-name="/ordermgr/control/LookupRequirement"/></field>
<field name="workReqFulfTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="WorkReqFulfType" description="${description}">
+ <entity-options entity-name="WorkReqFulfType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupForms.xml Sat Jun 20 21:58:05 2015
@@ -25,7 +25,7 @@ under the License.
<field name="geoId" title="${uiLabelMap.CommonGeoId}"><text-find/></field>
<field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
<drop-down allow-empty="true">
- <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">
+ <entity-options key-field-name="geoTypeId" entity-name="GeoType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -51,7 +51,7 @@ under the License.
<hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_value('${geoId}')"/>
</field>
<field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
- <display-entity key-field-name="geoTypeId" entity-name="GeoType" description="${description}"/>
+ <display-entity key-field-name="geoTypeId" entity-name="GeoType"/>
</field>
<field name="geoName" title="${uiLabelMap.CommonGeoName}"><display/></field>
<field name="geoCode" title="${uiLabelMap.CommonGeoCode}"><display/></field>
Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml Sat Jun 20 21:58:05 2015
@@ -27,7 +27,7 @@
<field name="geoPointId" title="${uiLabelMap.CommonId}"><text-find/></field>
<field name="dataSourceId" title="${uiLabelMap.Source}">
<drop-down allow-empty="true">
- <entity-options entity-name="DataSource" description="${description}">
+ <entity-options entity-name="DataSource">
<entity-constraint name="dataSourceTypeId" value="GEOPOINT_SUPPLIER"/>
</entity-options>
</drop-down>
@@ -83,7 +83,7 @@
<field name="geoId" title="${uiLabelMap.CommonGeoId}"><text/></field>
<field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
<drop-down allow-empty="true">
- <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">
+ <entity-options key-field-name="geoTypeId" entity-name="GeoType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -118,7 +118,7 @@
event="onChange"
action="typeValue = jQuery('#${asm_typeField}').val(); selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');">
<drop-down>
- <entity-options key-field-name="geoAssocTypeId" entity-name="GeoAssocType" description="${description}">
+ <entity-options key-field-name="geoAssocTypeId" entity-name="GeoAssocType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceForms.xml Sat Jun 20 21:58:05 2015
@@ -62,7 +62,7 @@ under the License.
<field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text-find/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+ <entity-options key-field-name="statusId" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="SERVICE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -98,7 +98,7 @@ under the License.
<parameter param-name="sel_service_name" from-field="serviceName"/>
</hyperlink>
</field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="finishDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field>
<field name="cancelButton" title=" " use-when="startDateTime==null&&finishDateTime==null&&cancelDateTime==null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob">