svn commit: r1686674 [1/9] - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r1686674 [1/9] - in /ofbiz/trunk: applications/accounting/widget
 
|
Author: nmalin
Date: Sat Jun 20 21:58:05 2015 New Revision: 1686674 URL: http://svn.apache.org/r1686674 Log: Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort Modified: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/BudgetForms.xml ofbiz/trunk/applications/accounting/widget/CostForms.xml ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml ofbiz/trunk/applications/accounting/widget/TransactionForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml ofbiz/trunk/applications/marketing/widget/ContactListForms.xml ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/widget/ReportForms.xml ofbiz/trunk/applications/marketing/widget/SegmentForms.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderShopListForms.xml ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml ofbiz/trunk/applications/workeffort/widget/LookupForms.xml ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml ofbiz/trunk/framework/common/widget/LookupForms.xml ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml ofbiz/trunk/framework/webtools/widget/ServiceForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Modified: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementForms.xml Sat Jun 20 21:58:05 2015 @@ -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}"> @@ -120,7 +120,7 @@ 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}"> @@ -128,12 +128,12 @@ under the License. </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}"> @@ -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}"> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> @@ -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> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Sat Jun 20 21:58:05 2015 @@ -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> @@ -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> @@ -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"> @@ -240,7 +240,7 @@ 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> @@ -248,7 +248,7 @@ under the License. </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> @@ -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> @@ -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> Modified: ofbiz/trunk/applications/accounting/widget/BudgetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BudgetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BudgetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BudgetForms.xml Sat Jun 20 21:58:05 2015 @@ -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> @@ -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" @@ -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> @@ -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> @@ -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> @@ -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> Modified: ofbiz/trunk/applications/accounting/widget/CostForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CostForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CostForms.xml Sat Jun 20 21:58:05 2015 @@ -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"/> @@ -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}"> @@ -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> Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Sat Jun 20 21:58:05 2015 @@ -28,7 +28,7 @@ under the License. <field name="fixedAssetName"><text-find/></field> <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"> <drop-down allow-empty="true"> - <entity-options entity-name="FixedAssetType" description="${description}"> + <entity-options entity-name="FixedAssetType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -58,7 +58,7 @@ under the License. <field name="budgetId"><text-find/></field> <field name="budgetTypeId" title="${uiLabelMap.AccountingBudgetType}"> <drop-down allow-empty="true"> - <entity-options entity-name="BudgetType" description="${description}"> + <entity-options entity-name="BudgetType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -119,14 +119,14 @@ under the License. <field name="accountName" title="${uiLabelMap.CommonName}"><text-find/></field> <field name="glAccountTypeId" title="${uiLabelMap.CommonType}"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountType" description="${description}"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountClass" description="${description}"> + <entity-options entity-name="GlAccountClass"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -188,12 +188,12 @@ under the License. <field position="1" name="invoiceId" ><text-find/></field> <field position="1" name="invoiceTypeId"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="InvoiceType"/> + <entity-options entity-name="InvoiceType"/> </drop-down> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="StatusItem"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> </entity-options> </drop-down> @@ -220,7 +220,7 @@ under the License. <hyperlink also-hidden="false" target-type="plain" description="${invoiceId}" target="javascript:set_value('${invoiceId}')"/> </field> <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field> - <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> <field name="description"><display/></field> <field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field> <field name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field> @@ -263,7 +263,7 @@ under the License. <field name="agreementItemSeqId"><text-find/></field> <field name="agreementItemTypeId" title="${uiLabelMap.FormFieldTitle_agreementItemType}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="AgreementItemType"/> + <entity-options entity-name="AgreementItemType"/> </drop-down> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> @@ -348,7 +348,7 @@ under the License. <field name="parentPeriodId"><text-find/></field> <field name="periodTypeId"> <drop-down allow-empty="true"> - <entity-options entity-name="PeriodType" description="${description}"> + <entity-options entity-name="PeriodType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Sat Jun 20 21:58:05 2015 @@ -27,7 +27,7 @@ under the License. <field name="finAccountId"><text-find ignore-case="true"/></field> <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="FinAccountType"> + <entity-options entity-name="FinAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -98,7 +98,7 @@ under the License. <field name="finAccountPin"><text size="10"/></field> <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}"> <drop-down no-current-selected-key="DEPOSIT_ACCOUNT"> - <entity-options description="${description}" entity-name="FinAccountType"> + <entity-options entity-name="FinAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -116,7 +116,7 @@ under the License. <field name="postToGlAccountId"><lookup target-form-name="LookupGlAccount"/></field> <field name="statusId" use-when="finAccount==null" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false"> - <entity-options entity-name="StatusItem" description="${description}"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" value="FINACCT_STATUS"/> </entity-options> @@ -169,7 +169,7 @@ under the License. <field name="partyId"> <lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="RoleType"> + <entity-options entity-name="RoleType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -189,7 +189,7 @@ under the License. <field name="finAccountTransId"><hidden/></field> <field name="finAccountTransTypeId"> <drop-down no-current-selected-key="ADJUSTMENT"> - <entity-options description="${description}" entity-name="FinAccountTransType"> + <entity-options entity-name="FinAccountTransType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -201,7 +201,7 @@ under the License. <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down> - <entity-options entity-name="StatusItem" description="${description}"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" value="FINACT_TRNS_STATUS"/> </entity-options> </drop-down> @@ -300,7 +300,7 @@ under the License. <field name="finAccountId"><text-find ignore-case="true"/></field> <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="FinAccountType"> + <entity-options entity-name="FinAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -320,14 +320,14 @@ under the License. <field name="finAccountId"><hidden value="${finAccountId}"/></field> <field name="finAccountTransTypeId"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="FinAccountTransType"> + <entity-options entity-name="FinAccountTransType"> <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" description="${description}"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" value="FINACT_TRNS_STATUS"/> </entity-options> </drop-down> @@ -363,7 +363,7 @@ under the License. </actions> <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}"> <drop-down allow-empty="false"> - <entity-options entity-name="PaymentType" description="${description}"> + <entity-options entity-name="PaymentType"> <entity-constraint name="parentTypeId" operator="equals" env-name="parentTypeId"/> </entity-options> </drop-down> @@ -449,7 +449,7 @@ under the License. <field name="glReconciliationName"><text/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="StatusItem"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="GLREC_STATUS"/> <entity-order-by field-name="description"/> </entity-options> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Sat Jun 20 21:58:05 2015 @@ -80,7 +80,7 @@ under the License. <field name="fixedAssetTypeId"> <drop-down allow-empty="false"> - <entity-options entity-name="FixedAssetType" description="${description}"> + <entity-options entity-name="FixedAssetType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -88,7 +88,7 @@ under the License. <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field> <field name="classEnumId"> <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="FXAST_CLASS"/> <entity-order-by field-name="description"/> </entity-options> @@ -97,7 +97,7 @@ under the License. <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPerson"/></field> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"> <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> @@ -151,7 +151,7 @@ under the License. <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductTypeId}"> <drop-down allow-empty="true"> - <entity-options entity-name="FixedAssetProductType" description="${description}"> + <entity-options entity-name="FixedAssetProductType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -172,13 +172,13 @@ under the License. <field name="workEffortId"><display/></field> <field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field> <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"> - <display-entity entity-name="WorkEffortType" description="${description}"/> + <display-entity entity-name="WorkEffortType"/> </field> <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}"> - <display-entity entity-name="WorkEffortPurposeType" description="${description}"/> + <display-entity entity-name="WorkEffortPurposeType"/> </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="percentComplete"><display/></field> <field name="estimatedStartDate"><display/></field> @@ -224,7 +224,7 @@ under the License. <field name="fixedAssetId"><hidden/></field> <field name="fixedAssetStdCostTypeId" title="${uiLabelMap.AccountingFixedAssetStdCostTypeId}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="FixedAssetStdCostType" key-field-name="fixedAssetStdCostTypeId"/> + <entity-options entity-name="FixedAssetStdCostType" key-field-name="fixedAssetStdCostTypeId"/> </drop-down> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"/> @@ -269,7 +269,7 @@ under the License. <field name="fixedAssetId"><hidden/></field> <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}"> <drop-down allow-empty="false"> - <entity-options entity-name="FixedAssetIdentType" description="${description}"> + <entity-options entity-name="FixedAssetIdentType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -353,7 +353,7 @@ under the License. <field use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonCreated}" name="createdStamp"><display/></field> <field name="statusId" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false"> - <entity-options description="${description}" entity-name="StatusItem"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="FIXEDAST_MNT_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -369,7 +369,7 @@ under the License. </field> <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage1}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ProductMaintType"> + <entity-options entity-name="ProductMaintType"> <entity-order-by field-name="productMaintTypeId"/> </entity-options> </drop-down> @@ -387,7 +387,7 @@ under the License. </field> <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId"> + <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId"> <entity-order-by field-name="productMeterTypeId"/> </entity-options> </drop-down> @@ -430,7 +430,7 @@ under the License. </actions> <field name="fixedAssetId"><hidden/></field> <field name="productMeterTypeId"> - <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId" description="${description}"/> + <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId"/> </field> <field name="readingDate"><display/></field> <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text/></field> @@ -459,7 +459,7 @@ under the License. <field name="maintHistSeqId" use-when="maintHistSeqId == null"><ignored/></field> <field name="productMeterTypeId" > <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId"> + <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId"> <entity-order-by field-name="productMeterTypeId"/> </entity-options> </drop-down> @@ -530,7 +530,7 @@ under the License. <field name="allocatedDate"><date-time/></field> <field name="statusId" title="${uiLabelMap.FormFieldTitle_statusId}"> <drop-down allow-empty="false"> - <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="PRTYASGN_STATUS"/> <entity-order-by field-name="statusId"/> </entity-options> @@ -559,14 +559,14 @@ under the License. </field> <field name="roleTypeId"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"> + <entity-options entity-name="RoleType" key-field-name="roleTypeId"> <entity-order-by field-name="roleTypeId"/> </entity-options> </drop-down> </field> <field name="statusId"> <drop-down allow-empty="false"> - <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="PRTYASGN_STATUS"/> <entity-order-by field-name="statusId"/> </entity-options> @@ -581,7 +581,7 @@ under the License. <field name="fixedAssetId"><hidden/></field> <field name="depreciationCustomMethodId"> <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="DEPRECIATION_FORMULA"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sat Jun 20 21:58:05 2015 @@ -29,14 +29,14 @@ under the License. </field> <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}" position="2"> <drop-down allow-empty="true"> - <entity-options entity-name="AcctgTransType" description="${description}"> + <entity-options entity-name="AcctgTransType"> <entity-order-by field-name="acctgTransTypeId"/> </entity-options> </drop-down> </field> <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="1"> <drop-down allow-empty="true"> - <entity-options entity-name="GlFiscalType" description="${description}"> + <entity-options entity-name="GlFiscalType"> <entity-order-by field-name="glFiscalTypeId"/> </entity-options> </drop-down> @@ -206,14 +206,14 @@ under the License. </field> <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}"> <drop-down allow-empty="true"> - <entity-options entity-name="AcctgTransType" description="${description}"> + <entity-options entity-name="AcctgTransType"> <entity-order-by field-name="acctgTransTypeId"/> </entity-options> </drop-down> </field> <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"> <drop-down allow-empty="true"> - <entity-options entity-name="GlFiscalType" description="${description}"> + <entity-options entity-name="GlFiscalType"> <entity-order-by field-name="glFiscalTypeId"/> </entity-options> </drop-down> @@ -430,14 +430,14 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="1"> <drop-down> - <entity-options entity-name="AcctgTransType" description="${description}"> + <entity-options entity-name="AcctgTransType"> <entity-order-by field-name="acctgTransTypeId"/> </entity-options> </drop-down> </field> <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2"> <drop-down> - <entity-options entity-name="GlFiscalType" description="${description}"> + <entity-options entity-name="GlFiscalType"> <entity-order-by field-name="glFiscalTypeId"/> </entity-options> </drop-down> @@ -447,7 +447,7 @@ under the License. </field> <field name="roleTypeId" parameter-name="roleTypeId" position="2"> <drop-down allow-empty="true"> - <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}"> + <entity-options entity-name="RoleType" key-field-name="roleTypeId"> <entity-order-by field-name="roleTypeId"/> </entity-options> </drop-down> @@ -511,21 +511,21 @@ under the License. <field name="organizationPartyId" map-name="parameter"><hidden/></field> <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}"> <drop-down> - <entity-options entity-name="AcctgTransType" description="${description}"> + <entity-options entity-name="AcctgTransType"> <entity-order-by field-name="acctgTransTypeId"/> </entity-options> </drop-down> </field> <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"> <drop-down> - <entity-options entity-name="GlFiscalType" description="${description}"> + <entity-options entity-name="GlFiscalType"> <entity-order-by field-name="glFiscalTypeId"/> </entity-options> </drop-down> </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="roleTypeId"/> </entity-options> </drop-down> @@ -547,7 +547,7 @@ under the License. <field name="inventoryItemId"><text/></field> <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}"> <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-order-by field-name="description"/> </entity-options> </drop-down> @@ -572,7 +572,7 @@ under the License. <field name="acctgTransEntryTypeId" ><hidden value="_NA_"/></field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}" position="1"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountType" description="${description}"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="glAccountTypeId"/> </entity-options> </drop-down> @@ -603,7 +603,7 @@ under the License. </field> <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}" position="1"> <drop-down allow-empty="true"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="CONVERSION_PURPOSE"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -613,7 +613,7 @@ under the License. <field name="productId" position="1"><text size="20"/></field> <field name="reconcileStatusId" position="2" title="${uiLabelMap.FormFieldTitle_reconcileStatus}"> <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" operator="equals" value="ACCTG_ENREC_STATUS"/> <entity-order-by field-name="statusId"/> </entity-options> @@ -631,7 +631,7 @@ under the License. <field name="acctgTransEntrySeqId"><display/></field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"> <drop-down allow-empty="true"> - <entity-options entity-name="GlAccountType" description="${description}"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="glAccountTypeId"/> </entity-options> </drop-down> @@ -647,7 +647,7 @@ under the License. <!-- <field name="acctgTransEntryTypeId" title="${uiLabelMap.AccountingTransactionEntryType}"> <drop-down allow-empty="true"> - <entity-options entity-name="AcctgTransEntryType" description="${description}"> + <entity-options entity-name="AcctgTransEntryType"> <entity-order-by field-name="acctgTransEntryTypeId"/> </entity-options> </drop-down> @@ -664,7 +664,7 @@ under the License. </field> <field name="reconcileStatusId" title="${uiLabelMap.FormFieldTitle_reconcileStatus}"> <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" operator="equals" value="ACCTG_ENREC_STATUS"/> <entity-order-by field-name="statusId"/> </entity-options> @@ -694,14 +694,14 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="1"> <drop-down no-current-selected-key="_NA_"> - <entity-options entity-name="AcctgTransType" description="${description}"> + <entity-options entity-name="AcctgTransType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2"> <drop-down> - <entity-options entity-name="GlFiscalType" description="${description}" key-field-name="glFiscalTypeId"> + <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -716,7 +716,7 @@ under the License. </field> <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}" position="2"> <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="ACCTG_ENREC_STATUS"/> <entity-order-by field-name="description"/> </entity-options> @@ -728,7 +728,7 @@ under the License. </field> <field name="roleTypeId" position="2"> <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> @@ -854,7 +854,7 @@ under the License. <field name="statusId" use-when="glReconciliationId == null"><hidden value="GLREC_CREATED"/></field> <field name="statusId" use-when="glReconciliationId != null" title="${uiLabelMap.CommonStatus}"> <drop-down> - <entity-options entity-name="StatusItem" description="${description}"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" value="GLREC_STATUS"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sat Jun 20 21:58:05 2015 @@ -193,7 +193,7 @@ under the License. tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('taxFormId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="TAX_FORMS"/> <entity-order-by field-name="description"/> </entity-options> @@ -202,7 +202,7 @@ under the License. <field name="cogsMethodId" use-when="partyAcctgPreference==null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('cogsMethodId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="COGS_METHODS"/> <entity-order-by field-name="description"/> </entity-options> @@ -227,7 +227,7 @@ under the License. tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldInvoiceSequenceEnumId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="INVOICE_SEQMD"/> <entity-order-by field-name="description"/> </entity-options> @@ -249,7 +249,7 @@ under the License. tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldQuoteSequenceEnumId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="QUOTE_SEQMD"/> <entity-order-by field-name="description"/> </entity-options> @@ -263,7 +263,7 @@ under the License. tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('oldOrderSequenceEnumId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SEQMD"/> <entity-order-by field-name="description"/> </entity-options> @@ -362,7 +362,7 @@ under the License. (partyAcctgPreference!=null&&partyAcctgPreference.get('refundPaymentMethodId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null))return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <entity-options entity-name="PaymentMethod" description="${description}" key-field-name="paymentMethodId"> + <entity-options entity-name="PaymentMethod" key-field-name="paymentMethodId"> <entity-constraint name="partyId" operator="equals" env-name="organizationPartyId"/> </entity-options> </drop-down> @@ -412,7 +412,7 @@ under the License. </field> <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}"> <drop-down allow-empty="true"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="CONVERSION_PURPOSE"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -457,7 +457,7 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"> <drop-down> - <entity-options entity-name="GlAccountType" description="${description}"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -507,7 +507,7 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="invoiceItemTypeId"> <drop-down allow-empty="false" > - <entity-options description="${description}" entity-name="InvoiceItemType"> + <entity-options entity-name="InvoiceItemType"> <entity-constraint name="invoiceItemTypeId" operator="like" value="INV_%"/> <entity-order-by field-name="description"/> </entity-options> @@ -561,7 +561,7 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="invoiceItemTypeId" title="${uiLabelMap.AccountingInvoicePurchaseItemType}"> <drop-down allow-empty="false" > - <entity-options description="${description}" entity-name="InvoiceItemType"> + <entity-options entity-name="InvoiceItemType"> <entity-constraint name="invoiceItemTypeId" operator="like" value="PINV%"/> <entity-order-by field-name="description"/> </entity-options> @@ -605,14 +605,14 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}"> <drop-down> - <entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId"> + <entity-options entity-name="PaymentType" key-field-name="paymentTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"> <drop-down> - <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -663,7 +663,7 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="paymentMethodTypeId"> <drop-down> - <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId"> + <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -727,7 +727,7 @@ under the License. </field> <field name="periodTypeId"> <drop-down> - <entity-options entity-name="PeriodType" description="${description}"> + <entity-options entity-name="PeriodType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -791,7 +791,7 @@ under the License. <field name="organizationPartyId"><hidden/></field> <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}"> <drop-down allow-empty="false"> - <entity-options description="${description}" entity-name="GlAccountType"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -836,7 +836,7 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTypeId}"> <drop-down allow-empty="false"> - <list-options key-name="finAccountTypeId" list-name="finAccountTypes" description="${description}"/> + <list-options key-name="finAccountTypeId" list-name="finAccountTypes"/> </drop-down> </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> @@ -876,7 +876,7 @@ under the License. <field name="organizationPartyId"><hidden/></field> <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}"> <drop-down allow-empty="false"> - <entity-options description="${description}" entity-name="GlAccountType"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -921,7 +921,7 @@ under the License. <field name="organizationPartyId"><hidden/></field> <field name="varianceReasonId" title="${uiLabelMap.FormFieldTitle_varianceReasonId}"> <drop-down allow-empty="false"> - <entity-options entity-name="VarianceReason" description="${description}"> + <entity-options entity-name="VarianceReason"> <entity-order-by field-name="varianceReasonId"/> </entity-options> </drop-down> @@ -1065,14 +1065,14 @@ under the License. <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}"> <drop-down allow-empty="true"> - <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}"> + <entity-options entity-name="RoleType" key-field-name="roleTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountTypeId}"> <drop-down> - <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1113,7 +1113,7 @@ under the License. <field name="glAccountCategoryId"><text-find/></field> <field name="glAccountCategoryTypeId" title="${uiLabelMap.FormFieldTitle_glAccountCategoryType}"> <drop-down> - <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/> + <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId"/> </drop-down> </field> <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -1146,7 +1146,7 @@ under the License. <field name="glAccountCategoryId" use-when="glAccountCategoryId==null"><hidden/></field> <field name="glAccountCategoryTypeId" title="${uiLabelMap.FormFieldTitle_glAccountCategoryType}"> <drop-down> - <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/> + <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId"/> </drop-down> </field> <field name="submit" use-when="glAccountCategory==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> @@ -1202,7 +1202,7 @@ under the License. <field name="fixedAssetTypeId"> <drop-down allow-empty="false"> <option key="_NA_" description="${uiLabelMap.CommonAll}"/> - <entity-options entity-name="FixedAssetType" description="${description}"> + <entity-options entity-name="FixedAssetType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sat Jun 20 21:58:05 2015 @@ -112,28 +112,28 @@ under the License. <field name="glAccountTypeId"> <drop-down allow-empty="false" no-current-selected-key="_NA_"> - <entity-options entity-name="GlAccountType" description="${description}"> + <entity-options entity-name="GlAccountType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glAccountClassId"> <drop-down allow-empty="false"> - <entity-options entity-name="GlAccountClass" description="${description}"> + <entity-options entity-name="GlAccountClass"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glResourceTypeId"> <drop-down allow-empty="false" no-current-selected-key="_NA_"> - <entity-options entity-name="GlResourceType" description="${description}"> + <entity-options entity-name="GlResourceType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="glXbrlClassId"> <drop-down allow-empty="true"> - <entity-options entity-name="GlXbrlClass" description="${description}"> + <entity-options entity-name="GlXbrlClass"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -255,14 +255,14 @@ under the License. </actions> <field name="rateTypeId"> <drop-down> - <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> @@ -281,7 +281,7 @@ under the License. <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"><sub-hyperlink target="ww" description="${workEffortName}"/></lookup></field> <field name="emplPositionTypeId" position="2"> <drop-down allow-empty="true"> - <entity-options entity-name="EmplPositionType" description="${description}"> + <entity-options entity-name="EmplPositionType"> <entity-constraint name="emplPositionTypeId" operator="not-equals" value="_NA_"/> <entity-order-by field-name="description"/> </entity-options> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Sat Jun 20 21:58:05 2015 @@ -28,12 +28,12 @@ under the License. <field name="description"><text-find ignore-case="true"/></field> <field position="1" name="invoiceTypeId"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="InvoiceType"/> + <entity-options entity-name="InvoiceType"/> </drop-down> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="StatusItem"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> </entity-options> </drop-down> @@ -217,7 +217,7 @@ under the License. <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType"/></field> <field name="glJournalId"><display-entity entity-name="GlJournal" description="${glJournalName}"/></field> <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field> - <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass" description="${description}"/></field> + <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass"/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${lastName} ${groupName}"/></field> <field name="reconcileStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="origCurrencyUomId"><ignored/></field> @@ -240,7 +240,7 @@ under the License. <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field> <field position="2" name="invoiceTypeId"> <drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType"> + <entity-options entity-name="InvoiceType"> <entity-constraint name="parentTypeId" value="SALES_INVOICE"/> <entity-order-by field-name="description"/> </entity-options> @@ -264,7 +264,7 @@ under the License. <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field> <field position="2" name="invoiceTypeId"> <drop-down allow-empty="false" no-current-selected-key="PURCHASE_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType"> + <entity-options entity-name="InvoiceType"> <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/> <entity-order-by field-name="description"/> </entity-options> @@ -289,10 +289,10 @@ under the License. <field name="invoiceId"><hidden/></field> <field position="1" name="invoiceDate"><date-time/></field> <field position="2" name="dueDate"><date-time/></field> - <field position="1" name="invoiceTypeId" use-when="invoice!=null"><display-entity entity-name="InvoiceType" description="${description}"/></field> + <field position="1" name="invoiceTypeId" use-when="invoice!=null"><display-entity entity-name="InvoiceType"/></field> <field position="1" name="invoiceTypeId" use-when="invoice==null"> <drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE"> - <entity-options description="${description}" entity-name="InvoiceType"> + <entity-options entity-name="InvoiceType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -306,22 +306,22 @@ under the License. <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId" use-when="invoiceType.getString("parentTypeId").equals("SALES_INVOICE")"><lookup target-form-name="LookupPartyName"/></field> <field position="1" name="roleTypeId" use-when="invoice!=null&&invoice.getString("invoiceTypeId").equals("SALES_INVOICE")"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="RoleType"> + <entity-options entity-name="RoleType"> <entity-constraint name="parentTypeId" operator="equals" value="CUSTOMER"/> <entity-order-by field-name="description"/> </entity-options> - <entity-options description="${description}" entity-name="RoleType"> + <entity-options entity-name="RoleType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field position="1" name="roleTypeId" use-when="invoice!=null&&invoice.getString("invoiceTypeId").equals("PURCHASE_INVOICE")"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="RoleType"> + <entity-options entity-name="RoleType"> <entity-constraint name="parentTypeId" operator="equals" value="VENDOR"/> <entity-order-by field-name="description"/> </entity-options> - <entity-options description="${description}" entity-name="RoleType"> + <entity-options entity-name="RoleType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -363,7 +363,7 @@ under the License. <field name="quantity"><text size="10"/></field> <field name="invoiceItemTypeId"> <drop-down allow-empty="false"> - <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/> + <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId"/> </drop-down> </field> <field name="productId"><lookup target-form-name="LookupProduct" size="20"/></field> @@ -391,7 +391,7 @@ under the License. <field name="invoiceId"><hidden/></field> <field position="1" name="invoiceItemTypeId"> <drop-down allow-empty="false"> - <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/> + <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId"/> </drop-down> </field> <field position="1" name="description"><text size="80"/></field> @@ -535,7 +535,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> @@ -608,7 +608,7 @@ under the License. </display-entity> </field> <field name="hours"><display/></field> - <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field> + <field name="rateTypeId"><display-entity entity-name="RateType"/></field> <field name="workEffortId"> <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"> <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app"> @@ -625,7 +625,7 @@ under the License. <field name="billingAccountId"><hidden/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="StatusItem"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -643,7 +643,7 @@ under the License. </actions> <field name="invoiceId"><hidden/></field> <field name="termTypeId"> - <display-entity entity-name="TermType" description="${description}"/> + <display-entity entity-name="TermType"/> </field> <field name="dueDate"><display/></field> <field name="amount"><display type="currency" currency="${invoice.currencyUomId}"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |