svn commit: r812383 - in /ofbiz/trunk/applications: accounting/documents/ content/template/ marketing/config/ marketing/data/ marketing/data/helpdata/ marketing/documents/ marketing/webapp/sfa/WEB-INF/ marketing/widget/sfa/ marketing/widget/sfa/forms/ ...

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

svn commit: r812383 - in /ofbiz/trunk/applications: accounting/documents/ content/template/ marketing/config/ marketing/data/ marketing/data/helpdata/ marketing/documents/ marketing/webapp/sfa/WEB-INF/ marketing/widget/sfa/ marketing/widget/sfa/forms/ ...

hansbak-2
Author: hansbak
Date: Tue Sep  8 08:28:24 2009
New Revision: 812383

URL: http://svn.apache.org/viewvc?rev=812383&view=rev
Log:
added the possibility of assigning an existing account or lead to the logged user so it will show up on the screen, reused the contact/account profile realtionship screens from party, added placeholders for help screens in the sfa application.

Added:
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml   (with props)
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml   (with props)
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml   (with props)
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml   (with props)
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml   (with props)
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml   (with props)
Modified:
    ofbiz/trunk/applications/accounting/documents/Accounting.xml
    ofbiz/trunk/applications/content/template/HelpTemplate.ftl
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml
    ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml
    ofbiz/trunk/applications/marketing/documents/Marketing.xml
    ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml

Modified: ofbiz/trunk/applications/accounting/documents/Accounting.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/documents/Accounting.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/documents/Accounting.xml (original)
+++ ofbiz/trunk/applications/accounting/documents/Accounting.xml Tue Sep  8 08:28:24 2009
@@ -1,22 +1,18 @@
 <?xml version="1.0"?>
-<!--
-    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.
--->
+ <!--
+ 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.
+ -->
 <chapter 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"

Modified: ofbiz/trunk/applications/content/template/HelpTemplate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/HelpTemplate.ftl?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/HelpTemplate.ftl (original)
+++ ofbiz/trunk/applications/content/template/HelpTemplate.ftl Tue Sep  8 08:28:24 2009
@@ -33,7 +33,7 @@
   <a href="${child["@xl:href"]}">${child}</a>
     </#if>
   </#list>
-  <br/>              
+  <br/><br/>            
 </p>
 </#macro>
 

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Tue Sep  8 08:28:24 2009
@@ -1177,6 +1177,12 @@
         <value xml:lang="th">เพิ่มประเภทรหัส Tracking ใหม่</value>
         <value xml:lang="zh">新建跟踪码类型</value>
     </property>
+    <property key="PageTitleAssignLeadFromExisting">
+        <value xml:lang="en">Assign Existing Lead</value>
+    </property>
+    <property key="PageTitleAssignAccountFromExisting">
+        <value xml:lang="en">Assign Existing Account</value>
+    </property>
     <property key="PageTitleCreateAccount">
         <value xml:lang="en">Create New Account</value>
         <value xml:lang="es">Crear nueva cuenta</value>

Modified: ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/MarketingHelpData.xml Tue Sep  8 08:28:24 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 <entity-engine-xml>
-    <!-- chapter -->
+    <!-- chapter Marketing-->
     <DataResource dataResourceId="HELP_MARKETING" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_MARKETING.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
         dataResourceName="Marketing Overview" mimeTypeId="text/xml" isPublic="Y" />
@@ -28,13 +28,41 @@
 
     <!-- marketing help -->
     <DataResource dataResourceId="MARKETING_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        objectInfo="applications/marketing/data/helpdata/HELP_MARKETING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MARKETING Main Help" mimeTypeId="text/xml" isPublic="Y" />
+        objectInfo="applications/marketing/data/helpdata/HELP_MARKETING_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Marketing Main Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="MARKETING_main" contentTypeId="DOCUMENT" contentName="MARKETING Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
     <ContentAssoc contentId="HELP_MARKETING" contentIdTo="MARKETING_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
 
