Author: jleroux
Date: Mon Jul 21 07:17:44 2014
New Revision: 1612199
URL: http://svn.apache.org/r1612199
Log:
Keeps in sync with OFBiz trunk HEAD
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ant.bat
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AgreementScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/ofbiz-component.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1610377-1612198
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Jul
21 07:17:44 2014
@@ -14,7 +14,6 @@
<classpathentry kind="lib"
path="framework/base/lib/ant-1.9.0-ant-junit.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/avalon-framework-4.2.0.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ant.bat
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ant.bat?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ant.bat (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ant.bat Mon Jul 21
07:17:44 2014
@@ -1,4 +1,4 @@
-ECHO OFF
+@ECHO OFF
REM #####################################################################
REM # Licensed to the Apache Software Foundation (ASF) under one
REM # or more contributor license agreements. See the NOTICE file
@@ -17,12 +17,11 @@ REM # KIND, either express or implied.
REM # specific language governing permissions and limitations
REM # under the License.
REM #####################################################################
-ECHO ON
IF DEFINED JAVA_HOME (
- SET JAVA="%JAVA_HOME%\bin\java"
+ SET JAVA="%JAVA_HOME%\bin\java"
) ELSE (
- SET JAVA="java"
+ SET JAVA="java"
)
SET TOP=%~dp0
@@ -30,10 +29,11 @@ SET LAUNCHER_JAR=
SET BASE_LIB=%TOP%\framework\base\lib
SET ANT_LIB=%BASE_LIB%\ant
FOR %%G IN (%BASE_LIB%\ant-*-ant-launcher.jar) DO SET LAUNCHER_JAR=%%G
-ECHO %LAUNCHER_JAR%
+REM ECHO %LAUNCHER_JAR%
IF [%LAUNCHER_JAR%] == [] (
- ECHO "Couldn't find ant-launcher.jar"
-) ELSE (
- %JAVA% -jar "%LAUNCHER_JAR%" -lib "%ANT_LIB%" %1 %2 %3 %4 %5 %6
+ ECHO "Couldn't find ant-launcher.jar"
+) ELSE (
+ ECHO %JAVA% -jar "%LAUNCHER_JAR%" -lib "%ANT_LIB%" %1 %2 %3 %4 %5 %6
+ %JAVA% -jar "%LAUNCHER_JAR%" -lib "%ANT_LIB%" %1 %2 %3 %4 %5 %6
)
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
Mon Jul 21 07:17:44 2014
@@ -100,12 +100,12 @@ under the License.
</iterate>
</if-compare>
<if-compare field="parameters.copyAgreementFacilities" value="Y"
operator="equals">
- <get-related value-field="agreement"
relation-name="AgreementFaclityAppl" list="agreementFaclityAppls"/>
- <iterate list="agreementFaclityAppls" entry="agreementFaclityAppl">
- <clear-field field="createAgreementFaclityApplInMap"/>
- <set-service-fields service-name="createAgreementFaclityAppl"
to-map="createAgreementFaclityApplInMap" map="agreementFaclityAppl"/>
- <set from-field="agreementIdTo"
field="createAgreementFaclityApplInMap.agreementId"/>
- <call-service service-name="createAgreementFaclityAppl"
in-map-name="createAgreementFaclityApplInMap"/>
+ <get-related value-field="agreement"
relation-name="AgreementFacilityAppl" list="agreementFacilityAppls"/>
+ <iterate list="agreementFacilityAppls"
entry="agreementFacilityAppl">
+ <clear-field field="createAgreementFacilityApplInMap"/>
+ <set-service-fields service-name="createAgreementFacilityAppl"
to-map="createAgreementFacilityApplInMap" map="agreementFacilityAppl"/>
+ <set from-field="agreementIdTo"
field="createAgreementFacilityApplInMap.agreementId"/>
+ <call-service service-name="createAgreementFacilityAppl"
in-map-name="createAgreementFacilityApplInMap"/>
</iterate>
</if-compare>
<if-compare field="parameters.copyAgreementParties" value="Y"
operator="equals">
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AgreementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AgreementScreens.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AgreementScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AgreementScreens.xml
Mon Jul 21 07:17:44 2014
@@ -485,9 +485,6 @@ under the License.
<screenlet
title="${uiLabelMap.AccountingAgreementItem}">
<include-form
name="ViewAgreementItemInfoForReport"
location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
- <screenlet
title="${uiLabelMap.AccountingAgreementItemFacilitiesForReport}">
- <include-form
name="ListAgreementItemFacilitiesForReport"
location="component://accounting/widget/AgreementForms.xml"/>
- </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/content/ContentServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/content/ContentServices.xml
Mon Jul 21 07:17:44 2014
@@ -778,13 +778,13 @@
<results-to-map map-name="persistOut"/>
</call-service>
- <iterate-map key="key" value="val" map="persistOut">
+ <set-service-fields service-name="createCommContentDataResource"
mode="OUT" map="persistOut" to-map="filteredPersistOut"/>
+ <iterate-map key="key" value="val" map="filteredPersistOut">
<if-compare field="key" operator="equals" value="responseMessage">
<continue/>
</if-compare>
<field-to-result field="val" result-name="${key}"/>
</iterate-map>
-
<set field="mapIn.contentId" from-field="persistOut.contentId"/>
<set field="mapIn.communicationEventId"
from-field="parameters.communicationEventId"/>
<set field="mapIn.sequenceNum" from-field="parameters.sequenceNum"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/script/org/ofbiz/content/data/DataServices.xml
Mon Jul 21 07:17:44 2014
@@ -60,6 +60,7 @@ under the License.
<create-value value-field="newEntity"/>
<field-to-result field="newEntity.dataResourceId"
result-name="dataResourceId"/>
+ <field-to-result field="newEntity" result-name="dataResource"/>
</simple-method>
<simple-method method-name="updateDataResource" short-description="Update
a Data Resource">
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
Mon Jul 21 07:17:44 2014
@@ -25,7 +25,6 @@ under the License.
<if-empty field="parameters.fromDate">
<now-timestamp field="parameters.fromDate"/>
</if-empty>
- <set field="" from-field=""/>
<set field="searchDuplicatedAncestorContext.productId"
from-field="parameters.productId"/>
<set field="searchDuplicatedAncestorContext.productIdTo"
from-field="parameters.productIdTo"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Mon Jul 21 07:17:44 2014
@@ -139,7 +139,7 @@
<set-service-fields service-name="updatePartyRelationship"
map="partyRelationship" to-map="deletePartyRelationship"/>
<set from-field="nowTimestamp"
field="deletePartyRelationship.thruDate"/>
<call-service service-name="updatePartyRelationship"
in-map-name="deletePartyRelationship"/>
- <log level="info" message="Expiring relationship
${deletePartyRelationship}"> </log>
+ <log level="info" message="Expiring relationship
${deletePartyRelationship}"/>
<clear-field field="deletePartyRelationship"/>
<clear-field field="partyRelationship"/>
</if-not-empty>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml
Mon Jul 21 07:17:44 2014
@@ -334,7 +334,6 @@ under the License.
<attribute name="shoppingCart"
type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
<attribute name="calcTax" type="Boolean" mode="IN" optional="true"
default-value="true"/>
<attribute name="deleteItems" type="Boolean" mode="IN" optional="true"
default-value="false"/>
- <!-- <attribute name="locale" type="" mode="IN" optional="false"/> -->
<attribute name="changeMap" type="Map" mode="IN" optional="false"/>
</service>
<service name="appendOrderItem" engine="java" auth="true"
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
Mon Jul 21 07:17:44 2014
@@ -947,8 +947,7 @@ under the License.
- editPicklistItem
-->
<simple-method method-name="editPicklistItem" short-description="Edit a
Picklist Item">
- <log level="info"><string>Edit a Picklist Item</string></log>
-
+
<make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="picklistItem"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml
Mon Jul 21 07:17:44 2014
@@ -925,17 +925,8 @@ under the License.
<field use-when="supplierProduct == null" name="submitButton"
title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
<field use-when="supplierProduct != null" name="submitButton"
title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
- <form name="ListSupplierProducts" type="list"
target="updateSupplierProduct" title="" list-name="listIt"
+ <form name="ListSupplierProducts" type="list"
target="updateSupplierProduct" title="" list-name="productSuppliers"
odd-row-style="alternate-row" default-table-style="basic-table">
- <actions>
- <service service-name="performFind" result-map="result"
result-map-list="listIt">
- <field-map field-name="inputFields"
from-field="requestParameters"/>
- <field-map field-name="entityName" value="SupplierProduct"/>
- <field-map field-name="orderBy"
from-field="parameters.sortField"/>
- <field-map field-name="viewIndex" from-field="viewIndex"/>
- <field-map field-name="viewSize" from-field="viewSize"/>
- </service>
- </actions>
<field name="partyId" title="${uiLabelMap.ProductSupplier}">
<display-entity entity-name="PartyNameView" also-hidden="true"
description="${firstName} ${middleName} ${lastName} ${groupName}">
<sub-hyperlink target="/partymgr/control/viewprofile"
target-type="inter-app" description="${partyId}" link-style="buttontext">
@@ -945,10 +936,10 @@ under the License.
</field>
<field name="supplierProductId"><display/></field>
<field name="minimumOrderQuantity"
title="${uiLabelMap.ProductMinimumOrderQuantity}" sort-field="true">
- <display type="date-time"/>
+ <display/>
</field>
<field name="orderQtyIncrements"
title="${uiLabelMap.ProductOrderQtyIncrements}" sort-field="true">
- <display type="date-time"/>
+ <display/>
</field>
<field name="supplierPrefOrderId">
<display-entity entity-name="SupplierPrefOrder"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductScreens.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductScreens.xml
Mon Jul 21 07:17:44 2014
@@ -856,7 +856,11 @@ under the License.
<!-- default currency in
framework/common/config/general.properties -->
<property-to-field field="defaultCurrencyUomId"
resource="general" property="currency.uom.id.default" default="USD"/>
-
+ <set field="orderBy" from-field="parameters.sortField"
default-value="partyId"/>
+ <entity-and entity-name="SupplierProduct"
list="productSuppliers">
+ <field-map field-name="productId"
from-field="parameters.productId"/>
+ <order-by field-name="${orderBy}"/>
+ </entity-and>
<entity-one entity-name="SupplierProduct"
value-field="supplierProduct" auto-field-map="true"/>
</actions>
<widgets>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/portal-controller.xml
Mon Jul 21 07:17:44 2014
@@ -21,7 +21,10 @@ under the License.
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd";>
<description>Portal ControlServlet Configuration File</description>
-
+
+ <request-map uri="main">
+ <response name="success" type="view" value="showPortalPage"/>
+ </request-map>
<!-- Portlet show requests -->
<request-map uri="showPortlet">
<security https="true" auth="true"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl
Mon Jul 21 07:17:44 2014
@@ -17,50 +17,50 @@ specific language governing permissions
under the License.
-->
<#escape x as x?html>
-<#if requestAttributes.errorMessageList?has_content><#assign
errorMessageList=requestAttributes.errorMessageList></#if>
-<#if requestAttributes.eventMessageList?has_content><#assign
eventMessageList=requestAttributes.eventMessageList></#if>
-<#if requestAttributes.serviceValidationException?exists><#assign
serviceValidationException = requestAttributes.serviceValidationException></#if>
-<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap =
requestAttributes.uiLabelMap></#if>
-
-<#if !errorMessage?has_content>
- <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
-</#if>
-<#if !errorMessageList?has_content>
- <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
-</#if>
-<#if !eventMessage?has_content>
- <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
-</#if>
-<#if !eventMessageList?has_content>
- <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
-</#if>
-
-<#-- display the error messages -->
-<#if (errorMessage?has_content || errorMessageList?has_content)>
- <div id="content-messages" class="content-messages errorMessage"
onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
- <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p>
- <#if errorMessage?has_content>
- <p>${StringUtil.wrapString(errorMessage)}</p>
- </#if>
- <#if errorMessageList?has_content>
- <#list errorMessageList as errorMsg>
- <p>${StringUtil.wrapString(errorMsg)}</p>
- </#list>
- </#if>
- </div>
-</#if>
-<#-- display the event messages -->
-<#if (eventMessage?has_content || eventMessageList?has_content)>
- <div id="content-messages" class="content-messages eventMessage"
onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
- <p>${uiLabelMap.CommonFollowingOccurred}:</p>
- <#if eventMessage?has_content>
- <p>${StringUtil.wrapString(eventMessage)}</p>
- </#if>
- <#if eventMessageList?has_content>
- <#list eventMessageList as eventMsg>
- <p>${StringUtil.wrapString(eventMsg)}</p>
- </#list>
- </#if>
- </div>
-</#if>
-</#escape>
\ No newline at end of file
+ <#if requestAttributes.errorMessageList?has_content><#assign
errorMessageList=requestAttributes.errorMessageList></#if>
+ <#if requestAttributes.eventMessageList?has_content><#assign
eventMessageList=requestAttributes.eventMessageList></#if>
+ <#if requestAttributes.serviceValidationException?exists><#assign
serviceValidationException = requestAttributes.serviceValidationException></#if>
+ <#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap =
requestAttributes.uiLabelMap></#if>
+
+ <#if !errorMessage?has_content>
+ <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+ </#if>
+ <#if !errorMessageList?has_content>
+ <#assign errorMessageList =
requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+ </#if>
+ <#if !eventMessage?has_content>
+ <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+ </#if>
+ <#if !eventMessageList?has_content>
+ <#assign eventMessageList =
requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+ </#if>
+
+ <#-- display the error messages -->
+ <#if (errorMessage?has_content || errorMessageList?has_content)>
+ <div id="content-messages" class="content-messages errorMessage"
onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
+
<#noescape><p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p></#noescape>
+ <#if errorMessage?has_content>
+ <p>${StringUtil.wrapString(errorMessage)}</p>
+ </#if>
+ <#if errorMessageList?has_content>
+ <#list errorMessageList as errorMsg>
+ <p>${StringUtil.wrapString(errorMsg)}</p>
+ </#list>
+ </#if>
+ </div>
+ </#if>
+ <#-- display the event messages -->
+ <#if (eventMessage?has_content || eventMessageList?has_content)>
+ <div id="content-messages" class="content-messages eventMessage"
onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
+ <#noescape><p>${uiLabelMap.CommonFollowingOccurred}:</p></#noescape>
+ <#if eventMessage?has_content>
+ <p>${StringUtil.wrapString(eventMessage)}</p>
+ </#if>
+ <#if eventMessageList?has_content>
+ <#list eventMessageList as eventMsg>
+ <p>${StringUtil.wrapString(eventMsg)}</p>
+ </#list>
+ </#if>
+ </div>
+ </#if>
+</#escape>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/ofbiz-component.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/ofbiz-component.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/ofbiz-component.xml
Mon Jul 21 07:17:44 2014
@@ -77,6 +77,7 @@ under the License.
<property name="default-listener" value="store-listener">
<property name="mail.store.protocol" value="imap"/>
<property name="mail.host" value="[host]"/>
+ <property name="mail.port" value="110"/>
<property name="mail.user" value="[user]"/>
<property name="mail.pass" value="[pass]"/>
<property name="mail.debug" value="false"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
Mon Jul 21 07:17:44 2014
@@ -25,6 +25,7 @@ import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+
import javax.mail.FetchProfile;
import javax.mail.Flags;
import javax.mail.Folder;
@@ -34,23 +35,23 @@ import javax.mail.NoSuchProviderExceptio
import javax.mail.Session;
import javax.mail.Store;
import javax.mail.URLName;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.FlagTerm;
import javax.mail.event.StoreEvent;
import javax.mail.event.StoreListener;
+import javax.mail.internet.MimeMessage;
+import javax.mail.search.FlagTerm;
import org.ofbiz.base.container.Container;
import org.ofbiz.base.container.ContainerConfig;
import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
-import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceContainer;
public class JavaMailContainer implements Container {
@@ -77,6 +78,7 @@ public class JavaMailContainer implement
* @throws org.ofbiz.base.container.ContainerException
*
*/
+ @Override
public void init(String[] args, String name, String configFile) throws
ContainerException {
this.name = name;
this.configFile = configFile;
@@ -91,6 +93,7 @@ public class JavaMailContainer implement
* @throws org.ofbiz.base.container.ContainerException
*
*/
+ @Override
public boolean start() throws ContainerException {
ContainerConfig.Container cfg = ContainerConfig.getContainer(name,
configFile);
String dispatcherName = ContainerConfig.getPropertyValue(cfg,
"dispatcher-name", "JavaMailDispatcher");
@@ -141,12 +144,14 @@ public class JavaMailContainer implement
* @throws org.ofbiz.base.container.ContainerException
*
*/
+ @Override
public void stop() throws ContainerException {
// stop the poller
this.pollTimer.shutdown();
Debug.logWarning("stop JavaMail poller", module);
}
+ @Override
public String getName() {
return name;
}
@@ -229,13 +234,39 @@ public class JavaMailContainer implement
host = props.getProperty("mail.host");
}
}
-
+
+ // check the port
+ int portProps = 0;
+ String portStr = props.getProperty("mail." + protocol + ".port");
+ if (!UtilValidate.isEmpty(portStr)) {
+ try {
+ portProps = Integer.valueOf(portStr);
+ } catch (NumberFormatException e) {
+ Debug.logError("The port given in property mail." + protocol +
".port is wrong, please check", module);
+ }
+ }
+ if (portProps == 0) {
+ portStr = props.getProperty("mail.port");
+ if (!UtilValidate.isEmpty(portStr)) {
+ try {
+ portProps =
Integer.valueOf(props.getProperty("mail.port"));
+ } catch (NumberFormatException e) {
+ Debug.logError("The port given in property mail.port is
wrong, please check", module);
+ }
+ }
+ }
+ // override the port if have found one.
+ if (portProps != 0) {
+ port = portProps;
+ }
+
if (Debug.verboseOn()) Debug.logVerbose("Update URL - " + protocol +
"://" + userName + "@" + host + ":" + port + "!" + password + ";" + file,
module);
return new URLName(protocol, host, port, file, userName, password);
}
class LoggingStoreListener implements StoreListener {
+ @Override
public void notification(StoreEvent event) {
String typeString = "";
switch (event.getMessageType()) {
@@ -261,6 +292,7 @@ public class JavaMailContainer implement
this.userLogin = userLogin;
}
+ @Override
public void run() {
if (UtilValidate.isNotEmpty(stores)) {
for (Map.Entry<Store, Session> entry: stores.entrySet()) {
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java
Mon Jul 21 07:17:44 2014
@@ -24,6 +24,7 @@ import java.io.Writer;
import javax.servlet.http.HttpServletResponse;
+import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilXml;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -32,6 +33,8 @@ import org.w3c.dom.Element;
* working with WebDAV requests and responses.*/
public class ResponseHelper {
+ public static final String module = ResponseHelper.class.getName();
+
public static final String DAV_NAMESPACE_URI = "DAV:";
public static final String STATUS_200 = "HTTP/1.1 200 OK";
public static final String STATUS_400 = "HTTP/1.1 400 Bad Request";
@@ -39,14 +42,17 @@ public class ResponseHelper {
public static final String STATUS_403 = "HTTP/1.1 403 Forbidden";
public static final String STATUS_404 = "HTTP/1.1 404 Not Found";
- @SuppressWarnings("deprecation")
public static void prepareResponse(HttpServletResponse response, int
statusCode, String statusString) {
response.setContentType("application/xml");
response.setCharacterEncoding("UTF-8");
if (statusString == null) {
response.setStatus(statusCode);
} else {
- response.setStatus(statusCode, statusString);
+ try {
+ response.sendError(statusCode, statusString);
+ } catch (IOException e) {
+ Debug.logError(e, module);
+ }
}
}
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Mon Jul 21 07:17:44 2014
@@ -39,6 +39,7 @@ import org.ofbiz.base.util.GeneralExcept
import org.ofbiz.base.util.UtilJavaParse;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilPlist;
+import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.minilang.MiniLangException;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.service.ModelParam;
@@ -121,7 +122,7 @@ public class ServiceArtifactInfo extends
}
protected void populateEntitiesFromNameSet(Set<String> allEntityNameSet)
throws GeneralException {
for (String entityName: allEntityNameSet) {
- if (entityName.contains("${")) {
+ if (UtilValidate.isEmpty(entityName) || entityName.contains("${"))
{
continue;
}
// attempt to convert relation names to entity names
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
Mon Jul 21 07:17:44 2014
@@ -337,8 +337,6 @@ context.dispArrList = dispArrList;
uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale);
uiLabelMap.addBottomResourceBundle("CommonUiLabels");
-selDisp = parameters.selDisp ?: "webtools";
-
curDispatchContext = dispatcher.getDispatchContext();
context.dispatcherName = dispatcher.getName();
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl
Mon Jul 21 07:17:44 2014
@@ -336,34 +336,13 @@ under the License.
<#-- Show alphabetical index -->
<#if serviceNamesAlphaList?exists && serviceNamesAlphaList?has_content>
- <form id='dispForm' method='post' action='<@ofbizUrl>${url}</@ofbizUrl>'>
<div class="button-bar">
<#assign isfirst=true>
<#list serviceNamesAlphaList as alpha>
<a
href='<@ofbizUrl>${url}?constraint=alpha@${alpha}</@ofbizUrl>'>${alpha}</a>
<#assign isfirst=false>
</#list>
- <#if dispArrList?exists && dispArrList?has_content>
-
- <script language='javascript' type='text/javascript'>
- function submitDispForm(){
- selObj = document.getElementById('sd');
- var dispVar = selObj.options[selObj.selectedIndex].value;
- if(dispVar != ''){
- document.getElementById('dispForm').submit();
- }
- }
- </script>
- <select id='sd' name='selDisp' onchange='submitDispForm();'>
- <option value=''
selected="selected">${uiLabelMap.WebtoolsSelectDispatcher}</option>
- <option value='' ></option>
- <#list dispArrList as disp>
- <option value='${disp}'>${disp}</option>
- </#list>
- </select>
- </#if>
</div>
- </form>
</#if>
<div class="screenlet">
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ProjectScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ProjectScreens.xml
Mon Jul 21 07:17:44 2014
@@ -505,6 +505,8 @@ under the License.
<select-field field-name="middleName"/>
<select-field field-name="groupName"/>
<select-field field-name="roleTypeId"/>
+ <select-field field-name="fromDate"/>
+ <select-field field-name="thruDate"/>
<order-by field-name="lastName"/>
<order-by field-name="firstName"/>
<order-by field-name="groupName"/>
@@ -523,6 +525,8 @@ under the License.
<select-field field-name="middleName"/>
<select-field field-name="groupName"/>
<select-field field-name="roleTypeId"/>
+ <select-field field-name="fromDate"/>
+ <select-field field-name="thruDate"/>
<order-by field-name="lastName"/>
<order-by field-name="firstName"/>
<order-by field-name="groupName"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1612199&r1=1612198&r2=1612199&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Mon Jul 21 07:17:44 2014
@@ -501,6 +501,8 @@
<select-field field-name="middleName"/>
<select-field field-name="groupName"/>
<select-field field-name="roleTypeId"/>
+ <select-field field-name="fromDate"/>
+ <select-field field-name="thruDate"/>
<order-by field-name="lastName"/>
<order-by field-name="firstName"/>
<order-by field-name="groupName"/>
@@ -519,6 +521,8 @@
</hyperlink>
</field>
<field name="roleTypeId"><display-entity entity-name="RoleType"
description="${description}"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display
type="date-time"/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display
type="date-time"/></field>
<field name="actualHours" entry-name="actualHours"
map-name="result.projectInfo"><display/></field>
<field name="nonBilledHours" entry-name="actualNonBilledHours"
map-name="result.projectInfo"><display/></field>
</form>
@@ -531,6 +535,8 @@
</hyperlink>
</field>
<field name="roleTypeId"><display-entity entity-name="RoleType"
description="${description}"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display
type="date-time"/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display
type="date-time"/></field>
</form>
<form name="ListProjectCompanyParties" type="list"
list-name="companyAssigns"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
@@ -547,6 +553,8 @@
</hyperlink>
</field>
<field name="roleTypeId"><display-entity entity-name="RoleType"
description="${description}"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display
type="date-time"/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display
type="date-time"/></field>
<field name="currencyUomId"><display-entity entity-name="Uom"
key-field-name="uomId" description="${description}"/></field>
</form>
<form name="EditWorkEffortPartyAssigns"
target="deleteWorkEffortPartyAssign" title="" type="list"
paginate-target="ListWorkEffortPartyAssigns"
