svn commit: r1035188 - in /ofbiz/trunk/applications/marketing: config/ data/ data/helpdata/ script/org/ofbiz/marketing/contact/ webapp/marketing/WEB-INF/ widget/ widget/sfa/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1035188 - in /ofbiz/trunk/applications/marketing: config/ data/ data/helpdata/ script/org/ofbiz/marketing/contact/ webapp/marketing/WEB-INF/ widget/ widget/sfa/

hansbak-2
Author: hansbak
Date: Mon Nov 15 08:54:20 2010
New Revision: 1035188

URL: http://svn.apache.org/viewvc?rev=1035188&view=rev
Log:
create a selective contact list from your existing parties, a contibution by chatree

Added:
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml
    ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml
Modified:
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
    ofbiz/trunk/applications/marketing/widget/ContactListMenus.xml
    ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Mon Nov 15 08:54:20 2010
@@ -494,6 +494,10 @@
         <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
         <value xml:lang="zh">会员标识</value>
     </property>
+    <property key="MarketingContactListPartiesImport">
+        <value xml:lang="en">Import Parties</value>
+        <value xml:lang="th">นำเข้ากลุ่มผู้ใช้</value>
+    </property>
     <property key="MarketingContactListPreferredContactMech">
         <value xml:lang="en">Preferred Contact Mechanism</value>
         <value xml:lang="es">Mecanismo de contacto</value>
@@ -1657,6 +1661,10 @@
         <value xml:lang="th">ค้นหารายการติดต่อกลุ่มผู้ใช้</value>
         <value xml:lang="zh">查找联系列表会员</value>
     </property>
+    <property key="PageTitleFindImportContactListParties">
+        <value xml:lang="en">Find Import Contact List Parties</value>
+        <value xml:lang="th">ค้นหารายการติดต่อกลุ่มผู้ใช้เพื่อการนำเข้า</value>
+    </property>
     <property key="PageTitleFindMarketingCampaignRole">
         <value xml:lang="en">Find Marketing Campaign Role</value>
         <value xml:lang="es">Buscar rol de campaña</value>

Modified: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml Mon Nov 15 08:54:20 2010
@@ -48,6 +48,11 @@ under the License.
     <Content contentId="MARKETING_EditContL" contentTypeId="DOCUMENT" contentName="MARKETING Edit contactlist" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_EditContL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
     <ContentAssoc contentId="MARKETING_ContLsts" contentIdTo="MARKETING_EditContL" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="MARKETING_EditContactList"/>
 
+    <DataResource dataResourceId="MARKETING_ImpoContLP" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Marketing Main Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="MARKETING_ImpoContLP" contentTypeId="DOCUMENT" contentName="MARKETING Import contactlist Parties" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_ImpoContLP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="MARKETING_ContLsts" contentIdTo="MARKETING_ImpoContLP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="MARKETING_FindImportContactListParties"/>
+
     <!-- Chapter SFA -->
     <DataResource dataResourceId="HELP_SFA" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"

Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml Mon Nov 15 08:54:20 2010
@@ -30,5 +30,6 @@
     </para>
     <xi:include href="HELP_MARKETING_FindContactLists.xml" />
     <xi:include href="HELP_MARKETING_EditContactList.xml" />
+    <xi:include href="HELP_MARKETING_ImportContactListParties.xml" />
 </section>
 

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml?rev=1035188&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml Mon Nov 15 08:54:20 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+    xmlns:xl="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+    xmlns="http://docbook.org/ns/docbook">
+    <title>The import contact list parties screen</title>
+    <para>
+        This is the initial screen to find an existing parties and select them for import to the contact list.
+    </para>
+    <section>
+        <title>Find selection fields.</title>
+        <para>Party Id : The unique id of the party</para>
+        <para>Party Type Id : The type of the party</para>
+        <para>Role Type : The role of the party</para>
+        <para>Contact Mech Type Id : the contact type according to the contact meth type's ID of the contact list. There is a sub form for this field according to the contact mech type's ID.</para>
+    </section>
+    <section>
+        <title>Import the parties</title>
+        <para>Select the parties in the search result list.</para>
+        <para>Press the "Submit Query" button</para>
+    </section>
+</section>