+    <!-- 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"
+        dataResourceName="SFA Overview" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HELP_SFA" contentTypeId="DOCUMENT" contentName="SFA Overview" templateDataResourceId="HELP_TEMPL"
+        dataResourceId="HELP_SFA" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SFA" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    
     <!-- sfa help -->
     <DataResource dataResourceId="SFA_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="applications/marketing/data/helpdata/HELP_SFA_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Main Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SFA_main" contentTypeId="DOCUMENT" contentName="SFA Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
-    <ContentAssoc contentId="HELP_MARKETING" contentIdTo="SFA_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+
+    <DataResource dataResourceId="SFA_FindLeads" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Leads find/list Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="SFA_FindLeads" contentTypeId="DOCUMENT" contentName="SFA Leads find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindLeads" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindLeads" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+
+    <DataResource dataResourceId="SFA_FindAccounts" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Accounts find/list Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="SFA_FindAccounts" contentTypeId="DOCUMENT" contentName="SFA Accounts find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindAccounts" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindAccounts" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+
+    <DataResource dataResourceId="SFA_FindContacts" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA Contacts find/list Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="SFA_FindContacts" contentTypeId="DOCUMENT" contentName="SFA Contacts find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindContacts" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindContacts" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+
+    <DataResource dataResourceId="SFA_FindSalesOpportu" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SFA SalesOpportunities find/list Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="SFA_FindSalesOpportu" contentTypeId="DOCUMENT" contentName="SFA SalesOpportunities find/list Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SFA_FindSalesOpportu" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_SFA" contentIdTo="SFA_FindSalesOpportu" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
 </entity-engine-xml>

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml?rev=812383&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml Tue Sep  8 08:28:24 2009
@@ -0,0 +1,67 @@
+<?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>Marketing overview</title>
+    <section>
+        <para>
+            The overall purpose of the Marketing component is the support to select
+            leads from parties obtained from a certain source or marketing
+            segment
+            to convert to opportunities by contacting these parties via a
+            contact-list related to a marketing campaign.
+        </para>
+        <para>
+            The first option of the marketing component is the definition of a
+            datasource [DataSource], and connecting or loading party information
+            to it [PartyDataSource]. In the party component a data source Id can
+            be added to the party.
+        </para>
+        <para>
+            A second input to the marketing component is the Segment group and
+            classification which again can be allocated to parties in the party
+            component.
+        </para>
+        <para>
+            Now a marketing campaign can be created. A contact list can be created
+            using the parties related to a dataSource or marketing segment
+            classification and referring back to the marketing campaign
+        </para>
+        <para>
+            Contact lists are currently email mailinglists, the OFBiz system could be
+            extended to include the support of calling by telephone and entering
+            the results. On the email sent via this lists tracking codes can be
+            used to measure the reponse when the readers of the email mailing
+            click on a link where a trackingcode is specified.
+            For more info look at the program:
+            applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
+        </para>
+        <para>
+            Opportunities resulting from these actions can be entered in the SFA
+            web application referring back to the marketing campaign.
+    </para>
+    
+    
+    </section>
+</section>
+

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_main.xml Tue Sep  8 08:28:24 2009
@@ -22,7 +22,11 @@
  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 Marketing Main help screen.</title>
