svn commit: r1686674 [6/9] - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r1686674 [6/9] - in /ofbiz/trunk: applications/accounting/widget
 
|
Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Sat Jun 20 21:58:05 2015 @@ -56,7 +56,7 @@ under the License. <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field> <field name="fromDate"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> @@ -199,11 +199,11 @@ under the License. <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field> <field name="fromDate" position="2"><display/></field> <field name="statusId" position="2" 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="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"> <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="IMAGE_REJECT_REASON"/> </entity-options> </drop-down> @@ -254,7 +254,7 @@ under the License. <field name="fromDate" position="2"><display/></field> <field name="thruDate" position="2"><display/></field> <field name="statusId" position="2" 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="rejectedBy" position="2" title="${uiLabelMap.ImageManagementRejectedBy}"><display/></field> <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"><display/></field> @@ -336,7 +336,7 @@ under the License. </display> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> @@ -470,7 +470,7 @@ under the License. <field name="previewButton" title=" " widget-style="buttontext" widget-area-style="preview"><hyperlink target="#" target-type="plain" description="${uiLabelMap.CommonPreview}"/></field> <field name="colorWatermark" title="${uiLabelMap.ImageManagementTextColor}" widget-area-style="txt_color"> <drop-down allow-empty="true" no-current-selected-key="TEXT_BLACK"> - <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId"> + <entity-options entity-name="ProductFeature" key-field-name="productFeatureId"> <entity-constraint name="productFeatureTypeId" value="COLOR"/> <entity-constraint name="productFeatureCategoryId" value="TEXT"/> <entity-order-by field-name="defaultSequenceNum"/> @@ -479,7 +479,7 @@ under the License. </field> <field name="sizeWatermark" title="${uiLabelMap.ImageManagementTextSize}" widget-area-style="txt_size"> <drop-down allow-empty="true" no-current-selected-key="TEXT_MIDDLE"> - <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId"> + <entity-options entity-name="ProductFeature" key-field-name="productFeatureId"> <entity-constraint name="productFeatureTypeId" value="SIZE"/> <entity-constraint name="productFeatureCategoryId" value="TEXT"/> <entity-order-by field-name="defaultSequenceNum"/> @@ -668,7 +668,7 @@ under the License. <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field> <field name="fromDate"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> @@ -716,7 +716,7 @@ under the License. <field name="contentId"><display/></field> <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="purchaseFromDate" title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> @@ -758,7 +758,7 @@ under the License. </field> <field name="fromDate"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> @@ -801,7 +801,7 @@ under the License. </field> <field name="fromDate"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> Modified: ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml Sat Jun 20 21:58:05 2015 @@ -80,14 +80,14 @@ <field name="productPriceCondSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! --> <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}"> <drop-down allow-empty="false" current="selected"> - <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="PROD_PRICE_IN_PARAM"/> </entity-options> </drop-down> </field> <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}"> <drop-down allow-empty="false" current="selected"> - <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="PROD_PRICE_COND"/> </entity-options> </drop-down> @@ -112,14 +112,14 @@ <field name="new" title="${uiLabelMap.CommonNew}"><display default-value="${uiLabelMap.ProductPriceRulesNewCond}"/></field> <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}"> <drop-down allow-empty="false"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/> </entity-options> </drop-down> </field> <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}"> <drop-down allow-empty="false"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/> </entity-options> </drop-down> @@ -138,7 +138,7 @@ <field name="productPriceActionSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! --> <field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}"> <drop-down allow-empty="false" current="selected"> - <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/> + <entity-options entity-name="ProductPriceActionType" key-field-name="productPriceActionTypeId"/> </drop-down> </field> <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field> @@ -156,7 +156,7 @@ <field name="new" title="${uiLabelMap.CommonNew}"><display default-value="${uiLabelMap.ProductPriceRulesNewAction}"/></field> <field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}"> <drop-down allow-empty="false"> - <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/> + <entity-options entity-name="ProductPriceActionType" key-field-name="productPriceActionTypeId"/> </drop-down> </field> <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field> Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sat Jun 20 21:58:05 2015 @@ -94,7 +94,7 @@ under the License. <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"></lookup></field> <field name="roleTypeId" title="${uiLabelMap.PartyRole}"> <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> @@ -166,7 +166,7 @@ under the License. <auto-fields-service service-name="updateProductCategoryToProdCatalog"/> <field name="prodCatalogId"><hidden/></field> <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}"> - <display-entity entity-name="ProductCategory" description="${description}" also-hidden="true" cache="true"> + <display-entity entity-name="ProductCategory" also-hidden="true" cache="true"> <sub-hyperlink link-style="buttontext" target="EditCategory" description="${productCategoryId}"> <parameter param-name="productCategoryId"/> </sub-hyperlink> @@ -200,7 +200,7 @@ under the License. <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}"><lookup target-form-name="LookupProductCategory"></lookup></field> <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.ProductCatalogCategoryType}"> <drop-down> - <entity-options entity-name="ProdCatalogCategoryType" description="${description}"> + <entity-options entity-name="ProdCatalogCategoryType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Jun 20 21:58:05 2015 @@ -47,7 +47,7 @@ under the License. <parameter param-name="productId"/> </hyperlink> </field> - <field name="productTypeId" sort-field="true"><display-entity entity-name="ProductType" description="${description}"/></field> + <field name="productTypeId" sort-field="true"><display-entity entity-name="ProductType"/></field> <field name="internalName" sort-field="true"><display/></field> <field name="brandName" sort-field="true"><display/></field> <field name="productName" sort-field="true"><display/></field> @@ -68,7 +68,7 @@ under the License. <field position="2" name="productTypeId" title="${uiLabelMap.ProductProductType}"> <drop-down no-current-selected-key="FINISHED_GOOD"> - <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] --> + <entity-options entity-name="ProductType"> <!-- [${productTypeId}] --> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -81,7 +81,7 @@ under the License. </field> <field position="3" name="virtualVariantMethodEnum" title="${uiLabelMap.ProductVirtualVariantMethod}"> <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="PROD_VVMETHOD"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -111,7 +111,7 @@ under the License. </field> <field position="1" name="requirementMethodEnumId" title="${uiLabelMap.ProductRequirementMethodEnumId}"> <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="PROD_REQ_METHOD"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -133,7 +133,7 @@ under the License. <field position="1" name="ratingTypeEnum" title="${uiLabelMap.ProductRatingTypeEnum}"> <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="PROD_RATING_TYPE"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -146,7 +146,7 @@ under the License. </field> <field position="2" name="amountUomTypeId" title="${uiLabelMap.ProductAmountUomTypeId}"> <drop-down allow-empty="true"> - <entity-options entity-name="UomType" key-field-name="uomTypeId" description="${description}"> + <entity-options entity-name="UomType" key-field-name="uomTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -220,7 +220,7 @@ under the License. </field> <field position="3" name="defaultShipmentBoxTypeId" title="${uiLabelMap.ProductDefaultShipmentBoxTypeId}"> <drop-down allow-empty="true"> - <entity-options entity-name="ShipmentBoxType" key-field-name="shipmentBoxTypeId" description="${description}"> + <entity-options entity-name="ShipmentBoxType" key-field-name="shipmentBoxTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -402,14 +402,14 @@ under the License. <field name="productId"><hidden/></field> <field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}"> <drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE"> - <entity-options entity-name="ProductPriceType" description="${description}"> + <entity-options entity-name="ProductPriceType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}"> <drop-down allow-empty="false" no-current-selected-key="PURCHASE"> - <entity-options entity-name="ProductPricePurpose" description="${description}"> + <entity-options entity-name="ProductPricePurpose"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -440,7 +440,7 @@ under the License. </field> <field name="customPriceCalcService"> <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="PRICE_FORMULA"/> </entity-options> </drop-down> @@ -468,7 +468,7 @@ under the License. </field> <field name="customPriceCalcService"> <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="PRICE_FORMULA"/> </entity-options> </drop-down> @@ -503,14 +503,14 @@ under the License. <field name="productId"><hidden/></field> <field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}" widget-style="smallSelect"> <drop-down allow-empty="false"> - <entity-options entity-name="ProductPricePurpose" description="${description}"> + <entity-options entity-name="ProductPricePurpose"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="paymentMethodTypeId" widget-style="smallSelect"> <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> @@ -580,7 +580,7 @@ under the License. </hyperlink> </field> <field name="productContentTypeId" title="${uiLabelMap.ProductType}"> - <display-entity entity-name="ProductContentType" also-hidden="false" description="${description}"/> + <display-entity entity-name="ProductContentType" also-hidden="false"/> </field> <field name="fromDate"><display/></field> <field name="thruDate"><display/></field> @@ -610,7 +610,7 @@ under the License. <field name="contentId" title="${uiLabelMap.ProductContentId}"><lookup target-form-name="LookupContent"/></field> <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}"> <drop-down> - <entity-options entity-name="ProductContentType" description="${description}"> + <entity-options entity-name="ProductContentType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -623,7 +623,7 @@ under the License. <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field> <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> <entity-order-by field-name="description"/> </entity-options> @@ -631,7 +631,7 @@ under the License. </field> <field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}"> <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> @@ -643,7 +643,7 @@ under the License. <field name="productId" map-name="product"><hidden/></field> <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}"> <drop-down> - <entity-options entity-name="ProductContentType" description="${description}"> + <entity-options entity-name="ProductContentType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -664,7 +664,7 @@ under the License. </field> <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}"> <drop-down> - <entity-options entity-name="ProductContentType" description="${description}"> + <entity-options entity-name="ProductContentType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -687,14 +687,14 @@ under the License. </entity-and> </actions> <field name="caContentAssocTypeId"> - <display-entity entity-name="ContentAssocType" key-field-name="contentAssocTypeId" also-hidden="false" description="${description}"/> + <display-entity entity-name="ContentAssocType" key-field-name="contentAssocTypeId" also-hidden="false"/> </field> <field name="contentTypeId"> - <display-entity entity-name="ContentType" also-hidden="false" description="${description}"/> + <display-entity entity-name="ContentType" also-hidden="false"/> </field> <field name="localeString"><display/></field> <field name="drDataResourceTypeId" title="${uiLabelMap.FormFieldTitle_dataResourceTypeId}"> - <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false" description="${description}"/> + <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false"/> </field> <field name="editDataResource" widget-style="buttontext"> <hyperlink target="/content/control/EditDataResource" target-type="inter-app" description="${dataResourceId}" also-hidden="false"> @@ -727,7 +727,7 @@ under the License. <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field> <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> <entity-order-by field-name="description"/> </entity-options> @@ -759,7 +759,7 @@ under the License. <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field> <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> <entity-order-by field-name="description"/> </entity-options> @@ -895,14 +895,14 @@ under the License. </field> <field name="supplierPrefOrderId"> <drop-down allow-empty="true" no-current-selected-key="10_MAIN_SUPPL"> - <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> @@ -1074,7 +1074,7 @@ under the License. <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" ><lookup target-form-name="LookupFixedAsset"/></field> <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"> <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> @@ -1089,7 +1089,7 @@ under the License. <field name="quantity" title="${uiLabelMap.CommonQuantity}"><text maxlength="5" size="5"/></field> <field name="quantityUomId" title="${uiLabelMap.CommonUom}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1113,7 +1113,7 @@ under the License. <field use-when="fixedAssetId!=null" name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field> <field use-when="fixedAssetId==null" name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"> <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> @@ -1128,7 +1128,7 @@ under the License. <field name="quantity" title="${uiLabelMap.CommonQuantity}"><text maxlength="5" size="5"/></field> <field name="quantityUomId" title="${uiLabelMap.CommonUom}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1294,14 +1294,14 @@ under the License. <field name="productId"><hidden value="${product.productId}"/></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"/> </drop-down> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> @@ -1322,7 +1322,7 @@ under the License. <field name="costComponentCalcId"><lookup target-form-name="LookupCostComponentCalc"/></field> <field name="costComponentTypeId"> <drop-down allow-empty="false"> - <entity-options entity-name="CostComponentType" description="${description}"> + <entity-options entity-name="CostComponentType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1384,7 +1384,7 @@ under the License. <field name="productMaintSeqId"><ignored/></field> <field name="productMaintTypeId"> <drop-down allow-empty="false"> - <entity-options entity-name="ProductMaintType" description="${description}"> + <entity-options entity-name="ProductMaintType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1392,14 +1392,14 @@ under the License. <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="intervalUomId"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="intervalMeterTypeId"> <drop-down allow-empty="true"> - <entity-options entity-name="ProductMeterType" description="${description}" key-field-name="productMeterTypeId"> + <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1418,7 +1418,7 @@ under the License. <field name="productMaintSeqId"><hidden/></field> <field name="productMaintTypeId"> <drop-down allow-empty="true" > - <entity-options description="${description}" entity-name="ProductMaintType"> + <entity-options entity-name="ProductMaintType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1427,7 +1427,7 @@ under the License. <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="intervalUomId"> <drop-down allow-empty="false"> - <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1435,7 +1435,7 @@ under the License. </field> <field name="intervalMeterTypeId"> <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> @@ -1455,14 +1455,14 @@ under the License. <field name="productId"><hidden/></field> <field name="productMeterTypeId"> <drop-down allow-empty="false"> - <entity-options entity-name="ProductMeterType" description="${description}"> + <entity-options entity-name="ProductMeterType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> <field name="meterUomId"> <drop-down allow-empty="false"> - <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1484,7 +1484,7 @@ under the License. </field> <field name="meterUomId"> <drop-down allow-empty="false"> - <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1513,7 +1513,7 @@ under the License. </field> <field name="productGeoEnumId"> <drop-down allow-empty="false"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="PROD_GEO"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -1534,7 +1534,7 @@ under the License. <field name="geoId"><display also-hidden="true"/></field> <field name="productGeoEnumId"> <drop-down allow-empty="false"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="PROD_GEO"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -1552,14 +1552,14 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> <field name="productFeatureId"> - <display-entity entity-name="ProductFeature" description="${description}"> + <display-entity entity-name="ProductFeature"> <sub-hyperlink target="EditFeature" description="[${productFeatureId}]"> <parameter param-name="productFeatureId"/> </sub-hyperlink> </display-entity> </field> <field name="productFeatureIdTo"> - <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId"> + <display-entity entity-name="ProductFeature" key-field-name="productFeatureId"> <sub-hyperlink target="EditFeature" description="[${productFeatureIdTo}]"> <parameter param-name="productFeatureId" from-field="productFeatureIdTo"/> </sub-hyperlink> @@ -1596,7 +1596,7 @@ under the License. </field> <field name="productFeatureIactnTypeId"> <drop-down allow-empty="false"> - <entity-options description="${description}" entity-name="ProductFeatureIactnType"> + <entity-options entity-name="ProductFeatureIactnType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1651,7 +1651,7 @@ under the License. <field name="productId"><hidden/></field> <field name="subscriptionResourceId"> - <display-entity entity-name="SubscriptionResource" description="${description}"> + <display-entity entity-name="SubscriptionResource"> <sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext"> <parameter param-name="subscriptionResourceId"/> </sub-hyperlink> @@ -1669,7 +1669,7 @@ under the License. </field> <field name="useRoleTypeId"> <drop-down allow-empty="true"> - <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId"> + <entity-options entity-name="RoleType" key-field-name="roleTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1697,7 +1697,7 @@ under the License. <field name="productId"><hidden/></field> <field name="subscriptionResourceId"> <drop-down allow-empty="false"> - <entity-options entity-name="SubscriptionResource" description="${description}"> + <entity-options entity-name="SubscriptionResource"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1713,7 +1713,7 @@ under the License. </field> <field name="useRoleTypeId"> <drop-down allow-empty="true"> - <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId"> + <entity-options entity-name="RoleType" key-field-name="roleTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1793,7 +1793,7 @@ under the License. </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> - <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"> + <entity-options entity-name="StatusItem" key-field-name="statusId"> <entity-constraint name="statusTypeId" value="WEFG_STATUS"/> <entity-order-by field-name="description"/> </entity-options> @@ -1801,7 +1801,7 @@ under the License. </field> <field name="workEffortGoodStdTypeId"> <drop-down no-current-selected-key=""> - <entity-options entity-name="WorkEffortGoodStandardType" description="${description}" key-field-name="workEffortGoodStdTypeId"> + <entity-options entity-name="WorkEffortGoodStandardType" key-field-name="workEffortGoodStdTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1823,12 +1823,12 @@ under the License. </sub-hyperlink> </display-entity> </field> - <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field> + <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType"/></field> <field name="productId"><hidden/></field> <field name="fromDate"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> - <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"> + <entity-options entity-name="StatusItem" key-field-name="statusId"> <entity-constraint name="statusTypeId" value="WEFG_STATUS"/> <entity-order-by field-name="description"/> </entity-options> @@ -1923,7 +1923,7 @@ under the License. <field name="productId"><hidden/></field> <field name="goodIdentificationTypeId" title="${uiLabelMap.ProductIdType}"> <drop-down allow-empty="false" no-current-selected-key="ISBN"> - <entity-options entity-name="GoodIdentificationType" description="${description}"> + <entity-options entity-name="GoodIdentificationType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1951,7 +1951,7 @@ under the License. <field name="relevancyWeight"><text default-value="1"/></field> <field name="keywordTypeId"> <drop-down> - <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="KEYWORD_TYPE"/> <entity-order-by field-name="description"/> </entity-options> @@ -1959,7 +1959,7 @@ under the License. </field> <field name="statusId"> <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="KEYWORD_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -1983,12 +1983,12 @@ under the License. <field name="productId"><hidden/></field> <field name="keyword"><display/></field> <field name="keywordTypeId" title="${uiLabelMap.FormFieldTitle_keywordType}"> - <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/> + <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="relevancyWeight"><display/></field> <field name="statusId"> <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="KEYWORD_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -2036,7 +2036,7 @@ under the License. </row-actions> <field name="productId"><hidden/></field> <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}"> - <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/> + <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId"/> </field> <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}"> <display description="${groovy: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/> @@ -2058,7 +2058,7 @@ under the License. <field name="productId"><hidden/></field> <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}"> <drop-down allow-empty="false"> - <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes" description="${description}"/> + <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes"/> </drop-down> </field> <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}"> @@ -2093,7 +2093,7 @@ under the License. <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field> <field name="productStoreGroupId"> <drop-down current="selected" allow-empty="false"> - <entity-options entity-name="ProductStoreGroup" key-field-name="productStoreGroupId" description="${description}"/> + <entity-options entity-name="ProductStoreGroup" key-field-name="productStoreGroupId"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -2111,10 +2111,10 @@ under the License. <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app"/> </field> <field name="subject"><display/></field> - <field name="communicationEventTypeId"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field> - <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> + <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field> + <field name="contactMechTypeId"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> - <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/> + <display-entity entity-name="StatusItem" key-field-name="statusId"/> </field> <field name="lastUpdatedStampCE" title="Email Sent On"><display/></field> <field name="contactMechIdTo" title="To Email Address"> @@ -2164,7 +2164,7 @@ under the License. <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId"> <drop-down allow-empty="false"> - <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId"> + <entity-options entity-name="RoleType" key-field-name="roleTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -2193,7 +2193,7 @@ under the License. <field name="soldOrderQty" title="${uiLabelMap.ProductSoldQuantity}"><display/></field> <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field> - <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&&${groovy: return thruDate.compareTo(org.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext"> <hyperlink target="EditProductGroupOrder" description="${uiLabelMap.CommonEdit}" also-hidden="false"> <parameter param-name="productId"/> @@ -2251,7 +2251,7 @@ under the License. <field name="keyword" title="${uiLabelMap.ProductTag}"><display/></field> <field name="statusId"> <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="KEYWORD_STATUS"/> <entity-order-by field-name="sequenceId"/> </entity-options> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Sat Jun 20 21:58:05 2015 @@ -113,7 +113,7 @@ </field> <field name="reserveOrderEnumId"> <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="INV_RES_ORDER"/> <entity-order-by field-name="description"/> </entity-options> @@ -130,7 +130,7 @@ </field> <field name="requirementMethodEnumId"> <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="PROD_REQ_METHOD"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -152,7 +152,7 @@ </field> <field name="defaultSalesChannelEnumId"> <drop-down allow-empty="true"> - <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration"> + <entity-options key-field-name="enumId" entity-name="Enumeration"> <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/> <entity-order-by field-name="description"/> </entity-options> @@ -230,7 +230,7 @@ </field> <field name="storeCreditAccountEnumId"> <drop-down allow-empty="false"> - <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration"> + <entity-options key-field-name="enumId" entity-name="Enumeration"> <entity-constraint name="enumTypeId" operator="equals" value="STR_CRDT_ACT"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -423,10 +423,10 @@ <auto-fields-service service-name="updateProductStoreFinActSetting" default-field-type="display"/> <field name="productStoreId"><ignored/></field> <field name="finAccountTypeId"> - <display-entity entity-name="FinAccountType" description="${description}" key-field-name="finAccountTypeId"/> + <display-entity entity-name="FinAccountType" key-field-name="finAccountTypeId"/> </field> <field name="replenishMethodEnumId"> - <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/> + <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="remove" title=" " widget-style="buttontext"> <hyperlink target="RemoveProductStoreFinAccountSettings" description="${uiLabelMap.CommonRemove}"> @@ -448,17 +448,17 @@ <field name="productStoreId"><hidden/></field> <field name="finAccountTypeId" use-when="finAccountSetting!=null"> - <display-entity entity-name="FinAccountType" also-hidden="true" description="${description}" key-field-name="finAccountTypeId"/> + <display-entity entity-name="FinAccountType" also-hidden="true" key-field-name="finAccountTypeId"/> </field> <field name="finAccountTypeId" use-when="finAccountSetting==null"> <drop-down allow-empty="false"> - <entity-options entity-name="FinAccountType" description="${description}" key-field-name="finAccountTypeId"/> + <entity-options entity-name="FinAccountType" key-field-name="finAccountTypeId"/> </drop-down> </field> <field name="replenishMethodEnumId"> <drop-down allow-empty="false" no-current-selected-key="FARP_TOP_OFF"> - <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="FARP_METHOD"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -511,7 +511,7 @@ <field name="productStoreId" map-name="productStore"><hidden/></field> <field name="emailType" title="${uiLabelMap.CommonEmailType}"> <drop-down> - <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="in" value="PRDS_EMAIL,PARTY_EMAIL"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -528,7 +528,7 @@ <auto-fields-service service-name="updateProductStoreEmailSetting"/> <field name="productStoreId"><hidden/></field> <field name="emailType" title="${uiLabelMap.CommonEmailType}"> - <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}" cache="true" also-hidden="true"/> + <display-entity entity-name="Enumeration" key-field-name="enumId" cache="true" also-hidden="true"/> </field> <field name="bodyScreenLocation" title="${uiLabelMap.ProductBodyScreenLocation}"></field> <field name="xslfoAttachScreenLocation" title="${uiLabelMap.ProductAttachmentScreenLocation}"></field> @@ -549,7 +549,7 @@ <field name="productStoreId" map-name="productStore"><hidden/></field> <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetTypeEnumId}"> <drop-down> - <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="KWOVRD_TRGT_TYPE"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -565,7 +565,7 @@ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display description="${fromDate}"/></field> <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetType}"> <drop-down> - <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="KWOVRD_TRGT_TYPE"/> <entity-order-by field-name="sequenceId"/> </entity-options> @@ -611,7 +611,7 @@ </hyperlink> </field> <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductMethod}"> - <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/> + <display-entity entity-name="ShipmentMethodType" cache="true" also-hidden="true"/> </field> <field name="roleTypeId"><hidden/></field> <field name="includeGeoId"> @@ -630,7 +630,7 @@ <display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description} (${customMethodName})"/> </field> <field name="shipmentGatewayConfigId" title="${uiLabelMap.FacilityShipmentGatewayConfigId}"> - <display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" description="${description}"/> + <display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" /> </field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink target="storeRemoveShipMeth" description="${uiLabelMap.CommonRemove}" also-hidden="false"> @@ -646,7 +646,7 @@ <field name="productStoreId"><hidden/></field> <field name="productStoreShipMethId" use-when="productStoreShipmentMeth!=null"><display/></field> <field name="shipmentMethodTypeId"> - <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/> + <display-entity entity-name="ShipmentMethodType" cache="true" also-hidden="true"/> </field> <field name="roleTypeId"><display/></field> <field name="partyId"><display/></field> @@ -695,7 +695,7 @@ </field> <field name="shipmentGatewayConfigId" title="${uiLabelMap.FacilityShipmentGatewayConfigId}"> <drop-down allow-empty="true"> - <entity-options entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" description="${description}"> + <entity-options entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -717,7 +717,7 @@ </hyperlink> </field> <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductMethod}"> - <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/> + <display-entity entity-name="ShipmentMethodType" cache="true" also-hidden="true"/> </field> <field name="geoIdFrom" title="${uiLabelMap.ProductFromGeo}"> <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/> @@ -729,19 +729,19 @@ <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity} [${quantityBreakId}]"/> </field> <field name="weightUomId" title="${uiLabelMap.ProductUnitOfMeasure}"> - <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> + <display-entity entity-name="Uom" key-field-name="uomId"/> </field> <field name="quantityBreakId"> <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity} [${quantityBreakId}]"/> </field> <field name="quantityUomId" title="${uiLabelMap.ProductUnitOfMeasure}"> - <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> + <display-entity entity-name="Uom" key-field-name="uomId"/> </field> <field name="priceBreakId"> <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity} [${quantityBreakId}]"/> </field> <field name="priceUomId" title="${uiLabelMap.ProductUnitOfMeasure}"> - <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> + <display-entity entity-name="Uom" key-field-name="uomId"/> </field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink target="storeRemoveShipRate" description="${uiLabelMap.CommonRemove}" also-hidden="false"> @@ -796,7 +796,7 @@ <field name="wuom" title="${uiLabelMap.ProductUnitOfMeasure}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" value="WEIGHT_MEASURE"/> <entity-order-by field-name="description"/> </entity-options> @@ -817,7 +817,7 @@ </field> <field name="quom" title="${uiLabelMap.ProductUnitOfMeasure}"> <drop-down allow-empty="true"> - <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> + <entity-options entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" operator="not-equals" value="CURRENCY_MEASURE"/> <entity-order-by field-name="description"/> </entity-options> @@ -934,7 +934,7 @@ <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/> </field> <field name="weightUomId" title="${uiLabelMap.ProductUnitOfMeasure}"> - <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> + <display-entity entity-name="Uom" key-field-name="uomId"/> </field> <field name="weightUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field> @@ -944,7 +944,7 @@ <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/> </field> <field name="quantityUomId" title="${uiLabelMap.ProductUnitOfMeasure}"> - <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> + <display-entity entity-name="Uom" key-field-name="uomId"/> </field> <field name="quantityUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field> @@ -954,7 +954,7 @@ <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/> </field> <field name="priceUomId" title="${uiLabelMap.ProductUnitOfMeasure}"> - <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> + <display-entity entity-name="Uom" key-field-name="uomId"/> </field> <field name="priceUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field> </form> @@ -963,10 +963,10 @@ <field name="productStoreId"><hidden/></field> <field name="vendorPartyId"><display/></field> <field name="paymentMethodTypeId"> - <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/> + <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/> </field> <field name="creditCardEnumId"> - <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> + <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -976,7 +976,7 @@ <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field> <field name="paymentMethodTypeId"> <drop-down current="selected" allow-empty="false"> - <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/> + <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/> </drop-down> </field> <field name="creditCardEnumId"> @@ -994,7 +994,7 @@ <field name="carrierPartyId"><display/></field> <field name="vendorPartyId"><display/></field> <field name="shipmentMethodTypeId"> - <display-entity entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/> + <display-entity entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/> </field> <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -1005,7 +1005,7 @@ <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field> <field name="shipmentMethodTypeId"> <drop-down current="selected" allow-empty="false"> - <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/> + <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -1060,17 +1060,17 @@ </actions> <field name="productStoreId"><hidden/></field> <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}"> - <display-entity entity-name="PaymentMethodType" description="${description}"/> + <display-entity entity-name="PaymentMethodType"/> </field> <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}"> - <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> + <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="paymentService" title="${uiLabelMap.ProductServiceName}"><display/></field> <field name="paymentCustomMethodId" title="${uiLabelMap.ProductCustomMethod}"> <display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description} (${customMethodName})"/> </field> <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}"> - <display-entity entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" description="${description}"/> + <display-entity entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" /> </field> <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field> <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field> @@ -1101,21 +1101,21 @@ <alt-target use-when="productStorePaymentSetting==null" target="storeCreatePaySetting"/> <field name="productStoreId"><hidden/></field> <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}" use-when="productStorePaymentSetting!=null"> - <display-entity entity-name="PaymentMethodType" also-hidden="true" description="${description}" key-field-name="paymentMethodTypeId"/> + <display-entity entity-name="PaymentMethodType" also-hidden="true" key-field-name="paymentMethodTypeId"/> </field> <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}" use-when="productStorePaymentSetting==null"> <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> </field> <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}" use-when="productStorePaymentSetting!=null"> - <display-entity entity-name="Enumeration" also-hidden="true" description="${description}" key-field-name="enumId"/> + <display-entity entity-name="Enumeration" also-hidden="true" key-field-name="enumId"/> </field> <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}"> <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="PRDS_PAYSVC"/> <entity-order-by field-name="description"/> </entity-options> @@ -1129,7 +1129,7 @@ </field> <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}"> <drop-down allow-empty="true"> - <entity-options entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" description="${description}"> + <entity-options entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml Sat Jun 20 21:58:05 2015 @@ -142,7 +142,7 @@ under the License. </hyperlink> </field> <field name="productPromoContentTypeId" title="${uiLabelMap.ProductProductPromoContentType}"> - <display-entity entity-name="ProductContentType" key-field-name="productContentTypeId" also-hidden="false" description="${description}"/> + <display-entity entity-name="ProductContentType" key-field-name="productContentTypeId" also-hidden="false"/> </field> <field name="fromDate"><display/></field> <field name="thruDate"><display/></field> Modified: ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml Sat Jun 20 21:58:05 2015 @@ -26,7 +26,7 @@ under the License. <field name="productId" title="${uiLabelMap.ProductId}"><text-find/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> - <entity-options entity-name="StatusItem" description="${description}"> + <entity-options entity-name="StatusItem"> <entity-constraint name="statusTypeId" operator="equals" value="PRODUCT_REVIEW_STTS"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml Sat Jun 20 21:58:05 2015 @@ -43,7 +43,7 @@ <field name="quantityBreakId"><hidden/></field> <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}"> <drop-down allow-empty="true"> - <entity-options entity-name="QuantityBreakType" description="${description}"> + <entity-options entity-name="QuantityBreakType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -110,7 +110,7 @@ <field name="roleTypeId" use-when="carrierShipmentMethod!=null"><display/></field> <field name="roleTypeId" use-when="carrierShipmentMethod==null"> <drop-down allow-empty="false" no-current-selected-key="CARRIER"> - <entity-options entity-name="RoleType" description="${description}"> + <entity-options entity-name="RoleType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Sat Jun 20 21:58:05 2015 @@ -27,7 +27,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="fromDate" position="1"><date-time/></field> @@ -84,7 +84,7 @@ under the License. <field name="productStoreId"><hidden/></field> <field name="roleTypeId" use-when="productStoreRole==null" title="${uiLabelMap.PartyRoleTypeId}" tooltip="${uiLabelMap.CommonRequired}"> <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="roleTypeId" use-when="productStoreRole!=null" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field> @@ -179,7 +179,7 @@ under the License. <field name="productStoreGroupId"><hidden/></field> <field name="productStoreGroupTypeId"> <drop-down> - <entity-options description="${description}" entity-name="ProductStoreGroupType"/> + <entity-options entity-name="ProductStoreGroupType"/> </drop-down> </field> <field name="primaryParentGroupId" use-when="productStoreGroup == null"><ignored/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |