OFBiz › OFBiz - Commits

svn commit: r1153560 [3/15] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accountin...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

sascharodekamp

svn commit: r1153560 [3/15] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accountin...

Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Wed Aug 3 16:12:58 2011
@@ -722,7 +722,7 @@ public class DataResourceWorker impleme
if ("URL_RESOURCE".equals(dataResource.getString("dataResourceTypeId")) && UtilValidate.isNotEmpty(combinedName) && combinedName.startsWith("component://")) {
modelScreen = ScreenFactory.getScreenFromLocation(combinedName);
} else { // stored in a single file, long or short text
- Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, cache), true);
+ Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, cache), true, true);
Map<String, ModelScreen> modelScreenMap = ScreenFactory.readScreenDocument(screenXml, "DataResourceId: " + dataResource.getString("dataResourceId"));
if (UtilValidate.isNotEmpty(modelScreenMap)) {
Map.Entry<String, ModelScreen> entry = modelScreenMap.entrySet().iterator().next(); // get first entry, only one screen allowed per file

Modified: ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/flash-flv.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/flash-flv.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/flash-flv.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/flash-flv.ftl Wed Aug 3 16:12:58 2011
@@ -25,7 +25,7 @@
bufferLength: '100',
loop: false,
initialScale: 'fit',
- videoFile: '/content/control/stream?contentId=${contentId}',
+ videoFile: '<@ofbizUrl>stream?contentId=${contentId}</@ofbizUrl>',
showPlayListButtons: true
}" />
-</object>
\ No newline at end of file
+</object>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/image.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/image.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/image.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/image.ftl Wed Aug 3 16:12:58 2011
@@ -16,4 +16,4 @@
specific language governing permissions and limitations
under the License.
-->
-<img src="/content/control/stream?contentId=${contentId}" alt=""/>
\ No newline at end of file
+<img src="<@ofbizUrl>stream?contentId=${contentId}</@ofbizUrl>"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/quicktime.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/quicktime.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/quicktime.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/quicktime.ftl Wed Aug 3 16:12:58 2011
@@ -24,7 +24,7 @@
<param name="AUTOSTART" value="true" />
<param name="AUTOPLAY" value="true" />
<param name="KIOSKMODE" value="false" />
- <embed src="/content/control/stream?contentId=${contentId}" width="320" height="263" scale="tofit"
+ <embed src="<@ofbizUrl>stream?contentId=${contentId}</@ofbizUrl>" width="320" height="263" scale="tofit"
autostart="true" autoplay="true" kioskmode="false" target="quicktimeplayer"
pluginspage="http://www.apple.com/quicktime/download/">
</embed>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml Wed Aug 3 16:12:58 2011
@@ -358,6 +358,10 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="WebSiteAliases"/>
</request-map>
+ <request-map uri="WebSiteAliasesSearchResults">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="WebSiteAliasesSearchResults"/>
+ </request-map>


<request-map uri="WebSiteCms">
@@ -1002,12 +1006,6 @@ under the License.
<response name="success" type="none"/>
<response name="error" type="request" value="main"/>
</request-map>
- <request-map uri="stream">
- <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="serveObjectData"/>
- <response name="success" type="none"/>
- <response name="error" type="view" value="error"/>
- </request-map>
-

<request-map uri="EditContentOperation"><security auth="true" https="true"/><response name="success" type="view" value="EditContentOperation"/></request-map>
<request-map uri="addContentOperation">
@@ -1864,6 +1862,24 @@ under the License.
<response name="success" type="view" value="EditContentKeywords"/>
<response name="error" type="view" value="EditContentKeywords"/>
</request-map>
+ <request-map uri="updateContentAllKeywords">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.content.content.ContentEvents" invoke="updateAllContentKeywords"/>
+ <response name="success" type="view" value="FindContent"/>
+ <response name="error" type="view" value="FindContent"/>
+ </request-map>
+
+ 
+ <request-map uri="WebSiteSeo">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="WebSiteSEO"/>
+ </request-map>
+ <request-map uri="generateMissingSeoUrlForWebsite">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="generateMissingSeoUrlForWebsite"/>
+ <response name="success" type="view" value="WebSiteSEO"/>
+ <response name="error" type="view" value="WebSiteSEO"/>
+ </request-map>


<view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/>
@@ -1894,6 +1910,7 @@ under the License.
<view-map name="FindWebSite" page="component://content/widget/WebSiteScreens.xml#FindWebSite" type="screen"/>
<view-map name="EditWebSite" page="component://content/widget/WebSiteScreens.xml#EditWebSite" type="screen"/>
<view-map name="WebSiteAliases" page="component://content/widget/WebSiteScreens.xml#WebSiteAliases" type="screen"/>
+ <view-map name="WebSiteAliasesSearchResults" page="component://content/widget/WebSiteScreens.xml#WebSiteAliasesSearchResults" type="screen"/>
<view-map name="WebSiteContent" page="component://content/widget/WebSiteScreens.xml#WebSiteContent" type="screen"/>
<view-map name="WebSiteCMS" page="component://content/widget/WebSiteScreens.xml#WebSiteCMS" type="screen"/>
<view-map name="WebSiteCMSContent" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSContent" type="screen"/>
@@ -1902,6 +1919,7 @@ under the License.
<view-map name="WebSiteCMSPathAlias" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSPathAlias" type="screen"/>
<view-map name="WebSiteCMSNav" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSNav" type="screen"/>
<view-map name="EditWebSiteParties" page="component://content/widget/WebSiteScreens.xml#EditWebSiteParties" type="screen"/>
+ <view-map name="WebSiteSEO" page="component://content/widget/WebSiteScreens.xml#WebSiteSEO" type="screen"/>