-    <para>Introduction</para>
+    <title>Marketing main help screen.</title>
+    <section>
+        <para>
+            This page acts as an placeholder of the overview of the marketing activity in the company.
+        </para>
+    </section>
 </section>
 

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml?rev=812383&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml Tue Sep  8 08:28:24 2009
@@ -0,0 +1,37 @@
+<?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>SFA overview</title>
+    <section>
+        <para>
+            The main purpose of the SFA application is to support the process of creating orders for leads.
+        </para>
+        <para>
+            The SFA application is for a specific user to list his leads, contacts
+            accounts and opportunities.
+            He can create new parties or he can assign existing parties to himself.
+        </para>
+    </section>
+</section>
+

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml?rev=812383&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml Tue Sep  8 08:28:24 2009
@@ -0,0 +1,32 @@
+<?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 SFA Accounts find/list screen</title>
+ <section>
+ <para>
+  The Accounts screen will show you the list which you have created ore which have been assigned to you.
+        </para>
+ </section>
+</section>
+

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindAccounts.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml?rev=812383&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml Tue Sep  8 08:28:24 2009
@@ -0,0 +1,32 @@
+<?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 SFA Accounts find/list screen</title>
+ <section>
+ <para>
+  The Accounts screen will show you the list which you have created ore which have been assigned to you.
+        </para>
+ </section>
+</section>
+

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindContacts.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml?rev=812383&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml Tue Sep  8 08:28:24 2009
@@ -0,0 +1,32 @@
+<?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 SFA Leads find/list screen</title>
+ <section>
+ <para>
+  The leads screen will show you the list which you have created ore which have been assigned to you.
+        </para>
+ </section>
+</section>
+

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindLeads.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml?rev=812383&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml (added)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml Tue Sep  8 08:28:24 2009
@@ -0,0 +1,32 @@
+<?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 SFA SalesOpportunity find/list screen</title>
+ <section>
+ <para>
+  The SalesOpportunity screen will show you the list which you have created.
+        </para>
+ </section>
+</section>
+

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_FindSalesOpportu.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml (original)
+++ ofbiz/trunk/applications/marketing/data/helpdata/HELP_SFA_main.xml Tue Sep  8 08:28:24 2009
@@ -22,7 +22,14 @@
  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 SFA (Sales force Automation) Main help screen.</title>
-    <para>Introduction</para>
+    <title>The SFA Main screen</title>
+ <section>
+ <para>
+ The SFA main screen allows the quick create of any new lead and/or
+ contact which is available on any SFA screen.
+ Further this screen is designed to provide an overview of this users
+ activity.
+        </para>
+ </section>
 </section>
 

Modified: ofbiz/trunk/applications/marketing/documents/Marketing.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/documents/Marketing.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/documents/Marketing.xml (original)
+++ ofbiz/trunk/applications/marketing/documents/Marketing.xml Tue Sep  8 08:28:24 2009
@@ -17,17 +17,19 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<chapter 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"
+<chapter 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 Marketing Component.</title>
- <section>
- <title>Introduction</title>
- <para>
- Please find here a general introduction to the marketing component (to be continued)
-        </para>
- </section>
-    <xi:include href="../data/helpdata/HELP_MARKETING_main.xml" />
-    <xi:include href="../data/helpdata/HELP_SFA_main.xml" />
+
+    <title>The Marketing Component.</title>
+
+    <para>
+        The marketing component is supporting you to create, select and follow sales opportunities
+        in order to create sales orders for the company.
+    </para>
+
+    <xi:include href="../data/helpdata/HELP_MARKETING.xml" />
+    <xi:include href="../data/helpdata/HELP_SFA.xml" />
 </chapter>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Tue Sep  8 08:28:24 2009
@@ -71,6 +71,10 @@
         <response name="success" type="view" value="FindAccounts"/>
         <response name="error" type="view" value="NewAccount"/>
     </request-map>
+    <request-map uri="AssignAccountToMe">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="AssignAccountToMe"/>
+    </request-map>
 
     <!-- Lead Requests -->
     <request-map uri="FindLeads">
@@ -117,6 +121,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="NewLeadFromVCard"/>
     </request-map>
+    <request-map uri="AssignLeadToMe">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="AssignLeadToMe"/>
+    </request-map>
     <request-map uri="createLeadFromVCard">
         <security https="true" auth="true"/>
         <event type="service" invoke="importVCard"/>
@@ -243,6 +251,7 @@
 
     <view-map name="FindAccounts" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#FindAccounts"/>
     <view-map name="NewAccount" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#NewAccount"/>
+    <view-map name="AssignAccountToMe" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#AssignAccountToMe"/>
 
     <view-map name="FindLeads" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#FindLeads"/>
     <view-map name="NewLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#NewLead"/>
@@ -250,6 +259,7 @@
     <view-map name="ConvertLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#ConvertLead"/>
     <view-map name="MergeLeads" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#MergeLeads"/>
     <view-map name="NewLeadFromVCard" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#NewLeadFromVCard"/>
