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 [3/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/content/widget/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml Sat Jun 20 21:58:05 2015
@@ -50,7 +50,7 @@ under the License.
</field>
<field name="visualThemeSetId">
<drop-down allow-empty="true">
- <entity-options entity-name="VisualThemeSet" description="${description}">
+ <entity-options entity-name="VisualThemeSet">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -183,7 +183,7 @@ under the License.
<field name="contentId"><lookup target-form-name="LookupContent"/></field>
<field name="webSiteContentTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="WebSiteContentType" description="${description}">
+ <entity-options entity-name="WebSiteContentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -199,7 +199,7 @@ under the License.
<field name="webSiteId" map-name="webSite"><hidden/></field>
<field name="roleTypeId">
<drop-down no-current-selected-key="_NA_">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -236,7 +236,7 @@ under the License.
<field name="webSiteId"><hidden/></field>
<field name="webSiteContentTypeId">
<check all-checked="false">
- <entity-options entity-name="WebSiteContentType" description="${description}">
+ <entity-options entity-name="WebSiteContentType">
<entity-order-by field-name="description"/>
</entity-options>
</check>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Sat Jun 20 21:58:05 2015
@@ -26,17 +26,17 @@
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="leaveTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
+ <entity-options key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
</drop-down>
</field>
<field name="emplLeaveReasonTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
+ <entity-options key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
</drop-down>
</field>
<field name="leaveStatus">
<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="LEAVE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -100,12 +100,12 @@
<field name="approverPartyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
<field name="leaveTypeId" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
+ <entity-options key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
</drop-down>
</field>
<field name="emplLeaveReasonTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
+ <entity-options key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
</drop-down>
</field>
<field name="fromDate" tooltip="${uiLabelMap.CommonRequired}"><date-time type="date"/></field>
@@ -121,7 +121,7 @@
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="leaveStatus">
<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="LEAVE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -175,7 +175,7 @@
<field name="description"><display/></field>
<field name="leaveStatus" title="${uiLabelMap.HumanResLeaveStatus}">
<drop-down allow-empty="false">
- <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="LEAVE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sat Jun 20 21:58:05 2015
@@ -44,8 +44,8 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
- <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
+ <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType"/></field>
</form>
<form name="ListEmplPositionsParty" extends="ListEmplPositions" list-name="ListEmplPositions">
<actions>
@@ -80,7 +80,7 @@ under the License.
</field>-->
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
- <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="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -90,7 +90,7 @@ under the License.
<field name="budgetItemSeqId"><lookup target-form-name="LookupBudgetItem"/></field>
<field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmployeePositionTypeId}">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType">
+ <entity-options key-field-name="emplPositionTypeId" entity-name="EmplPositionType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -308,7 +308,7 @@ under the License.
<parameter param-name="partyId" from-field="emplPosition.partyId"/>
</sub-hyperlink>
</display-entity></field>
- <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType" description="${description}">
+ <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType">
<sub-hyperlink target="EditEmplPositionTypes" description="[${emplPosition.emplPositionTypeId}]">
<parameter param-name="emplPositionTypeId" from-field="emplPosition.emplPositionTypeId"/>
</sub-hyperlink>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Sat Jun 20 21:58:05 2015
@@ -70,7 +70,7 @@
<field name="partyId"><hidden/></field>
<field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down>
- <entity-options description="${description}" entity-name="SkillType">
+ <entity-options entity-name="SkillType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -90,7 +90,7 @@
</actions>
<auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>
<field name="skillTypeId">
- <display-entity entity-name="SkillType" description="${description}"/>
+ <display-entity entity-name="SkillType"/>
</field>
<field name="yearsExperience"><text/></field>
<field name="rating"><text/></field>
@@ -108,14 +108,14 @@
<field name="partyId"><hidden/></field>
<field name="partyQualTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+ <entity-options key-field-name="partyQualTypeId" entity-name="PartyQualType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId">
<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="PARTY_INV_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -123,7 +123,7 @@
</field>
<field name="verifStatusId">
<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="PARTYQUAL_VERIFY"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -141,13 +141,13 @@
</actions>
<auto-fields-service service-name="updatePartyQual"/>
<field name="partyId"><hidden/></field>
- <field name="partyQualTypeId"><display-entity entity-name="PartyQualType" description="${description}"/></field>
+ <field name="partyQualTypeId"><display-entity entity-name="PartyQualType"/></field>
<field name="fromDate"><display/></field>
<field name="qualificationDesc"><text/></field>
<field name="title"><text/></field>
<field name="statusId">
<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="PARTY_INV_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -155,7 +155,7 @@
</field>
<field name="verifStatusId">
<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="PARTYQUAL_VERIFY"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -175,7 +175,7 @@
<field name="partyId"><hidden/></field>
<field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="TrainingClassType">
+ <entity-options entity-name="TrainingClassType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -189,12 +189,12 @@
<field name="partyId"><hidden/></field>
<field name="leaveTypeId" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
+ <entity-options key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
</drop-down>
</field>
<field name="emplLeaveReasonTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
+ <entity-options key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
</drop-down>
</field>
<field name="fromDate" tooltip="${uiLabelMap.CommonRequired}"><date-time type="timestamp"></date-time></field>
@@ -216,7 +216,7 @@
<field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="emplLeaveReasonTypeId"><display/></field>
- <field name="leaveTypeId"><display-entity description="${description}" entity-name="EmplLeaveType"/></field>
+ <field name="leaveTypeId"><display-entity entity-name="EmplLeaveType"/></field>
<field name="fromDate"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Sat Jun 20 21:58:05 2015
@@ -42,7 +42,7 @@ under the License.
<field name="applicationId" title="${uiLabelMap.HumanResApplicationId}"><display also-hidden="true"/></field>
<field name="statusId">
<drop-down allow-empty="true" current-description="">
- <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="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -80,7 +80,7 @@ under the License.
<field name="applicationId"><lookup target-form-name="LookupEmploymentApp"/></field>
<field name="statusId">
<drop-down allow-empty="true" current-description="">
- <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="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -88,7 +88,7 @@ under the License.
</field>
<field name="employmentAppSourceTypeId">
<drop-down allow-empty="true" current-description="">
- <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+ <entity-options key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -115,7 +115,7 @@ under the License.
<field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
<field name="statusId">
<drop-down allow-empty="true" current-description="">
- <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="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -126,7 +126,7 @@ under the License.
<field name="referredByPartyId" use-when="employmentApp!=null"><hidden/></field>
<field name="employmentAppSourceTypeId">
<drop-down allow-empty="true" current-description="">
- <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+ <entity-options key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
<entity-order-by field-name="employmentAppSourceTypeId"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Jun 20 21:58:05 2015
@@ -39,7 +39,7 @@
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
<field name="terminationTypeId">
<drop-down allow-empty="true" current-description="">
- <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
+ <entity-options key-field-name="terminationTypeId" entity-name="TerminationType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -130,14 +130,14 @@
<field name="thruDate" use-when="employment!=null" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}">
<drop-down allow-empty="true" no-current-selected-key="------">
- <entity-options description="${description}" key-field-name="terminationReasonId" entity-name="TerminationReason">
+ <entity-options key-field-name="terminationReasonId" entity-name="TerminationReason">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="terminationTypeId" use-when="employment!=null">
<drop-down allow-empty="true" no-current-selected-key="------">
- <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
+ <entity-options key-field-name="terminationTypeId" entity-name="TerminationType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -170,7 +170,7 @@
<field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}"><lookup target-form-name="LookupPayGrade" size="20"/></field>
<field name="periodTypeId" title="${uiLabelMap.FormFieldTitle_periodTypeId}">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+ <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -196,11 +196,11 @@
<field name="roleTypeIdTo"><hidden/></field>
<field name="partyIdFrom"><hidden/></field>
<field name="partyIdTo"><hidden/></field>
- <field name="benefitTypeId"><display-entity entity-name="BenefitType" description="${description}"/></field>
+ <field name="benefitTypeId"><display-entity entity-name="BenefitType"/></field>
<field name="fromDate"><display/></field>
<field name="periodTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+ <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -229,7 +229,7 @@
<field name="fromDate"><hidden/></field>
<field name="benefitTypeId" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="benefitTypeId" entity-name="BenefitType">
+ <entity-options key-field-name="benefitTypeId" entity-name="BenefitType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -237,7 +237,7 @@
<field name="fromDate" tooltip="${uiLabelMap.CommonRequired}"/>
<field name="periodTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+ <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -257,10 +257,10 @@
</actions>
<auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/>
<field name="partyId"><display/></field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><display also-hidden="true"/></field>
- <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field>
- <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+ <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType"/></field>
+ <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
@@ -282,21 +282,21 @@
<field name="fromDate"><hidden/></field>
<field name="deductionTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="deductionTypeId" entity-name="DeductionType">
+ <entity-options key-field-name="deductionTypeId" entity-name="DeductionType">
<entity-order-by field-name="deductionTypeId"/>
</entity-options>
</drop-down>
</field>
<field name="paymentMethodTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="paymentMethodTypeId" entity-name="PaymentMethodType">
+ <entity-options key-field-name="paymentMethodTypeId" entity-name="PaymentMethodType">
<entity-order-by field-name="paymentMethodTypeId"/>
</entity-options>
</drop-down>
</field>
<field name="periodTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+ <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
<entity-order-by field-name="periodTypeId"/>
</entity-options>
</drop-down>
@@ -323,7 +323,7 @@
<field name="partyId"><hidden/></field>
<field name="roleTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+ <entity-options key-field-name="roleTypeId" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -353,7 +353,7 @@
<field name="description"><text size="12"/></field>
<field name="statusId">
<drop-down allow-empty="false">
- <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="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -378,7 +378,7 @@
<field name="unemploymentClaimId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupUnemploymentClaim"/></field>
<field name="statusId">
<drop-down allow-empty="false">
- <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="EMPL_POSITION_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -428,14 +428,14 @@
<field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+ <entity-options key-field-name="roleTypeId" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="roleTypeIdTo" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+ <entity-options key-field-name="roleTypeId" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sat Jun 20 21:58:05 2015
@@ -93,7 +93,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="emplPositionTypeId">
<drop-down allow-empty="true">
- <entity-options entity-name="EmplPositionType" description="${description}" key-field-name="emplPositionTypeId"/>
+ <entity-options entity-name="EmplPositionType" key-field-name="emplPositionTypeId"/>
</drop-down>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
@@ -155,9 +155,9 @@ under the License.
<field name="emplPositionTypeId"><hidden/></field>
<field name="fromDate"><hidden/></field>
<field name="rateAmountFromDate"><hidden/></field>
- <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
- <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
- <field name="payGradeId"><display-entity entity-name="PayGrade" description="${description}"/></field>
+ <field name="rateTypeId"><display-entity entity-name="RateType"/></field>
+ <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
+ <field name="payGradeId"><display-entity entity-name="PayGrade"/></field>
<field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
<field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
<field name="deleteButton" widget-style="buttontext"><submit/></field>
@@ -170,7 +170,7 @@ under the License.
<field name="emplPositionTypeId"><hidden value="${parameters.emplPositionTypeId}"/></field>
<field name="rateTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down>
- <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType">
+ <entity-options key-field-name="rateTypeId" entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -178,7 +178,7 @@ under the License.
<field name="payGradeId" position="2"><lookup target-form-name="LookupPayGrade"/></field>
<field name="periodTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="false" no-current-selected-key="RATE_MONTH">
- <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+ <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
<entity-order-by field-name="periodTypeId"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Sat Jun 20 21:58:05 2015
@@ -26,7 +26,7 @@ under the License.
<field name="budgetId" title="${uiLabelMap.HumanResBudgetID}"><text-find/></field>
<field name="budgetTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="budgetTypeId" entity-name="BudgetType"></entity-options>
+ <entity-options key-field-name="budgetTypeId" entity-name="BudgetType"></entity-options>
</drop-down>
</field>
<!-- This lookup does not exist, is there for a long time? (I did not find its date of introduction, the older I found is r615322) and I can't see anything close -->
@@ -55,7 +55,7 @@ under the License.
<field name="budgetItemSeqId" title="${uiLabelMap.HumanResBudgetItemSeqId}"><text-find/></field>
<field name="budgetItemTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="budgetItemTypeId" entity-name="BudgetItemType"></entity-options>
+ <entity-options key-field-name="budgetItemTypeId" entity-name="BudgetItemType"></entity-options>
</drop-down>
</field>
<field name="budgetId"><lookup target-form-name="LookupBudget"/></field>
@@ -83,12 +83,12 @@ under the License.
<field name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><text-find/></field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"></entity-options>
+ <entity-options key-field-name="statusId" entity-name="StatusItem"></entity-options>
</drop-down>
</field>
<field name="emplPositionTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options>
+ <entity-options key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options>
</drop-down>
</field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -320,14 +320,14 @@ under the License.
<field name="location"><text-find ignore-case="true"/></field>
<field name="skillTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType">
+ <entity-options entity-name="SkillType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="jobPostingTypeEnumId">
<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" operator="equals" value="JOB_POSTING"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Sat Jun 20 21:58:05 2015
@@ -26,14 +26,14 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyQualTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+ <entity-options key-field-name="partyQualTypeId" entity-name="PartyQualType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId">
<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="HR_DEGREE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -41,7 +41,7 @@ under the License.
</field>
<field name="verifStatusId">
<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="PARTYQUAL_VERIFY"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -70,13 +70,13 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
- <field name="partyQualTypeId"><display-entity entity-name="PartyQualType" description="${description}"/></field>
+ <field name="partyQualTypeId"><display-entity entity-name="PartyQualType"/></field>
<field name="fromDate"><display/></field>
<field name="qualificationDesc"><text/></field>
<field name="title"><text/></field>
<field name="statusId">
<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="HR_DEGREE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -84,7 +84,7 @@ under the License.
</field>
<field name="verifStatusId">
<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="PARTYQUAL_VERIFY"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -109,14 +109,14 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="partyQual==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyQualTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+ <entity-options key-field-name="partyQualTypeId" entity-name="PartyQualType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId">
<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="HR_DEGREE_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -124,7 +124,7 @@ under the License.
</field>
<field name="verifStatusId">
<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="PARTYQUAL_VERIFY"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml Sat Jun 20 21:58:05 2015
@@ -26,7 +26,7 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="skillTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType">
+ <entity-options entity-name="SkillType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -50,7 +50,7 @@ under the License.
</actions>
<auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>
<field name="skillTypeId">
- <display-entity entity-name="SkillType" description="${description}"/>
+ <display-entity entity-name="SkillType"/>
</field>
<field name="yearsExperience"><text/></field>
<field name="rating"><text/></field>
@@ -73,7 +73,7 @@ under the License.
<field name="partyId" use-when="partySkill == null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
<field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down>
- <entity-options description="${description}" entity-name="SkillType">
+ <entity-options entity-name="SkillType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Jun 20 21:58:05 2015
@@ -78,7 +78,7 @@ under the License.
<field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="managerRoleTypeId">
<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"/>
</drop-down>
</field>
<field name="paymentId" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field>
@@ -118,14 +118,14 @@ under the License.
<field name="employeeRoleTypeId"><hidden/></field>
<field name="perfReviewItemTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="perfReviewItemTypeId" entity-name="PerfReviewItemType">
+ <entity-options key-field-name="perfReviewItemTypeId" entity-name="PerfReviewItemType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="perfRatingTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="perfRatingTypeId" entity-name="PerfRatingType">
+ <entity-options key-field-name="perfRatingTypeId" entity-name="PerfRatingType">
<entity-order-by field-name="-perfRatingTypeId"/><!-- order from good to bad -->
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Sat Jun 20 21:58:05 2015
@@ -41,7 +41,7 @@ under the License.
<field name="currentStatusId"><hidden value="CAL_TENTATIVE"/></field>
<field name="workEffortName" title="${uiLabelMap.HumanResTrainings} ${uiLabelMap.CommonName}">
<drop-down allow-empty="false">
- <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+ <entity-options key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -89,7 +89,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+ <entity-options key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -142,7 +142,7 @@ under the License.
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/>
<field name="approvalStatus">
<drop-down allow-empty="false">
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="TRAINING_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -158,7 +158,7 @@ under the License.
<field name="partyId"><hidden value="${loginPartyId}"/></field>
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}">
<drop-down allow-empty="true">
- <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+ <entity-options key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Sat Jun 20 21:58:05 2015
@@ -28,14 +28,14 @@ under the License.
<field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field>
<field name="skillTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType">
+ <entity-options entity-name="SkillType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="jobPostingTypeEnumId">
<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" operator="equals" value="JOB_POSTING"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -44,7 +44,7 @@ under the License.
<field name="jobLocation"><text-find ignore-case="true"/></field>
<field name="examTypeEnumId">
<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" operator="equals" value="EXAM_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -77,7 +77,7 @@ under the License.
</field>
<field name="jobRequisitionId" use-when="!hasAdminPermission"><display/></field>
<field name="skillTypeId">
- <display-entity entity-name="SkillType" description="${description}"/>
+ <display-entity entity-name="SkillType"/>
</field>
<field name="jobPostingTypeEnumId"><display/></field>
<field name="examTypeEnumId"><display/></field>
@@ -113,14 +113,14 @@ under the License.
<field name="durationMonths"><text/></field>
<field name="qualification" widget-style="required" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="true">
- <entity-options entity-name="PartyQualType" key-field-name="partyQualTypeId" description="${description}">
+ <entity-options entity-name="PartyQualType" key-field-name="partyQualTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="examTypeEnumId">
<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" operator="equals" value="EXAM_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -129,7 +129,7 @@ under the License.
<field name="skillCriteria" title="${uiLabelMap.HumanResSkills} ${uiLabelMap.CommonRequired}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="SkillType">
+ <entity-options entity-name="SkillType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -147,7 +147,7 @@ under the License.
<field name="applyingPartyId" use-when="!hasAdminPermission"><hidden value="${partyId}"/></field>
<field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
<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="IJP_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -246,7 +246,7 @@ under the License.
</field>
<field name="gradeSecuredEnumId">
<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" operator="equals" value="INTR_RATNG"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -303,7 +303,7 @@ under the License.
<field name="jobInterviewerPartyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
<field name="gradeSecuredEnumId">
<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" operator="equals" value="INTR_RATNG"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -336,7 +336,7 @@ under the License.
<field name="referredByPartyId"><hidden/></field>
<field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
<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="IJP_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -388,7 +388,7 @@ under the License.
<field name="approverPartyId"><display/></field>
<field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
- <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="IJP_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml Sat Jun 20 21:58:05 2015
@@ -28,7 +28,7 @@ under the License.
</field>
<field name="bomType" title="${uiLabelMap.ManufacturingBomType}">
<drop-down allow-empty="false" no-current-selected-key="MANUF_COMPONENT">
- <entity-options entity-name="ProductAssocType" key-field-name="productAssocTypeId" description="${description}">
+ <entity-options entity-name="ProductAssocType" key-field-name="productAssocTypeId">
<entity-constraint name="parentTypeId" value="PRODUCT_COMPONENT"/>
</entity-options>
</drop-down>
@@ -149,7 +149,7 @@ under the License.
</field>
<field name="internalName" title="${uiLabelMap.ProductProductName}"><display/></field>
<field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}">
- <display-entity entity-name="ProductAssocType" key-field-name="productAssocTypeId" description="${description}"/>
+ <display-entity entity-name="ProductAssocType" key-field-name="productAssocTypeId"/>
</field>
</form>
</forms>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml Sat Jun 20 21:58:05 2015
@@ -130,7 +130,7 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}" position="2" ></field>
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}" position="3" >
<drop-down>
- <entity-options entity-name="TechDataCalendarWeek" description="${description}">
+ <entity-options entity-name="TechDataCalendarWeek">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -150,7 +150,7 @@ under the License.
<field name="exceptionDateStart" title="${uiLabelMap.ManufacturingExceptionDateStart}" ><date-time type="date"/></field>
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}">
<drop-down>
- <entity-options entity-name="TechDataCalendarWeek" description="${description}">
+ <entity-options entity-name="TechDataCalendarWeek">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Sat Jun 20 21:58:05 2015
@@ -59,7 +59,7 @@ under the License.
</field>
<field name="costCustomMethodId">
<drop-down allow-empty="true">
- <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+ <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
<entity-constraint name="customMethodTypeId" operator="equals" value="COST_FORMULA"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml Sat Jun 20 21:58:05 2015
@@ -44,7 +44,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>
@@ -63,7 +63,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>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Sat Jun 20 21:58:05 2015
@@ -27,14 +27,14 @@ under the License.
<field name="partyId" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" required-field="true">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="RoleType">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="workEffortId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffort" key-field-name="workEffortId">
+ <entity-options entity-name="WorkEffort" key-field-name="workEffortId">
<entity-constraint name="workEffortParentId" operator="equals" value="${productionRunId}"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -71,7 +71,7 @@ under the License.
<field name="workEffortId" title="${uiLabelMap.ManufacturingProductionRunId}"><text-find/></field>
<field name="currentStatusId" 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="PRODUCTION_RUN"/>
</entity-options>
</drop-down>
@@ -123,7 +123,7 @@ under the License.
<display-entity entity-name="Product" description="${internalName} [${productId}]"/>
</field>
<field name="currentStatusId">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="manufacturerId">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName} [${partyId}]"/>
@@ -176,7 +176,7 @@ under the License.
</hyperlink>
</field>
<field name="lotId" map-name="inventoryItem"><display/></field>
- <field name="statusId" map-name="inventoryItem"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="statusId" map-name="inventoryItem"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="unitCost" map-name="inventoryItem"><display/></field>
<field name="quantity" entry-name="quantityOnHandDiff"><display/></field>
<field name="datetimeReceived" map-name="inventoryItem"><display/></field>
@@ -274,7 +274,7 @@ under the License.
<display-entity entity-name="Product" description="${internalName} [${productId}]"/>
</field>
<field name="currentStatusId">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}">
<display/>
@@ -301,7 +301,7 @@ under the License.
<field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}"><text/></field>
<field name="inventoryItemTypeId">
<drop-down allow-empty="false" no-current-selected-key="NON_SERIAL_INV_ITEM">
- <entity-options entity-name="InventoryItemType" description="${description}"/>
+ <entity-options entity-name="InventoryItemType"/>
</drop-down>
</field>
<field name="lotId"><text default-value="${lastLotId}"/></field>
@@ -313,7 +313,7 @@ under the License.
<field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}" tooltip="${uiLabelMap.ManufacturingProduceQuantityMessage}"><text/></field>
<field name="inventoryItemTypeId">
<drop-down allow-empty="false" no-current-selected-key="NON_SERIAL_INV_ITEM">
- <entity-options entity-name="InventoryItemType" description="${description}"/>
+ <entity-options entity-name="InventoryItemType"/>
</drop-down>
</field>
<field name="lotId"><text default-value="${lastLotId}"/></field>
@@ -365,7 +365,7 @@ under the License.
<field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
<field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"><display/></field>
<field name="reservPersons"><display/></field>
@@ -536,8 +536,8 @@ under the License.
<field name="workEffortId"><hidden/></field>
<field name="contentId"><display/></field>
<field name="drDataResourceId"><display/></field>
- <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
- <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
+ <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
+ <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
<field name="localeString"><display/></field>
@@ -569,7 +569,7 @@ under the License.
<field name="workEffortId" entry-name="productionRunId"><hidden/></field>
<field name="contentId"><display/></field>
<field name="drDataResourceId"><display/></field>
- <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
+ <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
<field name="localeString"><display/></field>
@@ -586,7 +586,7 @@ under the License.
<field name="drObjectInfo" title="${uiLabelMap.CommonContent}" entry-name="drDataResourceId" encode-output="true" use-when="${groovy: drDataResourceTypeId != null && drDataResourceTypeId.equals("ELECTRONIC_TEXT")}">
<display-entity entity-name="ElectronicText" key-field-name="dataResourceId" description="${textData}"></display-entity>
</field>
- <field name="workEffortContentTypeId"><drop-down><entity-options description="${description}" entity-name="WorkEffortContentType"></entity-options></drop-down></field>
+ <field name="workEffortContentTypeId"><drop-down><entity-options entity-name="WorkEffortContentType"></entity-options></drop-down></field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelected}"><check/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
@@ -602,7 +602,7 @@ under the License.
</field>
<field name="availabilityStatusId" title="">
<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="WEFA_AVAILABILITY"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -670,7 +670,7 @@ under the License.
<!-- Statuses are not yet defined for the WorkEffortFixedAssetAssign entity
so this field will be hidden meanwhile
<drop-down>
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS"/>
</entity-options>
</drop-down> -->
@@ -696,7 +696,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="WEFA_AVAILABILITY"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -706,7 +706,7 @@ under the License.
<!-- Statuses are not yet defined for the WorkEffortFixedAssetAssign entity
so this field will be hidden meanwhile
<drop-down>
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS"/>
</entity-options>
</drop-down> -->
@@ -758,7 +758,7 @@ under the License.
</hyperlink>
</field>
<field name="statusId">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="estimatedShipDate" sort-field="true"><display/></field>
<field name="viewShipmentPlanLink" title=" " widget-style="buttontext">
@@ -786,7 +786,7 @@ under the License.
</field>
<field name="workFlowSequenceTypeId" title="${uiLabelMap.CommonType}">
<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="WORKFLOW"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -984,7 +984,7 @@ under the License.
<display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${unitCost}"/>
</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>
</form>
@@ -1008,7 +1008,7 @@ under the License.
<field name="lotId" title="${uiLabelMap.ProductLotId}"><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>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Sat Jun 20 21:58:05 2015
@@ -123,7 +123,7 @@ under the License.
<field name="workEffortName" title="${uiLabelMap.ManufacturingTaskName}"><text/></field>
<field name="workEffortPurposeTypeId" title="${uiLabelMap.ManufacturingTaskPurpose}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType">
+ <entity-options entity-name="WorkEffortPurposeType">
<entity-constraint name="workEffortPurposeTypeId" operator="like" value="ROU%"/>
</entity-options>
</drop-down>
@@ -140,7 +140,7 @@ under the License.
<field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><text/></field>
<field name="estimateCalcMethod">
<drop-down allow-empty="true">
- <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+ <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
<entity-constraint name="customMethodTypeId" operator="equals" value="TASK_FORMULA"/>
</entity-options>
</drop-down>
@@ -182,14 +182,14 @@ under the License.
<field name="workEffortId"><hidden/></field>
<field name="costComponentTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="CostComponentType" description="${description}">
+ <entity-options entity-name="CostComponentType">
<entity-constraint name="parentTypeId" operator="equals" env-name="nullField"/>
</entity-options>
</drop-down>
</field>
<field name="costComponentCalcId">
<drop-down allow-empty="false">
- <entity-options entity-name="CostComponentCalc" description="${description}">
+ <entity-options entity-name="CostComponentCalc">
</entity-options>
</drop-down>
</field>
@@ -381,7 +381,7 @@ under the License.
<field name="workEffortId"><hidden /></field>
<field name="fixedAssetTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="FixedAssetType" description="${description}"/>
+ <entity-options entity-name="FixedAssetType"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}">