<view-map name="EditContentPurpose" page="component://content/widget/content/ContentScreens.xml#EditContentPurpose" type="screen"/>
<view-map name="EditContentRole" page="component://content/widget/content/ContentScreens.xml#EditContentRole" type="screen"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/content/DisplayContentNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/content/DisplayContentNav.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/content/DisplayContentNav.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/content/DisplayContentNav.ftl Wed Aug 3 16:12:58 2011
@@ -36,7 +36,10 @@ var rawdata = [
<#macro fillTree assocList>
<#if (assocList?has_content)>
<#list assocList as assoc>
- <#assign content = delegator.findByPrimaryKey("Content",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",assoc.contentIdTo))/>
+ <#assign content = delegator.findOne("Content",{"contentId":assoc.contentIdTo},true)/>
+ <#if locale != "en">
+ <#assign content = Static["org.ofbiz.content.content.ContentWorker"].findAlternateLocaleContent(delegator, content, locale)/>
+ </#if>
{
"data": {"title" : unescapeHtmlText("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
<#assign assocChilds = delegator.findByAnd("ContentAssoc",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",assoc.contentIdTo,"contentAssocTypeId", "TREE_CHILD"), Static["org.ofbiz.base.util.UtilMisc"].toList("sequenceNum"))/>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteForms.xml Wed Aug 3 16:12:58 2011
@@ -74,18 +74,35 @@ under the License.
<field name="httpHost" sort-field="true"><display/></field>
</form>

- <form name="WebSitePathAlias" target="" title="" type="list" list-name="aliases" paginate-target="WebSiteAliases" paginate="true"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="pathAlias"><display/></field>
- <field name="pathAliasTo"><display/></field>
- <field name="mapKey"><display/></field>
- <field name="contentId">
+ <form name="FindWebSitePathAlias" target="WebSiteAliases" type="single" header-row-style="header-row" default-table-style="basic-table">
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="webSiteId"><hidden value="${webSiteId}"/></field>
+ <field name="pathAlias"><text-find ignore-case="true"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListWebSitePathAlias" target="" title="" list-name="listIt" type="list" paginate-target="WebSiteAliases"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="WebSitePathAlias"/>
+ <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="pathAlias" sort-field="true"><display/></field>
+ <field name="pathAliasTo" sort-field="true"><display/></field>
+ <field name="mapKey" sort-field="true"><display/></field>
+ <field name="contentId" sort-field="true">
<display-entity entity-name="Content" description="${contentName}">
<sub-hyperlink target="EditContent" description=" [${contentId}]">
<parameter param-name="contentId"/>
</sub-hyperlink>
</display-entity>
</field>
+ <on-event-update-area event-type="paginate" area-id="search-results" area-target="WebSiteAliasesSearchResults"/>
</form>


@@ -203,4 +220,26 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
+
+ 
+ <form name="CreateWebsiteSEO" type="single" target="generateMissingSeoUrlForWebsite" title=""
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="webSiteId"><hidden/></field>
+ <field name="prodCatalogId" title="${uiLabelMap.Catalog}">
+ <drop-down>
+ <option key="all" description="All"/>
+ <entity-options description="${prodCatalogId}" entity-name="ProductStoreCatalog">
+ <entity-constraint name="productStoreId" value="${webSite.productStoreId}"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="typeGenerate" title="Generate Type">
+ <check all-checked="false">
+ <option key="category" description="Category"/>
+ <option key="product" description="Product"/>
+ <option key="content" description="Content"/>
+ </check>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
+ </form>
</forms>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/CommonScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/CommonScreens.xml Wed Aug 3 16:12:58 2011
@@ -332,10 +332,13 @@ under the License.
<if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<widgets>
- <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${webSite.siteName} [${webSite.webSiteId}] ${${extraFunctionName}}"/>
- <container style="button-bar">
+ 
+ <container>
+ <include-menu name="websiteMenu" location="component://content/widget/content/ContentMenus.xml"/>
</container>
+ <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${webSite.siteName} [${webSite.webSiteId}] ${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml Wed Aug 3 16:12:58 2011
@@ -337,18 +337,56 @@ under the License.
<actions>
<set field="titleProperty" value="ContentPathAlias"/>
<set field="webSiteId" from-field="parameters.webSiteId"/>
- <entity-one entity-name="WebSite" value-field="webSite"/>
<set field="tabButtonItem" value="PathAlias"/>
- <entity-and entity-name="WebSitePathAlias" list="aliases">
- <field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
- </entity-and>
+ <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="WebSiteAliasesSearchResults">
+ <section>
+ <actions>
+ <set field="webSiteId" from-field="parameters.webSiteId"/>
+ </actions>
+ <widgets>
+ <include-form name="ListWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="WebSiteSEO">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleWebSiteSEO"/>
+ <set field="tabButtonItem" value="WebSiteSEO"/>
+ <set field="labelTitleProperty" value="PageTitleWebSiteSEO"/>
+ <set field="webSiteId" from-field="parameters.webSiteId"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
</actions>
<widgets>
<decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.ContentPathAliasList}" navigation-form-name="WebSitePathAlias">
- <include-form name="WebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/>
- </screenlet>
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleWebSiteSEO}">
+ <include-form name="CreateWebsiteSEO" location="component://content/webapp/content/website/WebSiteForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml Wed Aug 3 16:12:58 2011
@@ -169,6 +169,11 @@ under the License.
<parameter param-name="webSiteId" from-field="parameters.webSiteId"/>
</link>
</menu-item>
+ <menu-item name="WebSiteSEO" title="${uiLabelMap.ContentSEO}">
+ <link target="WebSiteSeo">
+ <parameter param-name="webSiteId" from-field="parameters.webSiteId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="blog" menu-container-style="button-bar tab-bar" default-selected-style="selected" default-menu-item-name="content" default-permission-operation="CONTENT_ADMIN"
default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem"
@@ -260,4 +265,20 @@ under the License.
<link target="showHelp?helpTopic=navigateHelp"/>
</menu-item>
</menu>
+ <menu name="contentMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="EditContent" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create">
+ <link target="EditContent"/>
+ </menu-item>
+ <menu-item name="ContentSearchOptions" title="${uiLabelMap.CommonAdvancedSearch}" widget-style="buttontext">
+ <link target="ContentSearchOptions"/>
+ </menu-item>
+ <menu-item name="UpdateContentAllKeywords" title="${uiLabelMap.ContentAutoCreateKeywords}" widget-style="buttontext">
+ <link target="updateContentAllKeywords"/>
+ </menu-item>
+ </menu>
+ <menu name="websiteMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="EditWebSite" title="${uiLabelMap.ContentCreateNewWebSite}" widget-style="buttontext create">
+ <link target="EditWebSite"/>
+ </menu-item>
+ </menu>
</menus>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml Wed Aug 3 16:12:58 2011
@@ -43,8 +43,9 @@ under the License.
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/>
- <link text="${uiLabelMap.CommonAdvancedSearch}" target="ContentSearchOptions" style="buttontext"/>
+ 
+ <include-menu name="contentMenu" location="component://content/widget/content/ContentMenus.xml"/>
</container>
</decorator-section>
<decorator-section name="search-options">

Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/forum/ForumForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/forum/ForumForms.xml Wed Aug 3 16:12:58 2011
@@ -148,11 +148,11 @@ under the License.
<field name="contentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field>
<field name="contentTypeId"><hidden/></field>
<field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
- <field position="1" name="messageTitle" entry-name="description" parameter-name="description"><display/></field>
- <field position="2" name="createdBy" entry-name="createdByUserLogin"><display/></field>
- <field position="3" name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field>
- <field position="4" name="thruDate" entry-name="caThruDate"><display description="${bsh:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field>
- <field position="5" name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage">
+ <field name="messageTitle" entry-name="description" parameter-name="description"><display/></field>
+ <field name="createdBy" entry-name="createdByUserLogin"><display/></field>
+ <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field>
+ <field name="thruDate" entry-name="caThruDate"><display description="${bsh:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field>
+ <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage">
<parameter param-name="forumGroupId"/>
<parameter param-name="forumId"/>
<parameter param-name="contentIdTo"/>
@@ -160,9 +160,9 @@ under the License.
<parameter param-name="contentAssocTypeId"/>
<parameter param-name="fromDate"/>
</hyperlink></field>
- <field position="6" name="messageText" entry-name="contentData.resultData.electronicText.textData" parameter-name="textData"><textarea rows="8"/></field>
- <field position="7" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field position="8" name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext">
+ <field name="messageText" entry-name="contentData.resultData.electronicText.textData" parameter-name="textData"><textarea rows="8"/></field>
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext">
<hyperlink target="addForumMessage" description="${uiLabelMap.FormFieldTitle_reponse}">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="forumId" from-field="parameters.forumId"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/entitydef/entitymodel.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/entitydef/entitymodel.xml Wed Aug 3 16:12:58 2011
@@ -919,7 +919,7 @@ under the License.
</entity>
<view-entity entity-name="EmplPositionFulfillmentAndReportingStruct"
package-name="org.ofbiz.humanres.recruitment"
- title="To view the employment details of employee">
+ title="To view the employment details of an employee">
<member-entity entity-alias="EMPPOS" entity-name="EmplPosition"/>
<member-entity entity-alias="EMPPOSFUL" entity-name="EmplPositionFulfillment"/>
<member-entity entity-alias="EMPPOSREPST" entity-name="EmplPositionReportingStruct"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml Wed Aug 3 16:12:58 2011
@@ -30,7 +30,7 @@ under the License.
<set field="searchDuplicatedAncestorContext.productId" from-field="parameters.productId"/>
<set field="searchDuplicatedAncestorContext.productIdTo" from-field="parameters.productIdTo"/>
<if-not-empty field="parameters.fromDate">
- <set field="searchDuplicatedAncestorContext.fromDate" from-field="parameters.fromDate"/>
+ <set field="searchDuplicatedAncestorContext.fromDate" from-field="parameters.fromDate" type="Timestamp"/>
</if-not-empty>
<set field="searchDuplicatedAncestorContext.productAssocTypeId" from-field="parameters.productAssocTypeId"/>
<call-service service-name="searchDuplicatedAncestor" in-map-name="searchDuplicatedAncestorContext">

Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Wed Aug 3 16:12:58 2011
@@ -249,7 +249,7 @@ public class MrpServices {
GenericValue orderDeliverySchedule = null;
try {
List<GenericValue> facilityContactMechs = EntityUtil.filterByDate(delegator.findByAnd("FacilityContactMech", UtilMisc.toMap("facilityId", facilityId)));
- List<GenericValue> facilityContactMechIds = EntityUtil.getFieldListFromEntityList(facilityContactMechs, "contactMechId", true);
+ List<String> facilityContactMechIds = EntityUtil.getFieldListFromEntityList(facilityContactMechs, "contactMechId", true);
List<EntityExpr> searchConditions = UtilMisc.toList(EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "PURCHASE_ORDER"),
EntityCondition.makeCondition("oiStatusId", EntityOperator.EQUALS, "ITEM_APPROVED"),
EntityCondition.makeCondition("contactMechId", EntityOperator.IN, facilityContactMechIds));

Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Wed Aug 3 16:12:58 2011
@@ -131,8 +131,9 @@ under the License.
<if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>

<create-value value-field="newEntity"/>
-
+
<set-service-fields service-name="createContactListPartyStatus" map="newEntity" to-map="createContactListPartyStatusMap"/>
+ <set field="createContactListPartyStatusMap.baseLocation" from-field="parameters.baseLocation"/>
<call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
</simple-method>
<simple-method method-name="updateContactListParty" short-description="Update Add Party To ContactList">
@@ -196,6 +197,7 @@ under the License.
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="updateContactListPartyMap.userLogin" from-field="systemUserLogin"/>
+ <set field="updateContactListPartyMap.baseLocation" from-field="parameters.baseLocation"/>
<call-service service-name="updateContactListParty" in-map-name="updateContactListPartyMap"/>
<else>
<add-error><fail-message message="Invalid verify code for the ${contactList.contactListName}"/></add-error>
@@ -234,13 +236,43 @@ under the License.
<set field="updateContactListPartyMap.preferredContactMechId" from-field="partyContactWithPurposes[0].contactMechId"/>
<set field="updateContactListPartyMap.statusId" value="CLPT_UNSUBS_PENDING"/>
<set field="updateContactListPartyMap.userLogin" from-field="userLogin"/>
+ <set field="updateContactListPartyMap.baseLocation" from-field="parameters.baseLocation"/>
<call-service service-name="updateContactListParty" in-map-name="updateContactListPartyMap"/>
<else>
- <add-error><fail-message message="The email address (${parameters.email}) does not have the Other Email Address as contact purpose."/></add-error>
- <check-errors/>
+ <entity-and list="partyContactWithPurposes" entity-name="PartyContactWithPurpose">
+ <field-map field-name="infoString" from-field="parameters.email"/>
+ <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
+ </entity-and>
+ <filter-list-by-date list="partyContactWithPurposes" from-field-name="contactFromDate" thru-field-name="contactThruDate"/>
+ <filter-list-by-date list="partyContactWithPurposes" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/>
+ <if-not-empty field="partyContactWithPurposes">
+ <set field="updateContactListPartyMap.contactListId" from-field="parameters.contactListId"/>
+ <set field="updateContactListPartyMap.partyId" from-field="partyContactWithPurposes[0].partyId"/>
+ <set field="updateContactListPartyMap.preferredContactMechId" from-field="partyContactWithPurposes[0].contactMechId"/>
+ <set field="updateContactListPartyMap.statusId" value="CLPT_UNSUBS_PENDING"/>
+ <set field="updateContactListPartyMap.userLogin" from-field="userLogin"/>
+ <set field="updateContactListPartyMap.baseLocation" from-field="parameters.baseLocation"/>
+ <call-service service-name="updateContactListParty" in-map-name="updateContactListPartyMap"/>
+ <else>
+ <add-error><fail-message message="The email address (${parameters.email}) does not have the Other Email Address as contact purpose."/></add-error>
+ <check-errors/>
+ </else>
+ </if-not-empty>
</else>
</if-not-empty>
</simple-method>
+ <simple-method method-name="unsubscribeContactListPartyContachMech" short-description="Find email by contactMechId then call unsubscribeContactListParty service">
+ <entity-and list="partyContactWithPurposes" entity-name="PartyContactWithPurpose">
+ <field-map field-name="contactMechId" from-field="parameters.preferredContactMechId"/>
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
+ <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
+ </entity-and>
+ <first-from-list entry="partyContactWithPurpose" list="partyContactWithPurposes"/>
+ <set field="email" from-field="partyContactWithPurpose.infoString"/>
+ <set-service-fields service-name="unsubscribeContactListParty" to-map="unsubscribeContactListPartyCtx" map="parameters"/>
+ <set field="unsubscribeContactListPartyCtx.email" from-field="email"/>
+ <call-service service-name="unsubscribeContactListParty" in-map-name="unsubscribeContactListPartyCtx"/>
+ </simple-method>
<simple-method method-name="updatePartyEmailContactListParty" short-description="Update ContactList Party Contact Mech">
<set field="lookupMap.preferredContactMechId" from-field="parameters.oldContactMechId"/>
<find-by-and entity-name="ContactListParty" map="lookupMap" list="ContactListParties"/>
@@ -386,7 +418,8 @@ under the License.
<set from-field="contactList" field="sendMailFromScreenMap.bodyParameters.contactList"/>
<set from-field="contactListParty" field="sendMailFromScreenMap.bodyParameters.contactListParty"/>
<set from-field="contactListPartyStatus" field="sendMailFromScreenMap.bodyParameters.contactListPartyStatus"/>
-
+ <set from-field="parameters.baseLocation" field="sendMailFromScreenMap.bodyParameters.baseLocation"/>
+
<call-service service-name="sendMailFromScreen" in-map-name="sendMailFromScreenMap"/>
</then>
<else>
@@ -491,6 +524,7 @@ under the License.
<set field="bodyParameters.contactList" from-field="contactList"/>
<set field="bodyParameters.contactListParty" from-field="contactListParty"/>
<set field="bodyParameters.contactListPartyStatus" from-field="contactListPartyStatus"/>
+ <set field="bodyParameters.baseLocation" from-field="parameters.baseLocation"/>

<set field="emailParams.bodyParameters" from-field="bodyParameters"/>
<set field="emailParams.userLogin" from-field="userLogin"/>
@@ -566,6 +600,7 @@ under the License.
<set field="bodyParameters.contactList" from-field="contactList"/>
<set field="bodyParameters.contactListParty" from-field="contactListParty"/>
<set field="bodyParameters.contactListPartyStatus" from-field="contactListPartyStatus"/>
+ <set field="bodyParameters.baseLocation" from-field="parameters.baseLocation"/>

<set field="emailParams.webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
<set field="emailParams.bodyParameters" from-field="bodyParameters"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/servicedef/services.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/servicedef/services.xml Wed Aug 3 16:12:58 2011
@@ -77,6 +77,7 @@ under the License.
<attribute name="contactListId" type="String" mode="IN" optional="false"/>
<attribute name="email" type="String" mode="IN" optional="false"/>
<attribute name="partyId" type="String" mode="IN" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
</service>
<service name="unsubscribeContactListParty" engine="simple"
location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListParty" auth="false">
@@ -85,6 +86,15 @@ under the License.
<attribute name="contactListId" type="String" mode="IN" optional="false"/>
<attribute name="email" type="String" mode="IN" optional="false"/>
<attribute name="partyId" type="String" mode="IN" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
+ </service>
+ <service name="unsubscribeContactListPartyContachMech" engine="simple"
+ location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListPartyContachMech" auth="false">
+ <description>Find email by contactMechId then call unsubscribeContactListParty service.</description>
+ <attribute name="contactListId" type="String" mode="IN" optional="false"/>
+ <attribute name="preferredContactMechId" type="String" mode="IN" optional="false"/>
+ <attribute name="partyId" type="String" mode="IN" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
</service>


@@ -144,6 +154,7 @@ under the License.
<description>Add Party to ContactList</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
<override name="statusId" optional="false"/>
</service>
@@ -155,6 +166,7 @@ under the License.
<attribute name="productStoreId" type="String" mode="INOUT" optional="true"/>
<attribute name="contactListId" type="String" mode="INOUT" optional="true"/>
<attribute name="optInVerifyCode" type="String" mode="IN" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
<service name="updateContactListPartyNoUserLogin" default-entity-name="ContactListParty" engine="simple"
@@ -167,6 +179,7 @@ under the License.
<attribute name="contactListId" type="String" mode="INOUT" optional="true"/>
<attribute name="optInVerifyCode" type="String" mode="IN" optional="true"/>
<attribute name="email" type="String" mode="IN" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
<override name="partyId" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
@@ -190,6 +203,7 @@ under the License.
<auto-attributes include="nonpk" mode="IN" optional="true">
<exclude field-name="setByUserLoginId"/>
</auto-attributes>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
<attribute name="preferredContactMechId" mode="IN" type="String" optional="false"/>
<override name="statusId" optional="false"/>
<override name="fromDate" optional="true"/>
@@ -198,10 +212,11 @@ under the License.
location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyVerifyEmail" auth="true">
<description>Send ContactListParty Verify Email</description>
<auto-attributes entity-name="ContactListParty" include="pk" mode="IN" optional="false"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
</service>
<service name="optOutOfListFromCommEvent" engine="simple"
location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="optOutOfListFromCommEvent" auth="false">
- <description>Uses the communication event infromation to locate the contact list party information and removes the contact from the list</description>
+ <description>Uses the communication event information to locate the contact list party information and removes the contact from the list</description>
<attribute name="communicationEventId" type="String" mode="IN" optional="false"/>
<attribute name="contactListId" type="String" mode="OUT" optional="true"/>
</service>
@@ -213,6 +228,7 @@ under the License.
<attribute name="preferredContactMechId" mode="IN" type="String" optional="false"/>
<attribute name="fromDate" mode="IN" type="Timestamp" optional="true"/>
<attribute name="statusId" mode="IN" type="String" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
</service>
<service name="sendContactListPartyUnSubscribeVerifyEmail" engine="simple"
location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeVerifyEmail" auth="false">
@@ -222,6 +238,7 @@ under the License.
<attribute name="preferredContactMechId" mode="IN" type="String" optional="false"/>
<attribute name="fromDate" mode="IN" type="Timestamp" optional="true"/>
<attribute name="statusId" mode="IN" type="String" optional="true"/>
+ <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
</service>
<service name="sendContactListPartyUnSubscribeEmail" engine="simple"
location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeEmail" auth="false">

Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java Wed Aug 3 16:12:58 2011
@@ -101,7 +101,7 @@ public class MarketingServices {
String contactMechId = (String) serviceResults.get("contactMechId");
// create a new association at this fromDate to the anonymous party with status accepted
input = UtilMisc.toMap("userLogin", userLogin, "contactListId", contactList.get("contactListId"),
- "partyId", partyId, "fromDate", fromDate, "statusId", "CLPT_PENDING", "preferredContactMechId", contactMechId);
+ "partyId", partyId, "fromDate", fromDate, "statusId", "CLPT_PENDING", "preferredContactMechId", contactMechId, "baseLocation", context.get("baseLocation"));
serviceResults = dispatcher.runSync("createContactListParty", input);
if (ServiceUtil.isError(serviceResults)) {
throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));

Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Wed Aug 3 16:12:58 2011
@@ -187,7 +187,7 @@ public class TrackingCodeEvents {

//persist that info by associating with the current visit
GenericValue visit = VisitHandler.getVisit(request.getSession());
- if (visit == null) {
+ if (visit == null && !UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visit", "false")) {
Debug.logWarning("Could not get visit, not associating trackingCode [" + trackingCodeId + "] with visit", module);
} else {
GenericValue trackingCodeVisit = delegator.makeValue("TrackingCodeVisit",
@@ -311,7 +311,7 @@ public class TrackingCodeEvents {
Delegator delegator = (Delegator) request.getAttribute("delegator");
java.sql.Timestamp nowStamp = UtilDateTime.nowTimestamp();
GenericValue visit = VisitHandler.getVisit(request.getSession());
- if (visit == null) {
+ if (visit == null && !UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visit", "false")) {
Debug.logWarning("Could not get visit, not checking trackingCode cookies to associate with visit", module);
} else {
// loop through cookies and look for ones with a name that starts with TKCDT_ for trackable cookies

Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListForms.xml Wed Aug 3 16:12:58 2011
@@ -191,7 +191,7 @@ under the License.
<field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
<lookup target-form-name="LookupContactMech" target-parameter="partyId"/>
</field>
- <field name="hideExpired"><check all-checked="true"/></field>
+ <field name="hideExpired"><check/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListContactListParties" type="list" title="" list-name="listIt" paginate-target="ListContactListParties"

Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListMenus.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListMenus.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListMenus.xml Wed Aug 3 16:12:58 2011
@@ -29,6 +29,7 @@ under the License.
<menu-item name="ContactListParty" title="${uiLabelMap.PartyParties}">
<link target="FindContactListParties">
<parameter param-name="contactListId"/>
+ <parameter param-name="hideExpired" value="Y"/>
</link>
</menu-item>
<menu-item name="ContactListCommEvent" title="${uiLabelMap.PartyCommEvents}">

Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml Wed Aug 3 16:12:58 2011
@@ -623,6 +623,7 @@
</property>
<property key="ReturnAdjustmentType.description.RET_ADD_FEATURE_ADJ">
<value xml:lang="en">Return Additional Feature</value>
+ <value xml:lang="fr">CaractÃ©ristique additionnelle de retour</value>
<value xml:lang="it">Caratteristiche aggiuntive sul reso</value>
<value xml:lang="pt_BR">DevoluÃ§Ã£o de funcionalidade adicional</value>
<value xml:lang="zh">éè´§çéå ç¹å¾</value>
@@ -679,6 +680,7 @@
</property>
<property key="ReturnAdjustmentType.description.RET_SALES_TAX_ADJ">
<value xml:lang="en">Return Sales Tax</value>
+ <value xml:lang="fr">Taxe de vente sur retour</value>
<value xml:lang="it">Tasse di vendita sul reso</value>
<value xml:lang="pt_BR">Taxa de devoluÃ§Ã£o de venda</value>
<value xml:lang="zh">éè´§çè¥ä¸ç¨</value>
@@ -686,6 +688,7 @@
</property>
<property key="ReturnAdjustmentType.description.RET_SHIPPING_ADJ">
<value xml:lang="en">Return Shipping and Handling</value>
+ <value xml:lang="fr">Transport sur retour</value>
<value xml:lang="it">Spese di trasporto sul reso</value>
<value xml:lang="pt_BR">DevoluÃ§Ã£o de envio e manuseio</value>
<value xml:lang="zh">éè´§çè£è¿è´¹</value>
@@ -693,6 +696,7 @@
</property>
<property key="ReturnAdjustmentType.description.RET_SURCHARGE_ADJ">
<value xml:lang="en">Return Surcharge</value>
+ <value xml:lang="fr">SupplÃ©ment sur retour</value>
<value xml:lang="it">Spese supplementari sul reso</value>
<value xml:lang="pt_BR">DevoluÃ§Ã£o de sobretaxa</value>
<value xml:lang="zh">éè´§çéå è´¹</value>
@@ -700,6 +704,7 @@
</property>
<property key="ReturnAdjustmentType.description.RET_WARRANTY_ADJ">
<value xml:lang="en">Return Warranty</value>
+ <value xml:lang="fr">Garantie sur retour</value>
<value xml:lang="it">Garanzia sul reso</value>
<value xml:lang="pt_BR">DevoluÃ§Ã£o de garantia</value>
<value xml:lang="zh">éè´§çä¿è¯æ¡æ¬¾</value>
@@ -771,6 +776,7 @@
</property>
<property key="ReturnReason.description.RTN_SIZE_EXCHANGE">
<value xml:lang="en">Size Exchange</value>
+ <value xml:lang="fr">Mauvaise taille, Ã©change</value>
<value xml:lang="it">Cambio taglia</value>
<value xml:lang="pt_BR">Troca de tamanho</value>
</property>