+    <view-map name="AssignLeadToMe" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#AssignLeadToMe"/>
 
     <view-map name="FindContacts" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#FindContacts"/>
     <view-map name="NewContact" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#NewContact"/>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Tue Sep  8 08:28:24 2009
@@ -54,34 +54,28 @@
             </widgets>
         </section>
     </screen>
-    <screen name="NewAccount">
-        <section>
-            <actions>
-                <set field="headerItem" value="Accounts"/>
-                <set field="titleProperty" value="PageTitleCreateAccount"/>
-                <set field="accountType" from-field="parameters.accountType"/>
-                <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleCreateAccount}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="NewAccount" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
+ <screen name="AssignAccountToMe">
+ <section>
+ <actions>
+ <set field="headerItem" value="Accounts" />
+ <set field="titleProperty" value="PageTitleCreateAccount" />
+ <set field="accountType" from-field="parameters.accountType" />
+ <property-to-field field="defaultCountryGeoId"
+ resource="general" property="country.geo.id.default" default="USA" />
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="no-clear">
+ <screenlet title="${uiLabelMap.PageTitleAssignAccountFromExisting}">
+ <include-form name="AssignAccountToMe"
+ location="component://marketing/widget/sfa/forms/AccountForms.xml" />
+ </screenlet>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
 </screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue Sep  8 08:28:24 2009
@@ -292,6 +292,7 @@
                                     <widgets>
                                         <container style="profile-left">
                                             <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+                                            <include-screen name="partyRelContacts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <include-screen name="PaymentMethods" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <include-screen name="LeadPartyDataSource" location="component://marketing/widget/sfa/LeadScreens.xml"/>
@@ -334,6 +335,7 @@
                                                 </actions>
                                                 <widgets>
                                                     <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+                                                    <include-screen name="partyRelContacts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                                 </widgets>
                                             </section>
                                             <section>
@@ -367,6 +369,7 @@
                                     <widgets>
                                         <container style="profile-left">
                                             <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+                                            <include-screen name="partyRelAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                         </container>
                                         <container style="profile-right">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Tue Sep  8 08:28:24 2009
@@ -211,6 +211,28 @@
             </widgets>
         </section>
     </screen>
+
+ <screen name="AssignLeadToMe">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleAssignLeadFromExisting" />
+ <set field="headerItem" value="Leads" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="no-clear">
+ <screenlet title="${uiLabelMap.PageTitleAssignLeadFromExisting}">
+ <include-form name="AssignLeadToMe"
+ location="component://marketing/widget/sfa/forms/LeadForms.xml" />
+ </screenlet>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
     
     <screen name="LeadPartyDataSource">
         <section>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Tue Sep  8 08:28:24 2009
@@ -54,6 +54,9 @@
         <menu-item name="NewAccounts" title="${uiLabelMap.PageTitleCreateAccount}">
             <link target="NewAccount"/>
         </menu-item>
+        <menu-item name="AssignAccountToMe" title="${uiLabelMap.PageTitleAssignAccountFromExisting}">
+            <link target="AssignAccountToMe"/>
+        </menu-item>
     </menu>
 
     <menu name="LeadTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
@@ -91,6 +94,9 @@
         <menu-item name="NewLeadFromVCard" title="${uiLabelMap.PageTitleCreateLeadFromVCard}">
             <link target="NewLeadFromVCard"/>
         </menu-item>
+        <menu-item name="AssignLeadToMe" title="${uiLabelMap.PageTitleAssignLeadFromExisting}">
+            <link target="AssignLeadToMe"/>
+        </menu-item>
     </menu>
 
     <menu name="ContactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Tue Sep  8 08:28:24 2009
