Skip to content

Commit

Permalink
Cleaning forms code is needed after setting default-value in list-opt…
Browse files Browse the repository at this point in the history 
…ions and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@nmalin
nmalin committed Jun 20, 2015
1 parent 4738da8 commit 415de4e
Show file tree
Hide file tree
Showing 140 changed files with 1,214 additions and 1,231 deletions.
26 changes: 13 additions & 13 deletions applications/accounting/widget/AgreementForms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ under the License.
</field>
<field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="AgreementType"/>
<entity-options entity-name="AgreementType"/>
</drop-down>
</field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingPartyIdFrom}">
Expand Down Expand Up @@ -120,20 +120,20 @@ under the License.
</field>
<field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="AgreementType" key-field-name="agreementTypeId"/>
<entity-options entity-name="AgreementType" key-field-name="agreementTypeId"/>
</drop-down>
</field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingPartyIdFrom}">
<lookup target-form-name="LookupPartyName"/>
</field>
<field name="roleTypeIdFrom" title="${uiLabelMap.AccountingRoleTypeIdFrom}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
<entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
</drop-down>
</field>
<field name="roleTypeIdTo" title="${uiLabelMap.AccountingRoleTypeIdTo}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
<entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
</drop-down>
</field>
<field name="partyIdTo" title="${uiLabelMap.AccountingPartyIdTo}">
Expand Down Expand Up @@ -175,7 +175,7 @@ under the License.
<field name="agreementItemSeqId" use-when="agreementItem==null" ><ignored/></field>
<field name="agreementItemTypeId" title="${uiLabelMap.AccountingAgreementItemTypeId}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="AgreementItemType" key-field-name="agreementItemTypeId"/>
<entity-options entity-name="AgreementItemType" key-field-name="agreementItemTypeId"/>
</drop-down>
</field>
<field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
Expand Down Expand Up @@ -235,7 +235,7 @@ under the License.
</field>
<field name="invoiceItemTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="InvoiceItemType" description="${description}">
<entity-options entity-name="InvoiceItemType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand All @@ -254,7 +254,7 @@ under the License.
<field name="agreementTermId" title="${uiLabelMap.AccountingAgreementTermId}"><hidden/></field>
<field name="termTypeId" title="${uiLabelMap.AccountingTermTypeId}">
<drop-down allow-empty="false">
<entity-options entity-name="TermType" description="${description}">
<entity-options entity-name="TermType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand All @@ -263,7 +263,7 @@ under the License.
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="invoiceItemTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="InvoiceItemType" description="${description}">
<entity-options entity-name="InvoiceItemType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand All @@ -279,14 +279,14 @@ under the License.
<field name="agreementTermId" title="${uiLabelMap.AccountingAgreementTermId}"><display/></field>
<field name="termTypeId" title="${uiLabelMap.AccountingTermTypeId}">
<drop-down allow-empty="false">
<entity-options entity-name="TermType" description="${description}"/>
<entity-options entity-name="TermType"/>
</drop-down>
</field>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="invoiceItemTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="InvoiceItemType" description="${description}">
<entity-options entity-name="InvoiceItemType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand Down Expand Up @@ -465,14 +465,14 @@ under the License.
<field name="productId" use-when="agreementProductAppl!=null"><display/></field>
<field name="supplierPrefOrderId">
<drop-down allow-empty="true">
<entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId" description="${description}">
<entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId">
<entity-order-by field-name="supplierPrefOrderId"/>
</entity-options>
</drop-down>
</field>
<field name="supplierRatingTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="SupplierRatingType" key-field-name="supplierRatingTypeId" description="${description}">
<entity-options entity-name="SupplierRatingType" key-field-name="supplierRatingTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand Down Expand Up @@ -669,7 +669,7 @@ under the License.
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
<entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
Expand Down
18 changes: 9 additions & 9 deletions applications/accounting/widget/BillingAccountForms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ under the License.
</display-entity>
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
<display-entity entity-name="RoleType" description="${description}"/>
<display-entity entity-name="RoleType"/>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>