Added: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml?rev=1035188&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml (added)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml Mon Nov 15 08:54:20 2010
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
+    <simple-method method-name="importContactListParties" short-description="Import an ContactList Parties">
+        <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run importContactListParties you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+        <check-errors/>
+
+        <now-timestamp field="nowTimestamp"/>
+        <call-class-method method-name="getParameterMap" class-name="org.ofbiz.base.util.UtilHttp" ret-field="parameterMap">
+            <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+        </call-class-method>
+        <call-class-method method-name="getMultiFormRowCount" class-name="org.ofbiz.base.util.UtilHttp" ret-field="rowCount">
+            <field field="parameterMap" type="java.util.Map"/>
+        </call-class-method>
+        <loop count="${rowCount}" field="currentRow">
+            <set field="suffix" value="${groovy:org.ofbiz.base.util.UtilHttp.MULTI_ROW_DELIMITER + currentRow}"/>
+            <set field="isSelected" value="${groovy:parameterMap.containsKey(&quot;_rowSubmit&quot; + suffix) &amp;&amp; &quot;Y&quot;.equalsIgnoreCase(parameterMap.get(&quot;_rowSubmit&quot; + suffix))}" type="Boolean"/>
+            <if-compare field="isSelected" operator="equals" value="true">
+                <set field="partyId" value="${groovy:parameterMap[&quot;partyId&quot; + suffix]}"/>
+                
+                <!-- get exist contact list party -->
+                <entity-and list="existContactListParties" entity-name="ContactListParty" filter-by-date="true">
+                    <field-map field-name="partyId" from-field="partyId"/>
+                    <field-map field-name="contactListId" from-field="parameters.contactListId"/>
+                </entity-and>
+                
+                <!-- if there is not exist party in the contact list then create contact list party -->
+                <if-empty field="existContactListParties">
+                    <set field="createContactListPartyInMap.contactListId" from-field="parameters.contactListId"/>
+                    <set field="createContactListPartyInMap.partyId" from-field="partyId"/>
+                    <set field="createContactListPartyInMap.statusId" value="CLPT_ACCEPTED"/>
+                    <set field="createContactListPartyInMap.fromDate" from-field="nowTimestamp"/>
+                    <call-service service-name="createContactListParty" in-map-name="createContactListPartyInMap"/>
+                    <else>
+                        <set field="eventMessageList[+0]" value="Party[${partyId}] already exist."/>
+                    </else>
+                </if-empty>
+            </if-compare>
+        </loop>
+        <set field="eventMessageList[+0]" value="Copying the contact list parties are success..."/>
+        <field-to-request field="eventMessageList" request-name="_EVENT_MESSAGE_LIST_"/>
+    </simple-method>
+</simple-methods>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Mon Nov 15 08:54:20 2010
@@ -321,6 +321,12 @@ under the License.
         <response name="success" type="view" value="ListContactListParties"/>
         <response name="error" type="view" value="ListContactListParties"/>
     </request-map>
+    <request-map uri="importContactListParties">
+        <security https="true" auth="true"/>
+        <event type="simple" path="component://marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml" invoke="importContactListParties"/>
+        <response name="success" type="request-redirect" value="FindImportContactListParties"/>
+        <response name="error" type="request-redirect" value="FindImportContactListParties"/>
+    </request-map>
     <request-map uri="contactListOptOut" track-serverhit="false" track-visit="false">
         <security https="true" auth="false"/>        
         <response name="success" type="view" value="ContactListOptOut"/>
@@ -329,6 +335,7 @@ under the License.
     <request-map uri="ListContactListCommEvents"><security https="true" auth="true"/><response name="success" type="view" value="ListContactListCommEvents"/></request-map>
     <request-map uri="EditContactListCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="EditContactListCommEvent"/></request-map>
     <request-map uri="FindContactListCommEvents"><security https="true" auth="true"/><response name="success" type="view" value="FindContactListCommEvents"/></request-map>
+    <request-map uri="FindImportContactListParties"><security https="true" auth="true"/><response name="success" type="view" value="FindImportContactListParties"/></request-map>
     <request-map uri="PreviewContactListCommEvent">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="PreviewContactListCommEvent"/>
@@ -360,6 +367,10 @@ under the License.
         </response>
         <response name="error" type="view" value="ListContactListParties"/>
     </request-map>
+    <request-map uri="ContactMechTypeOnly">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ContactMechTypeOnly"/>
+    </request-map>
     
 
     <!-- Lookup request mappings -->
@@ -436,6 +447,9 @@ under the License.
     <view-map name="EditContactListCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#EditContactListCommEvent"/>
     <view-map name="FindContactListCommEvents" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindContactListCommEvents"/>
     <view-map name="PreviewContactListCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#PreviewContactListCommEvent"/>
+    <view-map name="FindImportContactListParties" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindImportContactListParties"/>
+    
+    <view-map name="ContactMechTypeOnly" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#ContactMechTypeOnly"/>
 
     <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/>
     <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>

Modified: ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListForms.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Mon Nov 15 08:54:20 2010
@@ -212,7 +212,13 @@ under the License.
         </row-actions>
 
         <field name="contactListId"><hidden/></field>
-        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName}  ${lastName} ${groupName} [${partyId}]"/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}">
+            <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
+                    <parameter param-name="partyId"/>
+                </sub-hyperlink>
+            </display-entity>
+        </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity  entity-name="StatusItem"/></field>
@@ -237,6 +243,83 @@ under the License.
             </hyperlink>
         </field>
     </form>
+    
+    <form name="FindImportContactListParties" type="single" target="FindImportContactListParties" title="" focus-field-name="contactMechTypeId"
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="contactListId"><hidden/></field>
+        <field name="statusId"><hidden value="PARTY_DISABLED"/></field>
+        <field name="statusId_op"><hidden value="notEqual"/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="PartyType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
+            <drop-down>
+                <option key="" description="${uiLabelMap.CommonAnyRoleType}"/>
+                <entity-options entity-name="RoleType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="contactMechTypeId" map-name="contactList" event="onfocus" action="javascript:ajaxUpdateAreas('contactMechContainer,ContactMechTypeOnly,contactMechTypeId=' + this.value);this.disabled=true;"><text/></field>
+        <field name="contactMechContainer" id-name="contactMechContainer" title=" "><container/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
+    </form>
+    <form name="ListImportContactListParties" type="multi" title="" list-name="listIt" target="importContactListParties?contactListId=${parameters.contactListId}" paginate-target="FindImportContactListParties"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <set field="parameters.contactMechTypeId" from-field="contactMechTypeId"/>
+            <service result-map-list="listIt" result-map="result" service-name="performFind">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" value="PartyRoleAndContactMechDetail"/>
+                <field-map field-name="viewIndex" from-field="viewIndex"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+                <field-map field-name="fieldList" from-field="selectedFields"/>
+                <field-map field-name="distinct" value="Y"/>
+            </service>
+        </actions>
+        <row-actions>
+            <service service-name="getPartyPostalAddress" result-map="postalAddress">
+                <field-map field-name="partyId" from-field="partyId"/>
+            </service>
+            <service service-name="getPartyTelephone" result-map="telephone">
+                <field-map field-name="partyId" from-field="partyId"/>
+            </service>
+            <service service-name="getPartyContactMechValueMaps" result-map="contactMechResults">
+                <field-map field-name="partyId" from-field="partyId"/>
+                <field-map field-name="contactMechTypeId" from-field="contactMechTypeId"/>
+            </service>
+            <set field="contactMech" from-field="contactMechResults.valueMaps[0].contactMech" type="Object"/>
+        </row-actions>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}">
+            <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
+                <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
+                    <parameter param-name="partyId"/>
+                </sub-hyperlink>
+            </display-entity>
+        </field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="toName" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="attnName" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="address1" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="address2" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="city" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="abbreviation" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="postalCode" map-name="postalAddress"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)" name="countryGeoId" map-name="postalAddress">
+            <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName}"/>
+        </field>
+        <field use-when="contactMechTypeId.equals(&quot;TELECOM_NUMBER&quot;)" name="countryCode" map-name="telephone"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;TELECOM_NUMBER&quot;)" name="areaCode" map-name="telephone"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;TELECOM_NUMBER&quot;)" name="contactNumber" map-name="telephone"><display/></field>
+        <field use-when="contactMechTypeId.equals(&quot;TELECOM_NUMBER&quot;)" name="extension" map-name="telephone"><display/></field>
+        <field use-when="!contactMechTypeId.equals(&quot;POSTAL_ADDRESS&quot;)&amp;&amp;!contactMechTypeId.equals(&quot;TELECOM_NUMBER&quot;)" name="infoString" map-name="contactMech"><display/></field>
+        <field name="submitButton" title="${uiLabel.CommonSubmit}"><submit/></field>
+    </form>
 
     <form name="EditContactListCommEvent" default-map-name="communicationEvent"  target="updateContactListCommEvent" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/marketing/widget/ContactListMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListMenus.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListMenus.xml Mon Nov 15 08:54:20 2010
@@ -36,6 +36,11 @@ under the License.
                 <parameter param-name="contactListId"/>
             </link>
         </menu-item>
+        <menu-item name="ContactListImportParty" title="${uiLabelMap.MarketingContactListPartiesImport}">
+            <link target="FindImportContactListParties">
+                <parameter param-name="contactListId"/>
+            </link>
+        </menu-item>
     </menu>
 
     <menu name="ContactListCommBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">

Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Mon Nov 15 08:54:20 2010
@@ -339,7 +339,35 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="FindImportContactListParties">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleFindImportContactListParties"/>
+                <set field="contactListTabButtonItem" value="ContactListImportParty"/>
+                <set field="labelTitleProperty" value="PageTitleFindImportContactListParties"/>
 
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindImportContactListParties?contactListId=${parameters.contactListId}"/>
+                <set field="contactListId" from-field="parameters.contactListId"/>
+                <entity-one entity-name="ContactList" value-field="contactList"/>
+                <set field="contactMechTypeId" from-field="contactList.contactMechTypeId"/>
+                <set field="selectedFields[+0]" value="partyId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonContactListDecorator" 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="FindImportContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <include-form name="ListImportContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
+                            </decorator-section>
+                        </decorator-screen>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="LookupContactList">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=1035188&r1=1035187&r2=1035188&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Mon Nov 15 08:54:20 2010
@@ -100,6 +100,7 @@ under the License.
         <section>
             <actions>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
                 <section>