@@ -66,4 +66,14 @@
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="50" maxlength="60"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+
+    <form name="AssignAccountToMe" type="single" target="createPartyRelationship">
+        <field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
+        <field name="roleTypeIdFrom"><hidden value="OWNER"/></field>
+        <field name="roleTypeIdTo"><hidden value="ACCOUNT"/></field>
+        <field name="partyRelationshipTypeId"><hidden value="ACCOUNT"/></field>
+        <field name="partyId" parameter-name="partyIdTo"><lookup target-form-name="LookupAccount"/></field>
+        <field name="assign"><submit/></field>
+    </form>
+
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Tue Sep  8 08:28:24 2009
@@ -119,6 +119,15 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
+    <form name="AssignLeadToMe" type="single" target="createPartyRelationship">
+        <field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
+        <field name="roleTypeIdFrom"><hidden value="OWNER"/></field>
+        <field name="roleTypeIdTo"><hidden value="LEAD"/></field>
+        <field name="partyRelationshipTypeId"><hidden value="LEAD_OWNER"/></field>
+        <field name="partyId" parameter-name="partyIdTo"><lookup target-form-name="LookupLead"/></field>
+        <field name="assign"><submit/></field>
+    </form>
+
     <form name="QuickAddLead" type="single" target="quickAddLead">
         <field name="firstName" title="${uiLabelMap.CommonFirst} ${uiLabelMap.CommonName}*" widget-style="required"><text size="15"/></field>
         <field name="lastName" title="${uiLabelMap.CommonLast} ${uiLabelMap.CommonName}*" widget-style="required"><text size="15"/></field>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Sep  8 08:28:24 2009
@@ -5904,6 +5904,9 @@
         <value xml:lang="en">Lookup Internal Organization</value>
         <value xml:lang="hi_IN">आंतरिक संगठन लुकअप</value>
     </property>
+    <property key="PartyLookupLead">
+        <value xml:lang="en">Lookup Party with the role Lead</value>
+    </property>
     <property key="PartyLookupParty">
         <value xml:lang="de">Akteur suchen</value>
         <value xml:lang="en">Lookup Party</value>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue Sep  8 08:28:24 2009
@@ -660,7 +660,7 @@
     <request-map uri="createPartyRelationship">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createPartyRelationship"/>
-        <response name="success" type="view" value="EditPartyRelationships"/>
+        <response name="success" type="view-last" value="EditPartyRelationships"/>
         <response name="error" type="view" value="EditPartyRelationships"/>
     </request-map>
     <request-map uri="createPartyRelationshipContactAccount">
@@ -1190,6 +1190,7 @@
     <request-map uri="LookupPartyEmail"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyEmail"/></request-map>
     <request-map uri="LookupPerson"><security https="true" auth="true"/><response name="success" type="view" value="LookupPerson"/></request-map>
     <request-map uri="LookupContact"><security https="true" auth="true"/><response name="success" type="view" value="LookupContact"/></request-map>
+    <request-map uri="LookupLead"><security https="true" auth="true"/><response name="success" type="view" value="LookupLead"/></request-map>
     <request-map uri="LookupPartyAndUserLoginAndPerson"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyAndUserLoginAndPerson"/></request-map>
     <request-map uri="LookupUserLoginAndPartyDetails"><security https="true" auth="true"/><response name="success" type="view" value="LookupUserLoginAndPartyDetails"/></request-map>
     <request-map uri="LookupPartyGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroup"/></request-map>
@@ -1323,6 +1324,7 @@
     <view-map name="LookupPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyClassificationGroup"/>
     <view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
     <view-map name="LookupContact" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupContact"/>
+    <view-map name="LookupLead" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupLead"/>
     <view-map name="LookupPartyAndUserLoginAndPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson"/>
     <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>
     <view-map name="LookupPartyGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=812383&r1=812382&r2=812383&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Tue Sep  8 08:28:24 2009
@@ -165,6 +165,29 @@
             </widgets>
         </section>
     </screen>
+    <screen name="LookupLead">
+        <section>
+            <condition>
+                <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
+            </condition>
+            <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="title" value="${uiLabelMap.PartyLookupLead}"/>
+                <set field="entityName" value="PartyRoleAndPartyDetail"/>
+                <set field="parameters.roleTypeId" value="LEAD"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="search-options">
+                        <include-form name="lookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 
     <screen name="LookupPartyAndUserLoginAndPerson">
         <section>