Author: jleroux
Date: Thu Mar 17 14:32:16 2016
New Revision: 1735435
URL: http://svn.apache.org/viewvc?rev=1735435&view=rev
Log:
A slightly modified patch from Pierre Smits for <<comments on ordering products
should be store driven>> https://issues.apache.org/jira/browse/OFBIZ-6924
Currently, in ecommerce/tiny-gismo-GZ-1000-p a comment field is shown.
This is a result of the following code in productdetail.ftl
{code}
<#assign commentEnable =
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("order",
"order.item.comment.enable", delegator)>
<#if commentEnable.equals("Y")>
<#assign orderItemAttr =
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("order",
"order.item.attr.prefix", delegator)>
${uiLabelMap.CommonComment} <input type="text"
name="${orderItemAttr}comment"/>
</#if>
{code}
Based on the code excerpt this is set by a property value in the order
component. However this should be based on a configuration setting in the store.
jleroux: I simply changed the place of the ProductStore.allowComment field (not
after the old deprecated fields) and used a description instead of an XML
comment there.
Modified:
ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
Modified: ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1735435&r1=1735434&r2=1735435&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
(original)
+++ ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml Thu
Mar 17 14:32:16 2016
@@ -3777,12 +3777,14 @@ under the License.
<field name="managedByLot" type="indicator"><description>If Y, the
preparator can choose the InventoryItem by this lotId when he makes the
picklist.</description></field>
<field name="showOutOfStockProducts"
type="indicator"><description>Default Y. If N then out of stock products will
not be displayed on site</description></field>
<field name="orderDecimalQuantity" type="indicator"><description>use to
indicate if decimal quantity can be ordered for this producStore. Default value
is Y</description></field>
+ <field name="allowComment" type="indicator"><description>Allow comments
for order line items per store</description></field>
<!-- old fields, deprecated -->
<field name="oldStyleSheet" col-name="STYLE_SHEET" type="url"></field>
<field name="oldHeaderLogo" col-name="HEADER_LOGO" type="url"></field>
<field name="oldHeaderMiddleBackground"
col-name="HEADER_MIDDLE_BACKGROUND" type="url"></field>
<field name="oldHeaderRightBackground"
col-name="HEADER_RIGHT_BACKGROUND" type="url"></field>
+
<prim-key field="productStoreId"/>
<relation type="one" fk-name="PROD_STR_PRSTRGP" title="Primary"
rel-entity-name="ProductStoreGroup">
<key-map field-name="primaryStoreGroupId"
rel-field-name="productStoreGroupId"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=1735435&r1=1735434&r2=1735435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Thu
Mar 17 14:32:16 2016
@@ -37,388 +37,6 @@
<field name="title" title="${uiLabelMap.ProductTitle}"
sort-field="true"><display/></field>
<field name="subtitle" title="${uiLabelMap.ProductSubTitle}"
sort-field="true"><display/></field>
</form>
- <form name="EditProductStore" type="single" target="updateProductStore"
title="" default-map-name="productStore"
- header-row-style="header-row" default-table-style="basic-table">
-
- <alt-target use-when="productStore==null" target="createProductStore"/>
- <auto-fields-service service-name="updateProductStore" map-name=""/>
-
- <field use-when="productStore!=null" name="productStoreId"
tooltip="${uiLabelMap.ProductNotModificationRecreatingProductStore}"><display/></field>
- <field name="productStoreId"><hidden/></field>
-
- <field name="primaryStoreGroupId">
- <drop-down allow-empty="true">
- <entity-options entity-name="ProductStoreGroup"
key-field-name="productStoreGroupId" description="${productStoreGroupName}
[${productStoreGroupId}]">
- <entity-order-by field-name="productStoreGroupName"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="storeName" title="${uiLabelMap.ProductStoreName}"
required-field="true"><text size="30" maxlength="100"/></field>
- <field name="title" title="${uiLabelMap.ProductTitle}"><text size="30"
maxlength="100"/></field>
- <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><text
size="60" maxlength="250"/></field>
- <field name="payToPartyId"><lookup
target-form-name="LookupPartyName"/></field>
-
- <field name="inventoryFacilityId">
- <drop-down allow-empty="true">
- <entity-options entity-name="Facility"
key-field-name="facilityId" description="${facilityName} [${facilityId}]">
- <entity-order-by field-name="facilityName"/>
- </entity-options>
- </drop-down>
- </field>
- <field
use-when="productStore!=null&&productStore.getString("inventoryFacilityId")!=null"
name="inventoryFacilityLink" title=" " widget-style="buttontext">
- <hyperlink target="/facility/control/EditFacility"
target-type="inter-app" description="${uiLabelMap.CommonEdit}
${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}"
also-hidden="false">
- <parameter param-name="facilityId"
from-field="productStore.inventoryFacilityId"/>
- </hyperlink>
- </field>
-
- <field name="manualAuthIsCapture">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="prorateShipping">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="prorateTaxes">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="viewCartOnAdd">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoSaveCart">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoApproveReviews">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoInvoiceDigitalItems">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="reqShipAddrForDigItems">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
-
- <field name="isDemoStore">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="isImmediatelyFulfilled">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="checkInventory">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="requireInventory">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="reserveInventory">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="reserveOrderEnumId">
- <drop-down allow-empty="true">
- <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>
- </drop-down>
- </field>
- <field name="balanceResOnOrderCreation">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="showOutOfStockProducts">
- <drop-down allow-empty="false"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="oneInventoryFacility">
- <drop-down allow-empty="true" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="requirementMethodEnumId">
- <drop-down allow-empty="true">
- <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>
- </drop-down>
- </field>
-
- <!--
- <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- -->
- <field name="defaultCurrencyUomId">
- <drop-down allow-empty="false"
no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
- <entity-options key-field-name="uomId"
description="${description} - ${abbreviation}" entity-name="Uom">
- <entity-constraint name="uomTypeId" operator="equals"
value="CURRENCY_MEASURE"/>
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="defaultSalesChannelEnumId">
- <drop-down allow-empty="true">
- <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>
- </drop-down>
- </field>
- <field name="allowPassword">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="retryFailedAuths">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="headerApprovedStatus">
- <drop-down no-current-selected-key="ORDER_APPROVED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="itemApprovedStatus">
- <drop-down no-current-selected-key="ITEM_APPROVED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="digitalItemApprovedStatus">
- <drop-down no-current-selected-key="ITEM_APPROVED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="headerDeclinedStatus">
- <drop-down no-current-selected-key="ORDER_REJECTED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="itemDeclinedStatus">
- <drop-down no-current-selected-key="ITEM_REJECTED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="headerCancelStatus">
- <drop-down no-current-selected-key="ORDER_CANCELLED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="itemCancelStatus">
- <drop-down no-current-selected-key="ITEM_CANCELLED">
- <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
- <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
- <entity-order-by field-name="sequenceId"/>
- </entity-options>
- </drop-down>
- </field>
-
- <field name="visualThemeId">
- <drop-down allow-empty="true">
- <entity-options key-field-name="visualThemeId"
description="${visualThemeId} - ${description}" entity-name="VisualTheme">
- <entity-constraint name="visualThemeSetId"
operator="equals" value="ECOMMERCE"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="storeCreditAccountEnumId">
- <drop-down allow-empty="false">
- <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>
- </drop-down>
- </field>
- <field name="oldStyleSheet"><hidden/></field>
- <field name="managedByLot" title="${uiLabelMap.ProductManagedByLot}">
- <drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
- </drop-down>
- </field>
- <field name="oldHeaderLogo"><hidden/></field>
- <field name="oldHeaderMiddleBackground"><hidden/></field>
- <field name="oldHeaderRightBackground"><hidden/></field>
- <!--
- <field name="contentPathPrefix" tooltip="If specified will be
prepended to image and other content paths. Should start with a slash but not
end with one."><text size="60" maxlength="250"/></field>
- <field name="templatePathPrefix" tooltip="If specified will be
prepended to template paths. Should start with a slash but not end with
one."><text size="60" maxlength="250"/></field>
- -->
- <field name="explodeOrderItems">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="checkGcBalance">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="usePrimaryEmailUsername">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="requireCustomerRole">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="showCheckoutGiftOptions">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="selectPaymentTypePerItem">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="showPricesWithVatTax">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="showTaxIsExempt">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="vatTaxAuthGeoId"><lookup
target-form-name="LookupGeo"/></field>
- <field name="vatTaxAuthPartyId"><lookup
target-form-name="LookupPartyName"/></field>
- <field name="prodSearchExcludeVariants">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
-
- <field name="enableDigProdUpload">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="digProdUploadCategoryId"><lookup
target-form-name="LookupProductCategory"/></field>
- <field name="enableAutoSuggestionList">
- <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoOrderCcTryExp">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoOrderCcTryOtherCards">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoOrderCcTryLaterNsf">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoApproveInvoice">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="autoApproveOrder">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="shipIfCaptureFails">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="setOwnerUponIssuance">
- <drop-down allow-empty="true"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="reqReturnInventoryReceive">
- <drop-down allow-empty="true"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="orderDecimalQuantity"
tooltip="${uiLabelMap.ProductOrderDecimalQuantityExistsToOverride}">
- <drop-down allow-empty="true" ><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
- <sort-order>
- <field-group>
- <sort-field name="productStoreId"/>
- <sort-field name="primaryStoreGroupId"/>
- <sort-field name="storeName"/>
- <sort-field name="title"/>
- <sort-field name="subtitle"/>
- <sort-field name="companyName"/>
- <sort-field name="isDemoStore"/>
- <sort-field name="visualThemeId"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonInventory}"
collapsible="true">
- <sort-field name="inventoryFacilityId"/>
- <sort-field name="oneInventoryFacility"/>
- <sort-field name="isImmediatelyFulfilled"/>
- <sort-field name="checkInventory"/>
- <sort-field name="requireInventory"/>
- <sort-field name="requirementMethodEnumId"/>
- <sort-field name="reserveInventory"/>
- <sort-field name="reserveOrderEnumId"/>
- <sort-field name="balanceResOnOrderCreation"/>
- <sort-field name="showOutOfStockProducts"/>
- <sort-field name="managedByLot"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonShoppingCart}"
collapsible="true" initially-collapsed="true">
- <sort-field name="viewCartOnAdd"/>
- <sort-field name="autoSaveCart"/>
- <sort-field name="addToCartReplaceUpsell"/>
- <sort-field name="addToCartRemoveIncompat"/>
- <sort-field name="showCheckoutGiftOptions"/>
- <sort-field name="prodSearchExcludeVariants"/>
- <sort-field name="orderDecimalQuantity"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonShipping}"
collapsible="true" initially-collapsed="true">
- <sort-field name="prorateShipping"/>
- <sort-field name="reqShipAddrForDigItems"/>
- <sort-field name="selectPaymentTypePerItem"/>
- <sort-field name="shipIfCaptureFails"/>
- <sort-field name="splitPayPrefPerShpGrp"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonPayments}"
collapsible="true" initially-collapsed="true">
- <sort-field name="payToPartyId"/>
- <sort-field name="storeCreditAccountEnumId"/>
- <sort-field name="manualAuthIsCapture"/>
- <sort-field name="retryFailedAuths"/>
- <sort-field name="daysToCancelNonPay"/>
- <sort-field name="autoOrderCcTryExp"/>
- <sort-field name="autoOrderCcTryOtherCards"/>
- <sort-field name="autoOrderCcTryLaterNsf"/>
- <sort-field name="autoOrderCcTryLaterMax"/>
- <sort-field name="storeCreditValidDays"/>
- <sort-field name="setOwnerUponIssuance"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonOrders}" collapsible="true"
initially-collapsed="true">
- <sort-field name="orderNumberPrefix"/>
- <sort-field name="defaultSalesChannelEnumId"/>
- <sort-field name="explodeOrderItems"/>
- <sort-field name="checkGcBalance"/>
- <sort-field name="autoInvoiceDigitalItems"/>
- <sort-field name="autoApproveInvoice"/>
- <sort-field name="autoApproveOrder"/>
- <sort-field name="reqReturnInventoryReceive"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonLocalisation}"
collapsible="true" initially-collapsed="true">
- <sort-field name="defaultLocaleString"/>
- <sort-field name="defaultCurrencyUomId"/>
- <sort-field name="defaultTimeZoneString"/>
- </field-group>
- <field-group title="${uiLabelMap.ProductOrdersStatus}"
collapsible="true" initially-collapsed="true">
- <sort-field name="headerApprovedStatus"/>
- <sort-field name="itemApprovedStatus"/>
- <sort-field name="digitalItemApprovedStatus"/>
- <sort-field name="headerDeclinedStatus"/>
- <sort-field name="itemDeclinedStatus"/>
- <sort-field name="headerCancelStatus"/>
- <sort-field name="itemCancelStatus"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonMessages}"
collapsible="true" initially-collapsed="true">
- <sort-field name="authDeclinedMessage"/>
- <sort-field name="authFraudMessage"/>
- <sort-field name="authErrorMessage"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonTax}" collapsible="true"
initially-collapsed="true">
- <sort-field name="prorateTaxes"/>
- <sort-field name="showPricesWithVatTax"/>
- <sort-field name="showTaxIsExempt"/>
- <sort-field name="vatTaxAuthGeoId"/>
- <sort-field name="vatTaxAuthPartyId"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonVisitors}"
collapsible="true" initially-collapsed="true">
- <sort-field name="autoApproveReviews"/>
- <sort-field name="allowPassword"/>
- <sort-field name="defaultPassword"/>
- <sort-field name="usePrimaryEmailUsername"/>
- <sort-field name="requireCustomerRole"/>
- <sort-field name="enableAutoSuggestionList"/>
- </field-group>
- <field-group title="${uiLabelMap.CommonUpload}" collapsible="true"
initially-collapsed="true">
- <sort-field name="enableDigProdUpload"/>
- <sort-field name="digProdUploadCategoryId"/>
- </field-group>
- </sort-order>
- </form>
-
<form name="ListProductStoreFinAccountSettings" type="list"
target="UpdateProductStoreFinAccountSettings"
list-name="productStoreFinActSettings"
odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-service service-name="updateProductStoreFinActSetting"
default-field-type="display"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=1735435&r1=1735434&r2=1735435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Thu Mar 17
14:32:16 2016
@@ -20,7 +20,394 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
+
+ <form name="EditProductStore" type="single" target="updateProductStore"
title="" default-map-name="productStore"
+ header-row-style="header-row" default-table-style="basic-table">
+
+ <alt-target use-when="productStore==null" target="createProductStore"/>
+ <auto-fields-service service-name="updateProductStore" map-name=""/>
+ <field use-when="productStore!=null" name="productStoreId"
tooltip="${uiLabelMap.ProductNotModificationRecreatingProductStore}"><display/></field>
+ <field name="productStoreId"><hidden/></field>
+
+ <field name="primaryStoreGroupId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="ProductStoreGroup"
key-field-name="productStoreGroupId" description="${productStoreGroupName}
[${productStoreGroupId}]">
+ <entity-order-by field-name="productStoreGroupName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="storeName" title="${uiLabelMap.ProductStoreName}"
required-field="true"><text size="30" maxlength="100"/></field>
+ <field name="title" title="${uiLabelMap.ProductTitle}"><text size="30"
maxlength="100"/></field>
+ <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><text
size="60" maxlength="250"/></field>
+ <field name="payToPartyId"><lookup
target-form-name="LookupPartyName"/></field>
+
+ <field name="inventoryFacilityId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Facility"
key-field-name="facilityId" description="${facilityName} [${facilityId}]">
+ <entity-order-by field-name="facilityName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field
use-when="productStore!=null&&productStore.getString("inventoryFacilityId")!=null"
name="inventoryFacilityLink" title=" " widget-style="buttontext">
+ <hyperlink target="/facility/control/EditFacility"
target-type="inter-app" description="${uiLabelMap.CommonEdit}
${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}"
also-hidden="false">
+ <parameter param-name="facilityId"
from-field="productStore.inventoryFacilityId"/>
+ </hyperlink>
+ </field>
+
+ <field name="manualAuthIsCapture">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="prorateShipping">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="prorateTaxes">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="viewCartOnAdd">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoSaveCart">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoApproveReviews">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoInvoiceDigitalItems">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="reqShipAddrForDigItems">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+
+ <field name="isDemoStore">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="isImmediatelyFulfilled">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="checkInventory">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="requireInventory">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="reserveInventory">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="reserveOrderEnumId">
+ <drop-down allow-empty="true">
+ <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>
+ </drop-down>
+ </field>
+ <field name="balanceResOnOrderCreation">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="showOutOfStockProducts">
+ <drop-down allow-empty="false"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="oneInventoryFacility">
+ <drop-down allow-empty="true" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="requirementMethodEnumId">
+ <drop-down allow-empty="true">
+ <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>
+ </drop-down>
+ </field>
+
+ <!--
+ <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ -->
+ <field name="defaultCurrencyUomId">
+ <drop-down allow-empty="false"
no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
+ <entity-options key-field-name="uomId"
description="${description} - ${abbreviation}" entity-name="Uom">
+ <entity-constraint name="uomTypeId" operator="equals"
value="CURRENCY_MEASURE"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="defaultSalesChannelEnumId">
+ <drop-down allow-empty="true">
+ <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>
+ </drop-down>
+ </field>
+ <field name="allowPassword">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="retryFailedAuths">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="headerApprovedStatus">
+ <drop-down no-current-selected-key="ORDER_APPROVED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="itemApprovedStatus">
+ <drop-down no-current-selected-key="ITEM_APPROVED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="digitalItemApprovedStatus">
+ <drop-down no-current-selected-key="ITEM_APPROVED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="headerDeclinedStatus">
+ <drop-down no-current-selected-key="ORDER_REJECTED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="itemDeclinedStatus">
+ <drop-down no-current-selected-key="ITEM_REJECTED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="headerCancelStatus">
+ <drop-down no-current-selected-key="ORDER_CANCELLED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="itemCancelStatus">
+ <drop-down no-current-selected-key="ITEM_CANCELLED">
+ <entity-options entity-name="StatusItem"
key-field-name="statusId" description="${description} [${statusCode}]">
+ <entity-constraint name="statusTypeId"
value="ORDER_ITEM_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="visualThemeId">
+ <drop-down allow-empty="true">
+ <entity-options key-field-name="visualThemeId"
description="${visualThemeId} - ${description}" entity-name="VisualTheme">
+ <entity-constraint name="visualThemeSetId"
operator="equals" value="ECOMMERCE"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="storeCreditAccountEnumId">
+ <drop-down allow-empty="false">
+ <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>
+ </drop-down>
+ </field>
+ <field name="oldStyleSheet"><hidden/></field>
+ <field name="managedByLot" title="${uiLabelMap.ProductManagedByLot}">
+ <drop-down allow-empty="false" no-current-selected-key="N">
+ <option key="Y" description="${uiLabelMap.CommonY}"/>
+ <option key="N" description="${uiLabelMap.CommonN}"/>
+ </drop-down>
+ </field>
+ <field name="oldHeaderLogo"><hidden/></field>
+ <field name="oldHeaderMiddleBackground"><hidden/></field>
+ <field name="oldHeaderRightBackground"><hidden/></field>
+ <!--
+ <field name="contentPathPrefix" tooltip="If specified will be
prepended to image and other content paths. Should start with a slash but not
end with one."><text size="60" maxlength="250"/></field>
+ <field name="templatePathPrefix" tooltip="If specified will be
prepended to template paths. Should start with a slash but not end with
one."><text size="60" maxlength="250"/></field>
+ -->
+ <field name="explodeOrderItems">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="checkGcBalance">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="usePrimaryEmailUsername">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="requireCustomerRole">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="showCheckoutGiftOptions">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="selectPaymentTypePerItem">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="showPricesWithVatTax">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="showTaxIsExempt">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="vatTaxAuthGeoId"><lookup
target-form-name="LookupGeo"/></field>
+ <field name="vatTaxAuthPartyId"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="prodSearchExcludeVariants">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+
+ <field name="enableDigProdUpload">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="digProdUploadCategoryId"><lookup
target-form-name="LookupProductCategory"/></field>
+ <field name="enableAutoSuggestionList">
+ <drop-down allow-empty="false" no-current-selected-key="N"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoOrderCcTryExp">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoOrderCcTryOtherCards">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoOrderCcTryLaterNsf">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoApproveInvoice">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="autoApproveOrder">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="shipIfCaptureFails">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="setOwnerUponIssuance">
+ <drop-down allow-empty="true"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="reqReturnInventoryReceive">
+ <drop-down allow-empty="true"><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="orderDecimalQuantity"
tooltip="${uiLabelMap.ProductOrderDecimalQuantityExistsToOverride}">
+ <drop-down allow-empty="true" ><option key="Y"
description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="allowComment">
+ <drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
+ <sort-order>
+ <field-group>
+ <sort-field name="productStoreId"/>
+ <sort-field name="primaryStoreGroupId"/>
+ <sort-field name="storeName"/>
+ <sort-field name="title"/>
+ <sort-field name="subtitle"/>
+ <sort-field name="companyName"/>
+ <sort-field name="isDemoStore"/>
+ <sort-field name="visualThemeId"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonInventory}"
collapsible="true">
+ <sort-field name="inventoryFacilityId"/>
+ <sort-field name="oneInventoryFacility"/>
+ <sort-field name="isImmediatelyFulfilled"/>
+ <sort-field name="checkInventory"/>
+ <sort-field name="requireInventory"/>
+ <sort-field name="requirementMethodEnumId"/>
+ <sort-field name="reserveInventory"/>
+ <sort-field name="reserveOrderEnumId"/>
+ <sort-field name="balanceResOnOrderCreation"/>
+ <sort-field name="showOutOfStockProducts"/>
+ <sort-field name="managedByLot"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonShoppingCart}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="viewCartOnAdd"/>
+ <sort-field name="autoSaveCart"/>
+ <sort-field name="addToCartReplaceUpsell"/>
+ <sort-field name="addToCartRemoveIncompat"/>
+ <sort-field name="showCheckoutGiftOptions"/>
+ <sort-field name="prodSearchExcludeVariants"/>
+ <sort-field name="orderDecimalQuantity"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonShipping}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="prorateShipping"/>
+ <sort-field name="reqShipAddrForDigItems"/>
+ <sort-field name="selectPaymentTypePerItem"/>
+ <sort-field name="shipIfCaptureFails"/>
+ <sort-field name="splitPayPrefPerShpGrp"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonPayments}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="payToPartyId"/>
+ <sort-field name="storeCreditAccountEnumId"/>
+ <sort-field name="manualAuthIsCapture"/>
+ <sort-field name="retryFailedAuths"/>
+ <sort-field name="daysToCancelNonPay"/>
+ <sort-field name="autoOrderCcTryExp"/>
+ <sort-field name="autoOrderCcTryOtherCards"/>
+ <sort-field name="autoOrderCcTryLaterNsf"/>
+ <sort-field name="autoOrderCcTryLaterMax"/>
+ <sort-field name="storeCreditValidDays"/>
+ <sort-field name="setOwnerUponIssuance"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonOrders}" collapsible="true"
initially-collapsed="true">
+ <sort-field name="orderNumberPrefix"/>
+ <sort-field name="defaultSalesChannelEnumId"/>
+ <sort-field name="explodeOrderItems"/>
+ <sort-field name="checkGcBalance"/>
+ <sort-field name="autoInvoiceDigitalItems"/>
+ <sort-field name="autoApproveInvoice"/>
+ <sort-field name="autoApproveOrder"/>
+ <sort-field name="reqReturnInventoryReceive"/>
+ <sort-field name="allowComment"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonLocalisation}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="defaultLocaleString"/>
+ <sort-field name="defaultCurrencyUomId"/>
+ <sort-field name="defaultTimeZoneString"/>
+ </field-group>
+ <field-group title="${uiLabelMap.ProductOrdersStatus}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="headerApprovedStatus"/>
+ <sort-field name="itemApprovedStatus"/>
+ <sort-field name="digitalItemApprovedStatus"/>
+ <sort-field name="headerDeclinedStatus"/>
+ <sort-field name="itemDeclinedStatus"/>
+ <sort-field name="headerCancelStatus"/>
+ <sort-field name="itemCancelStatus"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonMessages}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="authDeclinedMessage"/>
+ <sort-field name="authFraudMessage"/>
+ <sort-field name="authErrorMessage"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonTax}" collapsible="true"
initially-collapsed="true">
+ <sort-field name="prorateTaxes"/>
+ <sort-field name="showPricesWithVatTax"/>
+ <sort-field name="showTaxIsExempt"/>
+ <sort-field name="vatTaxAuthGeoId"/>
+ <sort-field name="vatTaxAuthPartyId"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonVisitors}"
collapsible="true" initially-collapsed="true">
+ <sort-field name="autoApproveReviews"/>
+ <sort-field name="allowPassword"/>
+ <sort-field name="defaultPassword"/>
+ <sort-field name="usePrimaryEmailUsername"/>
+ <sort-field name="requireCustomerRole"/>
+ <sort-field name="enableAutoSuggestionList"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonUpload}" collapsible="true"
initially-collapsed="true">
+ <sort-field name="enableDigProdUpload"/>
+ <sort-field name="digProdUploadCategoryId"/>
+ </field-group>
+ </sort-order>
+ </form>
+
+
<form name="FindProductStoreRole" type="single"
target="FindProductStoreRoles" default-entity-name="ProductStoreRole">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="productStoreId"
title="${uiLabelMap.ProductStoreId}"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1735435&r1=1735434&r2=1735435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Thu Mar 17
14:32:16 2016
@@ -56,7 +56,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ProductProductStore}">
- <include-form name="EditProductStore"
location="component://product/widget/catalog/ProductStoreForms.xml"/>
+ <include-form name="EditProductStore"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