Expand All @@ -196,7 +196,7 @@ under the License.
<field name="billingAccountId"><hidden/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
<drop-down allow-empty="false" no-current-selected-key="BILL_TO_CUSTOMER">
<entity-options entity-name="RoleType" description="${description}">
<entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand All @@ -214,11 +214,11 @@ under the License.
</actions>
<field name="billingAccountId"><hidden/></field>
<field name="termTypeId" title="${uiLabelMap.PartyTermType}">
<display-entity entity-name="TermType" description="${description}"/>
<display-entity entity-name="TermType"/>
</field>
<field name="termValue" title="${uiLabelMap.CommonValue}"><display/></field>
<field name="uomId" title="${uiLabelMap.CommonUom}">
<display-entity entity-name="Uom" description="${description}"/>
<display-entity entity-name="Uom"/>
</field>
<field name="billingAccountTermId" title=" " widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonEdit}" target="EditBillingAccountTerms">
Expand All @@ -240,15 +240,15 @@ under the License.
<field use-when="billingAccountTermId!=null" name="billingAccountTermId"><hidden/></field>
<field name="termTypeId" title="${uiLabelMap.PartyTermType}">
<drop-down>
<entity-options entity-name="TermType" description="${description}">
<entity-options entity-name="TermType">
<entity-constraint name="parentTypeId" value="FINANCIAL_TERM"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="uomId" title="${uiLabelMap.CommonUom}">
<drop-down allow-empty="true">
<entity-options entity-name="Uom" description="${description}">
<entity-options entity-name="Uom">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand All @@ -269,7 +269,7 @@ under the License.
</hyperlink>
</field>
<field name="paymentMethodTypeId" title="${uiLabelMap.CommonType}">
<display-entity entity-name="PaymentMethodType" description="${description}"/>
<display-entity entity-name="PaymentMethodType"/>
</field>
<field name="invoiceId"><display/></field>
<field name="invoiceItemSeqId"><display/></field>
Expand Down Expand Up @@ -300,14 +300,14 @@ under the License.
</field>
<field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
<drop-down allow-empty="false" no-current-selected-key="CUSTOMER_DEPOSIT">
<entity-options description="${description}" entity-name="PaymentType">
<entity-options entity-name="PaymentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="paymentMethodTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="PaymentMethodType" description="${description}">
<entity-options entity-name="PaymentMethodType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand Down
12 changes: 6 additions & 6 deletions applications/accounting/widget/BudgetForms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ under the License.
<field use-when="budget != null" name="budgetId"><display/></field>
<field name="budgetTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="BudgetType" description="${description}">
<entity-options entity-name="BudgetType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand All @@ -83,7 +83,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="budgetId"><hidden/></field>
<field name="statusDate"><display/></field>
<field name="statusId" title="${uiLabelMap.AccountingBudgetStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="statusId" title="${uiLabelMap.AccountingBudgetStatus}"><display-entity entity-name="StatusItem"/></field>
</form>

<form name="BudgetRoles" type="list" use-row-submit="true" title="" list-name="budgetRoles" paginate-target="BudgetOverview"
Expand Down Expand Up @@ -144,7 +144,7 @@ under the License.
</field>
<field name="budgetItemTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="BudgetItemType" description="${description}" key-field-name="budgetItemTypeId"/>
<entity-options entity-name="BudgetItemType" key-field-name="budgetItemTypeId"/>
</drop-down>
</field>
<field name="amount" ><text size="10"/></field>
Expand All @@ -166,7 +166,7 @@ under the License.
<field name="budgetId"><hidden/></field>
<field name="budgetItemTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="BudgetItemType" description="${description}" key-field-name="budgetItemTypeId"/>
<entity-options entity-name="BudgetItemType" key-field-name="budgetItemTypeId"/>
</drop-down>
</field>
<field name="amount" ><text size="10"/></field>
Expand All @@ -187,7 +187,7 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId">
<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>
Expand Down Expand Up @@ -226,7 +226,7 @@ under the License.
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="budgetReviewResultTypeId" title="${uiLabelMap.AccountingBudgetReviewResult}">
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="BudgetReviewResultType">
<entity-options entity-name="BudgetReviewResultType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Expand Down
12 changes: 6 additions & 6 deletions applications/accounting/widget/CostForms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ under the License.
<field name="costComponentCalcId" widget-style="buttontext"></field>
<field name="costGlAccountTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
</drop-down>
</field>
<field name="offsettingGlAccountTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
</drop-down>
</field>
<field name="updateCostComponentCalc" title="${uiLabelMap.CommonUpdate}"><submit/></field>
<field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description}"/></field>
<field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId"/></field>
<field name="deleteCostComponentCalc" title=" " widget-style="buttontext">
<hyperlink target="deleteCostComponentCalc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="costComponentCalcId"/>
Expand All @@ -47,12 +47,12 @@ under the License.
<auto-fields-service service-name="createCostComponentCalc"/>
<field name="costGlAccountTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
</drop-down>
</field>
<field name="offsettingGlAccountTypeId">
<drop-down allow-empty="true">
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
</drop-down>
</field>
<field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
Expand All @@ -65,7 +65,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>
Expand Down
Loading

0 comments on commit 415de4e

Please sign in to comment.