opentaps open source ERP+CRM

Author: leon
Date: 2006-10-24 18:14:54 -0700 (Tue, 24 Oct 2006)
New Revision: 295

Modified:
   versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh
   versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/viewMarketingCampaign.bsh
   versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
   versions/1.0/trunk/widget/crmsfa/screens/marketing/MarketingScreens.xml
Log:
Added pagination ability to viewMarketingCampaign's list of contact lists

Modified: versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh	2006-10-24 01:04:28 UTC (rev 294)
+++ versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh	2006-10-25 01:14:54 UTC (rev 295)
@@ -96,7 +96,7 @@
     sources = delegator.findByAnd("PartyDataSource", UtilMisc.toMap("partyId", partyId), UtilMisc.toList("fromDate DESC"));
     context.put("dataSources", sources);
 
-    // account marketing campaigns
+    // account marketing campaigns TODO: create MarketingCampaignAndRole entity, then use peformFind service so that we can paginate
     campaignRoles = delegator.findByAnd("MarketingCampaignRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", "ACCOUNT"));
     campaigns = EntityUtil.getRelated("MarketingCampaign", campaignRoles);
     context.put("marketingCampaigns", campaigns);

Modified: versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/viewMarketingCampaign.bsh
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/viewMarketingCampaign.bsh	2006-10-24 01:04:28 UTC (rev 294)
+++ versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/viewMarketingCampaign.bsh	2006-10-25 01:14:54 UTC (rev 295)
@@ -35,5 +35,8 @@
 }
 
 // get the associated contact liss
-contactLists = marketingCampaign.getRelated("ContactList");
-context.put("contactLists", contactLists);
+findParams = UtilMisc.toMap("entityName", "ContactList", "inputFields", UtilMisc.toMap("marketingCampaignId", marketingCampaignId));
+results = dispatcher.runSync("performFind", findParams);
+context.put("contactLists", results.get("listIt"));
+
+

Modified: versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
===================================================================
--- versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-24 01:04:28 UTC (rev 294)
+++ versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-25 01:14:54 UTC (rev 295)
@@ -118,10 +118,12 @@
 
     <!-- TODO: pagination and sort for this list -->
     <form name="ListContactLists" type="list" separate-columns="true" 
-        title="Surveys"  default-title-style="tableheadtext" target=""
+        title="List Contact Lists"  default-title-style="tableheadtext" target=""
         default-widget-style="tabletext" default-tooltip-style="tabletext"
         default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
-        paginate-target="${listSortTarget}"  list-name="contactLists">
+        paginate-target="${listSortTarget}"  paginate-target-anchor="ListContactLists"
+        paginate-size-field="contactListsSize" paginate-index-field="contactListsIndex"
+        list-name="contactLists">
 
         <field name="contactListId" title="${uiLabelMap.CommonName}" widget-area-style="fieldWidth300" widget-style="buttontext">
             <hyperlink description="${contactListName} (${contactListId})" target="viewContactList?contactListId=${contactListId}"/>

Modified: versions/1.0/trunk/widget/crmsfa/screens/marketing/MarketingScreens.xml
===================================================================
--- versions/1.0/trunk/widget/crmsfa/screens/marketing/MarketingScreens.xml	2006-10-24 01:04:28 UTC (rev 294)
+++ versions/1.0/trunk/widget/crmsfa/screens/marketing/MarketingScreens.xml	2006-10-25 01:14:54 UTC (rev 295)
@@ -102,6 +102,8 @@
             <actions>
                 <set field="pageTitleLabel" value="CrmViewMarketingCampaign"/>
                 <set field="sectionHeaderUiLabel" value="CrmViewMarketingCampaign"/>
+                <set field="listSortTarget" value="viewMarketingCampaign"/>
+                <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/includes/pagination.bsh"/>
                 <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/marketing/viewMarketingCampaign.bsh"/>
             </actions>
             <widgets>

Author: leon
Date: 2006-10-23 18:04:28 -0700 (Mon, 23 Oct 2006)
New Revision: 294

Modified:
   versions/1.0/trunk/entitydef/entitymodel.xml
   versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/findContactListParties.bsh
   versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
Log:
Contact list improvements for marketing:  Constrain members to client party roles (ACCOUNT/PROSPECT/CONTACT), which requires adding roleTypeId to a view.  Include [Create Order] link for the basic list (not the add list).  Present a link to viewContact/viewAccount/viewLead depending on the roleTypeId.

Modified: versions/1.0/trunk/entitydef/entitymodel.xml
===================================================================
--- versions/1.0/trunk/entitydef/entitymodel.xml	2006-10-24 00:43:42 UTC (rev 293)
+++ versions/1.0/trunk/entitydef/entitymodel.xml	2006-10-24 01:04:28 UTC (rev 294)
@@ -287,6 +287,7 @@
                  title="View that contains full contact information for members of contact lists.  Used to lookup and display data for emails, postal addresses, phone numbers, etc.">
         <member-entity entity-alias="CLP" entity-name="ContactListParty"/>
         <member-entity entity-alias="CL" entity-name="ContactList"/>
+        <member-entity entity-alias="PR" entity-name="PartyRole"/>
         <member-entity entity-alias="PG" entity-name="PartyGroup"/>
         <member-entity entity-alias="PER" entity-name="Person"/>
         <member-entity entity-alias="PCM" entity-name="PartyContactMech"/>
@@ -294,6 +295,7 @@
         <member-entity entity-alias="TN" entity-name="TelecomNumber"/>
         <member-entity entity-alias="PA" entity-name="PostalAddress"/>
         <alias entity-alias="CL" name="contactListId"/>
+        <alias entity-alias="PR" name="roleTypeId"/>
         <alias entity-alias="CLP" name="partyId"/>
         <alias entity-alias="CLP" name="memberFromDate" field="fromDate"/>
         <alias entity-alias="CLP" name="memberThruDate" field="thruDate"/>
@@ -322,6 +324,9 @@
         <view-link entity-alias="CLP" rel-entity-alias="CL">
             <key-map field-name="contactListId"/>
         </view-link>
+        <view-link entity-alias="CLP" rel-entity-alias="PR">
+            <key-map field-name="partyId"/>
+        </view-link>
         <view-link entity-alias="CLP" rel-entity-alias="PCM" rel-optional="true">
             <key-map field-name="partyId"/>
             <key-map field-name="preferredContactMechId" rel-field-name="contactMechId"/>

Modified: versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/findContactListParties.bsh
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/findContactListParties.bsh	2006-10-24 00:43:42 UTC (rev 293)
+++ versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/marketing/findContactListParties.bsh	2006-10-24 01:04:28 UTC (rev 294)
@@ -37,6 +37,8 @@
 import org.ofbiz.entity.util.EntityFindOptions;
 import org.ofbiz.entity.util.EntityUtil;
 
+import com.opensourcestrategies.crmsfa.party.PartyHelper;
+
 contactList = context.get("contactList");
 
 // construct the uiLabelMap since it doesn't seem to be in the request attributes  TODO: put this in UtilCommon as a static map
@@ -130,6 +132,13 @@
 searchConditions = new ArrayList();
 searchConditions.add(EntityUtil.getFilterByDateExpr());   // this filters out expired contact mechs using PartyContactMech
 
+// constrain list members to those with defined client roles
+roleConditions = new ArrayList();
+for (iter = PartyHelper.CLIENT_PARTY_ROLES.iterator(); iter.hasNext(); ) {
+    roleConditions.add( new EntityExpr("roleTypeId", EntityOperator.EQUALS, iter.next()) );
+}
+searchConditions.add( new EntityConditionList(roleConditions, EntityOperator.OR) );
+
 // find parameters for the sorting headers
 findParams = "";
 
@@ -178,20 +187,18 @@
 // show only the active, accepted contact list members from PartyContactInfoAndContactList if we are a remove form (viewContactList)
 entityToUse = null;
 if (isRemoveForm) {
-    entityToUse = "PartyContactInfoAndContactList";
     searchConditions.add(new EntityExpr("contactListId", EntityOperator.EQUALS, contactList.get("contactListId")));
     searchConditions.add(new EntityExpr("memberStatusId", EntityOperator.EQUALS, "CLPT_ACCEPTED"));
     searchConditions.add(EntityUtil.getFilterByDateExpr("memberFromDate", "memberThruDate"));
 } else {
-    // otherwise just list all active parties from PartyContactInfo, restricted by the list's contactMechTypeId
-    entityToUse = "PartyContactInfo";
+    // otherwise just list all active parties restricted by the list's contactMechTypeId
     searchConditions.add(new EntityExpr("contactMechTypeId", EntityOperator.EQUALS, contactList.get("contactMechTypeId")));
 }
 
 // get the contact list members as a list iterator for pagination purposes (these lists can be large)
 fieldsToSelect = null;  // for now just get all fields
 searchConditionList = new EntityConditionList(searchConditions, EntityOperator.AND);
-members = delegator.findListIteratorByCondition(entityToUse, searchConditionList,  null, fieldsToSelect, orderBy,
+members = delegator.findListIteratorByCondition("PartyContactInfoAndContactList", searchConditionList,  null, fieldsToSelect, orderBy,
         new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));
 context.put("contactListParties", members);
 

Modified: versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
===================================================================
--- versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-24 00:43:42 UTC (rev 293)
+++ versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-24 01:04:28 UTC (rev 294)
@@ -140,10 +140,16 @@
         paginate-size-field="contactListPartiesSize" paginate-index-field="contactListPartiesIndex"
         list-name="contactListParties">
 
-        <field name="partyId" title="${uiLabelMap.CommonName}"
+        <!-- display the name as a link to viewAccount, viewContact or viewLead according to the role type -->
+        <field name="partyId" title="${uiLabelMap.CommonName}" widget-style="buttontext"
             header-link="${listSortTarget}?contactListId=${parameters.contactListId}&amp;contactListPartyOrderBy=name&amp;${findParams}#ListContactListParties" 
             header-link-style="orderByHeaderLink">
-            <display description="${groupName} ${firstName} ${lastName}"/>
+            <hyperlink description="${groupName} ${firstName} ${lastName}" target="${bsh: 
+                URI=&quot;&quot;;
+                if (&quot;ACCOUNT&quot;.equals(roleTypeId)) URI=&quot;viewAccount&quot;;
+                else if (&quot;CONTACT&quot;.equals(roleTypeId)) URI=&quot;viewContact&quot;;
+                else if (&quot;PROSPECT&quot;.equals(roleTypeId)) URI=&quot;viewLead&quot;;
+                return URI+&quot;?partyId=&quot;+partyId;}"/>
         </field>
 
         <!-- for adding member -->

Author: leon
Date: 2006-10-23 17:43:42 -0700 (Mon, 23 Oct 2006)
New Revision: 293

Modified:
   versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
Log:
Moved create order field to after write/log task in contact list party list

Modified: versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
===================================================================
--- versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-24 00:29:35 UTC (rev 292)
+++ versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-24 00:43:42 UTC (rev 293)
@@ -145,9 +145,6 @@
             header-link-style="orderByHeaderLink">
             <display description="${groupName} ${firstName} ${lastName}"/>
         </field>
-        <field name=" " title="${uiLabelMap.CrmCreateOrder}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CrmCreateOrder}" target="newOrder?partyId=${partyId}"/>
-        </field>
 
         <!-- for adding member -->
         <field name="statusId" use-when="isRemoveForm!=true"><hidden value="CLPT_ACCEPTED"/></field>
@@ -189,6 +186,15 @@
             <display description=" "/>
         </field>
 
+        <!-- add a create order link for the removable party list -->
+        <field name="createOrder" title=" " widget-style="buttontext" use-when="isRemoveForm==true">
+            <hyperlink description="${uiLabelMap.CrmCreateOrder}" target="newOrder?partyId=${partyId}"/>
+        </field>
+        <!-- another dummy field to compensate for create order column -->
+        <field name="dummyField2" title="  " use-when="isRemoveForm==false">
+            <display description=" "/>
+        </field>
+
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}" use-when="hasUpdatePermission!=void&amp;&amp;hasUpdatePermission==true"><check/></field>
 
         <!-- since the form action could be to add or remove selected, the button name must be set in a .bsh file (no other method seems to work) -->

Author: leon
Date: 2006-10-23 17:29:35 -0700 (Mon, 23 Oct 2006)
New Revision: 292

Modified:
   versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
Log:
Added Create Order button for contact list parties lists.

Modified: versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml
===================================================================
--- versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-20 17:57:26 UTC (rev 291)
+++ versions/1.0/trunk/widget/crmsfa/forms/marketing/ContactListForms.xml	2006-10-24 00:29:35 UTC (rev 292)
@@ -145,6 +145,9 @@
             header-link-style="orderByHeaderLink">
             <display description="${groupName} ${firstName} ${lastName}"/>
         </field>
+        <field name=" " title="${uiLabelMap.CrmCreateOrder}" widget-style="buttontext">
+            <hyperlink description="${uiLabelMap.CrmCreateOrder}" target="newOrder?partyId=${partyId}"/>
+        </field>
 
         <!-- for adding member -->
         <field name="statusId" use-when="isRemoveForm!=true"><hidden value="CLPT_ACCEPTED"/></field>

Author: leon
Date: 2006-10-20 10:57:26 -0700 (Fri, 20 Oct 2006)
New Revision: 291

Modified:
   versions/0.9/trunk/data/CRMSFAOFBizSecurityData.xml
Log:
Fixed security data. Duplicate contentmgr permissions, one is supposed to be accounting.

Modified: versions/0.9/trunk/data/CRMSFAOFBizSecurityData.xml
===================================================================
--- versions/0.9/trunk/data/CRMSFAOFBizSecurityData.xml	2006-10-20 17:54:27 UTC (rev 290)
+++ versions/0.9/trunk/data/CRMSFAOFBizSecurityData.xml	2006-10-20 17:57:26 UTC (rev 291)
@@ -28,10 +28,10 @@
    <SecurityGroupPermission groupId="SALES_REP_TRAINEE" permissionId="ORDERMGR_ADMIN"/>
 
    <!-- access to accounting manager to create and manage invoices and payments -->
-   <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="CONTENTMGR_ADMIN"/>
-   <SecurityGroupPermission groupId="SALES_REP" permissionId="CONTENTMGR_ADMIN"/>
-   <SecurityGroupPermission groupId="SALES_REP_LIMITED" permissionId="CONTENTMGR_ADMIN"/>
-   <SecurityGroupPermission groupId="SALES_REP_TRAINEE" permissionId="CONTENTMGR_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="ACCOUNTING_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_REP" permissionId="ACCOUNTING_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_REP_LIMITED" permissionId="ACCOUNTING_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_REP_TRAINEE" permissionId="ACCOUNTING_ADMIN"/>
    
    <!-- access to content manager for creating, viewing, and managing surveys and responses to surveys -->
    <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="CONTENTMGR_ADMIN"/>

Author: leon
Date: 2006-10-20 10:54:27 -0700 (Fri, 20 Oct 2006)
New Revision: 290

Modified:
   versions/1.0/trunk/data/CRMSFAOFBizSecurityData.xml
Log:
Fixed security data. Duplicate contentmgr permissions, one is supposed to be accounting.

Modified: versions/1.0/trunk/data/CRMSFAOFBizSecurityData.xml
===================================================================
--- versions/1.0/trunk/data/CRMSFAOFBizSecurityData.xml	2006-10-17 12:21:06 UTC (rev 289)
+++ versions/1.0/trunk/data/CRMSFAOFBizSecurityData.xml	2006-10-20 17:54:27 UTC (rev 290)
@@ -28,10 +28,10 @@
    <SecurityGroupPermission groupId="SALES_REP_TRAINEE" permissionId="ORDERMGR_ADMIN"/>
 
    <!-- access to accounting manager to create and manage invoices and payments -->
-   <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="CONTENTMGR_ADMIN"/>
-   <SecurityGroupPermission groupId="SALES_REP" permissionId="CONTENTMGR_ADMIN"/>
-   <SecurityGroupPermission groupId="SALES_REP_LIMITED" permissionId="CONTENTMGR_ADMIN"/>
-   <SecurityGroupPermission groupId="SALES_REP_TRAINEE" permissionId="CONTENTMGR_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="ACCOUNTING_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_REP" permissionId="ACCOUNTING_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_REP_LIMITED" permissionId="ACCOUNTING_ADMIN"/>
+   <SecurityGroupPermission groupId="SALES_REP_TRAINEE" permissionId="ACCOUNTING_ADMIN"/>
    
    <!-- access to content manager for creating, viewing, and managing surveys and responses to surveys -->
    <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="CONTENTMGR_ADMIN"/>

Author: hans
Date: 2006-10-17 05:21:06 -0700 (Tue, 17 Oct 2006)
New Revision: 289

Modified:
   versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
Log:
allocate party id's to email does not also add it to a workeffort

Modified: versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
===================================================================
--- versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-14 06:14:29 UTC (rev 288)
+++ versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-17 12:21:06 UTC (rev 289)
@@ -138,8 +138,9 @@
         <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
         
         <!-- reprocess the create updated communicationEvent -->
-        <set field="input.communicationEventId" from-field="parameters.communicationEventId"/>
-        <call-service service-name="crmsfa.reProcessIncomingEmail" in-map-name="input"/>
+        <!-- replaced by the 'register' button on the email -->
+        <!--set field="input.communicationEventId" from-field="parameters.communicationEventId"/>
+        <call-service service-name="crmsfa.reProcessIncomingEmail" in-map-name="input"/-->
 
         <field-to-list field-name="successMessFrom" list-name="successMessageList"/>
         <field-to-list field-name="successMessTo" list-name="successMessageList"/>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-14 06:14:29 UTC (rev 288)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-17 12:21:06 UTC (rev 289)
@@ -424,7 +424,7 @@
         </field>
         <field name="Remove" title="" widget-style="buttontext" use-when="context.get(&quot;hasUpdatePartiesPermission&quot;)!=null">
             <hyperlink description="${uiLabelMap.CommonRemove}" 
-                target="removeWorkEffortPartyAssignment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}"/> 
+                target="removeWorkEffortPartyAssignment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}"/> 
         </field>
         <field name="availabilityStatusId" title="${uiLabelMap.CrmAvailability}" widget-area-style="fieldWidth100"
             use-when="context.get(&quot;hasUpdatePartiesPermission&quot;)==null">
@@ -563,7 +563,7 @@
         <field name="emailAddressTo" position="2" use-when="communicationEvent.get(&quot;partyIdTo&quot;)==null"><text default-value="${toEmail}"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="updateEmail" type="single" target="updateEmail" title="" default-map="communicationEvent"
+    <form name="updateEmail" type="single" target="updateEmail" title="" default-map-name="communicationEvent"
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
         <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
         <field name="partyIdFrom" position="1"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>

Author: hans
Date: 2006-10-13 23:14:29 -0700 (Fri, 13 Oct 2006)
New Revision: 288

Modified:
   versions/1.0/branches/emailPayment/config/crmsfa.properties
   versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
Log:
small fixes

Modified: versions/1.0/branches/emailPayment/config/crmsfa.properties
===================================================================
--- versions/1.0/branches/emailPayment/config/crmsfa.properties	2006-10-12 12:22:18 UTC (rev 287)
+++ versions/1.0/branches/emailPayment/config/crmsfa.properties	2006-10-14 06:14:29 UTC (rev 288)
@@ -49,11 +49,11 @@
 ##
 
 # Default country to select (from Geo entity)
-defaultCountryGeoId = USA
+defaultCountryGeoId = NLD
 # Default currency to use (from Uom entity with uomTypeId=CURRENCY_MEASURE)
-defaultCurrencyUomId = USD
+defaultCurrencyUomId = EUR
 # The default international telephone country code to use
-defaultCountryCode = 1
+defaultCountryCode = 31
 # Default case type for quick create case (see CustRequestType entity)
 defaultCustRequestTypeId = RF_SUPPORT
 # starting and ending hours for the calendar day view (in 24 hour notation)

Modified: versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
===================================================================
--- versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-12 12:22:18 UTC (rev 287)
+++ versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-14 06:14:29 UTC (rev 288)
@@ -20,7 +20,7 @@
 -->
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../../../ofbiz/framework/minilang/dtd/simple-methods.xsd">
+    xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
     
     <simple-method method-name="closeEmailTask" short-description="close a task and all its dependent commmunication events">

Author: hans
Date: 2006-10-12 05:22:18 -0700 (Thu, 12 Oct 2006)
New Revision: 287

Modified:
   versions/1.0/branches/emailPayment/servicedef/smcas.xml
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/includes/findActiveParties.bsh
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
Log:
several changes in email processing

Modified: versions/1.0/branches/emailPayment/servicedef/smcas.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/smcas.xml	2006-10-09 12:50:53 UTC (rev 286)
+++ versions/1.0/branches/emailPayment/servicedef/smcas.xml	2006-10-12 12:22:18 UTC (rev 287)
@@ -41,10 +41,8 @@
 <!-- use this to configure inbound processing of your emails for the crm/sfa application -->
 <service-mca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/service-mca.xsd">
-    <mca mail-rule-name="processIncomingEmail">
-        <!-- the matching is a regular expression match against the email address.  this format seems to work for
-        both "xyz@..." and "Mr. XYZ <xyz@...>" -->
-        <!--condition-field field-name="to" operator="matches" value=".*@a-net.nl>*"/--><!-- better not put any conditions, otherwise messages may be ignored like to mailinglist etc... -->
+    <!--mca mail-rule-name="processIncomingEmail">
         <action service="crmsfa.processIncomingEmail" mode="sync"/>
-    </mca>
+    </mca-->
+    
 </service-mca>

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java	2006-10-09 12:50:53 UTC (rev 286)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java	2006-10-12 12:22:18 UTC (rev 287)
@@ -111,7 +111,9 @@
             partyData.create();
 
             // create a unique party relationship between the userLogin and the Account with partyRelationshipTypeId RESPONSIBLE_FOR
-            createResponsibleAccountRelationshipForParty(userLogin.getString("partyId"), accountPartyId, userLogin, delegator, dispatcher);
+            if (createResponsibleAccountRelationshipForParty(userLogin.getString("partyId"), accountPartyId, userLogin, delegator, dispatcher) == false) {
+                return UtilCommon.createAndLogServiceError(serviceResults, "PartyRelationshipCouldNotBeCreated", locale, module);
+            }
 
             // if initial data source is provided, add it
             String dataSourceId = (String) context.get("dataSourceId");

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java	2006-10-09 12:50:53 UTC (rev 286)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java	2006-10-12 12:22:18 UTC (rev 287)
@@ -170,7 +170,11 @@
             }
 
             // get the communication event id if the comm event was created
-            if (!existing) communicationEventId = (String) serviceResults.get("communicationEventId");
+            if (!existing) {
+            	communicationEventId = (String) serviceResults.get("communicationEventId");
+            	
+            }
+            
 
             if (sending) {
                 // now update or create a work effort to record this email as a started task, can be completed manual if email discussion finshed
@@ -240,6 +244,10 @@
                 UtilActivity.removeAllAssociationsForWorkEffort(workEffortId, delegator);
             }
 
+            // attachments.
+            
+            
+            
             // create the associations and finish
             if (!existing && !reply) return createWorkEffortPartyAssociations(dctx, context, workEffortId, errorLabel, !existing);
             else return ServiceUtil.returnSuccess();
@@ -298,6 +306,13 @@
                     throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));
                 }
                 
+                // change the status of the communication event to signal it is now connected to a workeffort
+	            serviceResults = dispatcher.runSync("updateCommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId, "statusId", "COM_PENDING", "userLogin", userLogin));
+	            if (ServiceUtil.isError(serviceResults)) {
+                    Debug.logError(ServiceUtil.getErrorMessage(serviceResults), module);
+                    throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));
+	            }
+                
                 //create an association between the WorkEffort and the CommunicationEvent using the partyIdFrom field
                 context.put("internalPartyId", communicationEvent.getString("partyIdFrom"));
                 createWorkEffortPartyAssociations(dctx, context, workEffortId, "CrmErrorProcessIncomingEmailFail", false);

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/includes/findActiveParties.bsh
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/includes/findActiveParties.bsh	2006-10-09 12:50:53 UTC (rev 286)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/includes/findActiveParties.bsh	2006-10-12 12:22:18 UTC (rev 287)
@@ -49,7 +49,7 @@
 
 dispatcher = request.getAttribute("dispatcher");
 results = dispatcher.runSync("prepareFind", UtilMisc.toMap("entityName", "PartyFromSummaryByRelationship", "inputFields", parameters,
-        "filterByDate", "Y", "noConditionFind", "N"));
+        "filterByDate", "Y", "noConditionFind", "N", "userLogin", userLogin));
 
 orderBy = UtilMisc.toList("groupName", "lastName", "companyName"); // fields to order by (default)
 // see if we're given a different order by

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-09 12:50:53 UTC (rev 286)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-12 12:22:18 UTC (rev 287)
@@ -465,17 +465,18 @@
         <field name="subject" title="${uiLabelMap.PartySubject}"><display/></field>
         <field name="content" title="${uiLabelMap.CommonMessage}"><display/></field>
     </form>
-    <form name="ListEmails" type="list" separate-columns="true" 
-        title="Email List"  default-title-style="tableheadtext" list-name="listIt" target=""
+    <form name="ListEmails" type="multi" separate-columns="true"  use-row-submit="true"
+        title="Email List"  default-title-style="tableheadtext" list-name="listIt"
+        target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y"
         default-widget-style="tabletext" default-tooltip-style="tabletext"
         default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
         paginate-target="listEmails" default-entity-name="CommunicationEvent">
         <actions>
             <set field="findParam.noConditionFind" value="Y"/>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="entityName" value="WorkEffortCommunicationEventView"/>
+                <field-map field-name="entityName" value="CommunicationEvent"/>
                 <field-map field-name="inputFields" env-name="findParam"/>
-                <!--field-map field-name="orderBy" value="entryDate DESC"/-->
+                <field-map field-name="orderBy" value="entryDate"/>
             </service>
         </actions>
         <row-actions>
@@ -498,7 +499,8 @@
         <field name="partyIdTo" widget-style="buttontext"><hyperlink target="partyProfile?partyId=${partyIdTo}" description="${partyNameResultTo.fullName} (${partyIdTo})"/></field>
         <field name="entryDate"><display description="${bsh:entryDate.toString().substring(0,16)}"/></field>
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
-        <field name="workEffortId" widget-style="buttontext"><hyperlink target="viewActivity?workEffortId=${workEffortId}" description="${workEffortId}"/></field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+        <field name="deleteSelectedButton" widget-style="smallSubmit"><submit/></field>
     </form>
     <form name="ListWrongEmails" type="multi" use-row-submit="true" 
         title="Email List"  default-title-style="tableheadtext" list-name="listIt" 
@@ -511,7 +513,7 @@
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="entityName" value="CommunicationEvent"/>
                 <field-map field-name="inputFields" env-name="findParam"/>
-                <!--field-map field-name="orderBy" value="entryDate DESC"/-->
+                <field-map field-name="orderBy" value="entryDate"/>
             </service>
         </actions>
         <field name="communicationEventId"><hidden/></field>
@@ -561,5 +563,12 @@
         <field name="emailAddressTo" position="2" use-when="communicationEvent.get(&quot;partyIdTo&quot;)==null"><text default-value="${toEmail}"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+    <form name="updateEmail" type="single" target="updateEmail" title="" default-map="communicationEvent"
+        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
+        <field name="partyIdFrom" position="1"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>
+        <field name="partyIdTo" position="1"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>
+        <field name="updateButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
     
 </forms>

Hi,

VAGRA - save 70% http://www.greatgreenbay.info

  _____ =20

that took the expedition members out of here-which is why I am your
Nothing Iron John did seemed to affect the outcome. He was wary, he

Author: hans
Date: 2006-10-09 05:50:53 -0700 (Mon, 09 Oct 2006)
New Revision: 286

Modified:
   versions/1.0/branches/emailPayment/servicedef/services_accounts.xml
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java
Log:
make the updateAccount service also update the logoImgUrl

Modified: versions/1.0/branches/emailPayment/servicedef/services_accounts.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_accounts.xml	2006-10-09 02:57:44 UTC (rev 285)
+++ versions/1.0/branches/emailPayment/servicedef/services_accounts.xml	2006-10-09 12:50:53 UTC (rev 286)
@@ -48,6 +48,7 @@
     <service name="crmsfa.accountInterface" engine="interface" location="" invoke="">
         <!-- Party and PartyGroup fields -->
         <attribute name="groupName" type="String" mode="IN" optional="false"/>
+        <attribute name="logoImageUrl" type="String" mode="IN" optional="true"/>
         <attribute name="groupNameLocal" type="String" mode="IN" optional="true"/>
         <attribute name="officeSiteName" type="String" mode="IN" optional="true"/>
         <attribute name="description" type="String" mode="IN" optional="true"/>

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java	2006-10-09 02:57:44 UTC (rev 285)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java	2006-10-09 12:50:53 UTC (rev 286)
@@ -192,6 +192,7 @@
             // update the Party and PartyGroup
             Map input = UtilMisc.toMap("groupName", context.get("groupName"), "groupNameLocal", context.get("groupNameLocal"), 
                     "officeSiteName", context.get("officeSiteName"), "description", context.get("description"));
+            input.put("logoImageUrl", context.get("logoImageUrl"));
             input.put("partyId", accountPartyId);
             input.put("userLogin", userLogin);
             Map serviceResults = dispatcher.runSync("updatePartyGroup", input);

Author: hans
Date: 2006-10-08 19:57:44 -0700 (Sun, 08 Oct 2006)
New Revision: 285

Modified:
   versions/1.0/branches/emailPayment/build.xml
   versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
   versions/1.0/branches/emailPayment/servicedef/services_activities.xml
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyHelper.java
Log:
deacticate email addresses when contact deactivated and several adjustments

Modified: versions/1.0/branches/emailPayment/build.xml
===================================================================
--- versions/1.0/branches/emailPayment/build.xml	2006-10-06 14:57:35 UTC (rev 284)
+++ versions/1.0/branches/emailPayment/build.xml	2006-10-09 02:57:44 UTC (rev 285)
@@ -57,6 +57,7 @@
         <property name="dtd.dir" value="dtd"/>
         <property name="lib.dir" value="lib"/>
         <property name="build.dir" value="build"/>
+        <property name="ofbiz.dir" value="/home/hans/ofbiz"/> 
         <!-- This parameter must point to your ofbiz/ directory or the libraries for the financials app would not be found.
          The default setting would work if you have checked out the financials module into your ofbiz/hot-deploy/ directory.
          It would NOT work if you checked it out somewhere else and symlinked to it in your hot-deploy/ directory.

Modified: versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
===================================================================
--- versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-06 14:57:35 UTC (rev 284)
+++ versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-09 02:57:44 UTC (rev 285)
@@ -66,6 +66,16 @@
                 <return/>
             </if-empty>
             <if-empty field-name="parameters.partyIdFrom">
+                <!-- create new contact if partyId not provided -->
+                <call-bsh><![CDATA[
+                    // get the personal name from the communication event subsection
+                    int start = communicationEvent.getString("note").indexOf("Sent Name from: ") + 16;
+		            int end = communicationEvent.getString("note").indexOf(" ",start);
+		            if (end > start) newParty.put("firstName", communicationEvent.getString("note").substring(start,end));
+		            start = end + 1;
+		            int end = communicationEvent.getString("note").indexOf(";",start);
+		            if (end > start) newParty.put("lastName", communicationEvent.getString("note").substring(start,end));
+                ]]></call-bsh>
                 <call-service service-name="crmsfa.createContact" in-map-name="newParty">
                     <result-to-field result-name="partyId" field-name="parameters.partyIdFrom"/>
                 </call-service>
@@ -91,6 +101,7 @@
                 <return/>
             </if-empty>
             <if-empty field-name="parameters.partyIdTo">
+                <!-- if 'to' party not provided, create it -->
                 <call-service service-name="crmsfa.createContact" in-map-name="newParty">
                     <result-to-field result-name="partyId" field-name="parameters.partyIdTo"/>
                 </call-service>
@@ -101,9 +112,15 @@
             </if-empty>
             
             <!-- make sure the 'to' party has a suitable role -->
-            <set field="role.partyId" from-field="parameters.partyIdTo"/>
-            <set field="role.roleTypeId" value="ACCOUNT_MANAGER"/>
-            <call-service service-name="createPartyRole" in-map-name="role"/>
+            <entity-one entity-name="PartyRole" value-name="partyRole">
+                <field-map field-name="partyId" env-name="parameters.partyIdTo"/>
+                <field-map field-name="roleTypeId" value="ACCOUNT_MANAGER"/>
+            </entity-one>
+            <if-empty field-name="partyRole">
+                <set field="role.partyId" from-field="parameters.partyIdTo"/>
+                <set field="role.roleTypeId" value="ACCOUNT_MANAGER"/>
+                <call-service service-name="createPartyRole" in-map-name="role"/>
+            </if-empty>
             
             <!-- add the email address to the party -->
             <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>

Modified: versions/1.0/branches/emailPayment/servicedef/services_activities.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-06 14:57:35 UTC (rev 284)
+++ versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-09 02:57:44 UTC (rev 285)
@@ -59,6 +59,7 @@
         <!-- saved emails can be sent/saved by passing in these parameters -->
         <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
         <attribute name="workEffortId" type="String" mode="IN" optional="true"/>
+        <!-- to forward or reply -->
         <attribute name="origCommunicationEventId" type="String" mode="IN" optional="true"/><!-- for a reply -->
     </service>
 

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java	2006-10-06 14:57:35 UTC (rev 284)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java	2006-10-09 02:57:44 UTC (rev 285)
@@ -303,6 +303,9 @@
         try {
             List partyRelationships = delegator.findByAnd("PartyRelationship", UtilMisc.toMap("partyIdFrom", contactPartyId, "roleTypeIdFrom", "CONTACT"));
             PartyHelper.expirePartyRelationships(partyRelationships, expireDate, dispatcher, userLogin);
+            // expire partyContactmechs Email to avoid incoming mail will be allocated to it
+            List partyContactMechs = delegator.findByAnd("PartyContactMech", UtilMisc.toMap("partyId", contactPartyId));
+            PartyHelper.expirePartyContactMechs(partyContactMechs, "EMAIL_ADDRESS", expireDate, dispatcher, userLogin);
         } catch (GenericEntityException e) {
             return UtilCommon.createAndLogServiceError(e, "CrmErrorDeactivateContactFail", locale, module);
         } catch (GenericServiceException e) {

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyHelper.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyHelper.java	2006-10-06 14:57:35 UTC (rev 284)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyHelper.java	2006-10-09 02:57:44 UTC (rev 285)
@@ -208,6 +208,28 @@
     }
 
     /**
+     * Expires a list of PartyContactMechs that are still active on expireDate.
+     */
+    public static void expirePartyContactMechs(List partyContactMechs, String contactMechTypeId, Timestamp expireDate, LocalDispatcher dispatcher, GenericValue userLogin) 
+        throws GenericServiceException {
+        List partyContactMechsActiveOnFromDate = EntityUtil.filterByDate(partyContactMechs, expireDate);
+
+        // to expire on expireDate, set the thruDate to the expireDate in the parameter and call updatePartyRelationship service
+        Iterator iter = partyContactMechsActiveOnFromDate.iterator();
+        while (iter.hasNext()) {
+            GenericValue partyContactMech = (GenericValue) iter.next();
+            Map input = UtilMisc.toMap("partyId", partyContactMech.getString("partyId"), "contactMechId", partyContactMech.getString("contactMechId"), "fromDate", partyContactMech.getTimestamp("fromDate"));
+            input.put("contactMechTypeId", contactMechTypeId);
+            input.put("userLogin", userLogin);
+            input.put("thruDate", expireDate);
+            Map serviceResult = dispatcher.runSync("updatePartyContactMech", input);
+            if (ServiceUtil.isError(serviceResult)) {
+                throw new GenericServiceException("Failed to expire PartyContactMech with values: " + input.toString());
+            }
+        }
+    }
+
+    /**
      * Method to get the current non-expired party responsible for the given account/contact/lead. 
      *
      * @param   partyIdFrom     The partyId of the account/contact/lead

Author: hans
Date: 2006-10-06 07:57:35 -0700 (Fri, 06 Oct 2006)
New Revision: 284

Modified:
   versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
   versions/1.0/branches/emailPayment/servicedef/services_activities.xml
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java
   versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/editcontactmech.ftl
   versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/viewprofile.ftl
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
Log:
several fixes in the domepage processing and the ability to add missing 'to' parties on incoming email

Modified: versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
===================================================================
--- versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-05 21:13:28 UTC (rev 283)
+++ versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-06 14:57:35 UTC (rev 284)
@@ -55,60 +55,77 @@
     
     <simple-method method-name="allocateMsgToParty" short-description="Allocate an email to a party, update the communication accordingly and connect to a new WorkEffort">
 
-        <if-empty field-name="parameters.partyId">
-            <set field="newParty.firstName" value="Not"/>
-            <set field="newParty.lastName" value="Known"/>
-            <set field="newParty.companyName" value="Unknown"/>
-            <call-service service-name="crmsfa.createLead" in-map-name="newParty">
-                <result-to-field result-name="partyId" field-name="parameters.partyId"/>
+        <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+        <set field="newParty.firstName" value="Not"/>
+        <set field="newParty.lastName" value="Known"/>
+        
+        <!-- from address and party -->
+        <if-empty field-name="communicationEvent.partyIdFrom">
+            <if-empty field-name="parameters.emailAddressFrom">
+                <set field="errorMessage" value="'From' email address missing"/>
+                <return/>
+            </if-empty>
+            <if-empty field-name="parameters.partyIdFrom">
+                <call-service service-name="crmsfa.createContact" in-map-name="newParty">
+                    <result-to-field result-name="partyId" field-name="parameters.partyIdFrom"/>
+                </call-service>
+                <set field="successMessFrom" value="Party ${parameters.partyIdFrom} created and ${parameters.emailAddressFrom} assigned"/>
+                <else>
+                    <set field="successMessFrom" value="${parameters.emailAddressFrom} allocated to party: ${parameters.partyIdFrom}"/>
+                </else>
+            </if-empty>
+            
+            <!-- add the email address to the party -->
+            <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+            <set field="newEmail.partyId" from-field="parameters.partyIdFrom"/>
+            <set field="newEmail.emailAddress" from-field="parameters.emailAddressFrom"/>
+            <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
+                <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdFrom"/>
             </call-service>
-            <set field="successMessage" value="Party ${parameters.partyId} created and ${parameters.emailAddress} assigned"/>
-            <else>
-                <set field="successMessage" value="${parameters.emailAddress allocated to party: ${parameters.partyId}"/>
-            </else>
         </if-empty>
-
-        <!-- add the email address to the party -->
-        <set-service-fields service-name="createPartyEmailAddress" map-name="parameters" to-map-name="newEmail"/>
-        <set field="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
-        <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
-            <result-to-field result-name="contactMechId" field-name="contactMechId"/>
-        </call-service>
         
-        <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
-
-        <!-- find the to party again if missing -->
+        <!-- to address and party -->
         <if-empty field-name="communicationEvent.partyIdTo">
-            <set field="contactInput.address" value="."/>        
-            <call-bsh><![CDATA[
-                int start = communicationEvent.getString("note").indexOf("Sent from: ") + 11;
-                int end = communicationEvent.getString("note").indexOf(";",start);
-                if (end > start) contactInput.put("address", communicationEvent.getString("note").substring(start,end));
-                ]]>
-            </call-bsh>
-            <call-service service-name="findPartyFromEmailAddress" in-map-name="contactInput">
-                <result-to-field result-name="partyId" field-name="inCom.partyIdTo"/>
+            <if-empty field-name="parameters.emailAddressTo">
+                <set field="errorMessage" value="'To' email address missing"/>
+                <return/>
+            </if-empty>
+            <if-empty field-name="parameters.partyIdTo">
+                <call-service service-name="crmsfa.createContact" in-map-name="newParty">
+                    <result-to-field result-name="partyId" field-name="parameters.partyIdTo"/>
+                </call-service>
+                <set field="successMessTo" value="Party ${parameters.partyIdTo} created and ${parameters.emailAddressTo} assigned"/>
+                <else>
+                    <set field="successMessTo" value="${parameters.emailAddressTo} allocated to party: ${parameters.partyIdTo}"/>
+                </else>
+            </if-empty>
+            
+            <!-- make sure the 'to' party has a suitable role -->
+            <set field="role.partyId" from-field="parameters.partyIdTo"/>
+            <set field="role.roleTypeId" value="ACCOUNT_MANAGER"/>
+            <call-service service-name="createPartyRole" in-map-name="role"/>
+            
+            <!-- add the email address to the party -->
+            <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+            <set field="newEmail.partyId" from-field="parameters.partyIdTo"/>
+            <set field="newEmail.emailAddress" from-field="parameters.emailAddressTo"/>
+            <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
                 <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdTo"/>
             </call-service>
-            <set field="communicationEvent.partyIdTo" from-field="inCom.partyIdTo"/>
         </if-empty>
-        
         <!-- update the communication event -->
         <set field="inCom.communicationEventId" from-field="parameters.communicationEventId"/>
-        <if-not-empty field-name="communicationEvent.partyIdTo">
-            <set field="inCom.statusId" value="COM_ENTERED"/>
-        </if-not-empty>
-        <set field="inCom.partyIdFrom" from-field="parameters.partyId"/>
-        <set field="inCom.contactMechIdFrom" from-field="contactMechId"/>
+        <set field="inCom.partyIdFrom" from-field="parameters.partyIdFrom"/>
+        <set field="inCom.partyIdTo" from-field="parameters.partyIdTo"/>
+        <set field="inCom.statusId" value="COM_ENTERED"/>
         <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
         
-        
         <!-- reprocess the create updated communicationEvent -->
-        <if-not-empty field-name="communicationEvent.partyIdTo">
-            <set field="input.communicationEventId" from-field="parameters.communicationEventId"/>
-            <call-service service-name="crmsfa.reProcessIncomingEmail" in-map-name="input"/>
-        </if-not-empty>
-        
+        <set field="input.communicationEventId" from-field="parameters.communicationEventId"/>
+        <call-service service-name="crmsfa.reProcessIncomingEmail" in-map-name="input"/>
+
+        <field-to-list field-name="successMessFrom" list-name="successMessageList"/>
+        <field-to-list field-name="successMessTo" list-name="successMessageList"/>
         <field-to-result field-name="parameters.communicationEventId" result-name="communicationEventId"/>
     </simple-method>
 </simple-methods>

Modified: versions/1.0/branches/emailPayment/servicedef/services_activities.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-05 21:13:28 UTC (rev 283)
+++ versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-06 14:57:35 UTC (rev 284)
@@ -211,8 +211,10 @@
         location="com/opensourcestrategies/crmsfa/ActivitiesServices.xml" invoke="allocateMsgToParty" auth="true">
         <description>If party empty, create a 'lead',  if exist add email to party, update the communication accordingly and connect to a new WorkEffort</description>
         <attribute name="communicationEventId" type="String" mode="INOUT" optional="false"/>
-        <attribute name="partyId" type="String" mode="IN" optional="true"/>
-        <attribute name="emailAddress" type="String" mode="IN" optional="false"/>
+        <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/>
+        <attribute name="emailAddressFrom" type="String" mode="IN" optional="true"/>
+        <attribute name="partyIdTo" type="String" mode="IN" optional="true"/>
+        <attribute name="emailAddressTo" type="String" mode="IN" optional="true"/>
     </service>    
     
 </services>

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java	2006-10-05 21:13:28 UTC (rev 283)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java	2006-10-06 14:57:35 UTC (rev 284)
@@ -308,7 +308,8 @@
                     throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));
                 }
             } else {
-                Debug.logWarning("No valid team member roles found for partyId [" + partyIdTo + "], so no activities will be created for it", module);
+                Debug.logError("No valid team member roles found for partyId [" + partyIdTo + "], so no activities will be created for it", module);
+                throw new GenericServiceException("No valid team member roles(" + PartyHelper.TEAM_MEMBER_ROLES + ") found for partyId [" + partyIdTo + "], so no activities will be created for it");
             }
         }
     }

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/editcontactmech.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/editcontactmech.ftl	2006-10-05 21:13:28 UTC (rev 283)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/editcontactmech.ftl	2006-10-06 14:57:35 UTC (rev 284)
@@ -104,7 +104,7 @@
                       (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()})
                       <#if partyContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate.toString()}</#if>
                     &nbsp;</div></td>
-                  <td bgcolor="white"><div><a href="<@ofbizUrl>deletePartyContactMechPurpose?partyId=${partyId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${partyContactMechPurpose.contactMechPurposeTypeId}&fromDate=${partyContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePageFull?replace("=","%3d")}&useValues=true</@ofbizUrl>" class="buttontext">&nbsp;${uiLabelMap.CommonDelete}&nbsp;</a></div></td>
+                  <td bgcolor="white"><div><a href="<@ofbizUrl>deletePartyContactMechPurpose?partyId=${partyId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${partyContactMechPurpose.contactMechPurposeTypeId}&fromDate=${partyContactMechPurpose.fromDate.toString()}&donePage=${donePage}&useValues=true</@ofbizUrl>" class="buttontext">&nbsp;${uiLabelMap.CommonDelete}&nbsp;</a></div></td>
                 </tr>
               </#list>
             </#if>              
@@ -268,11 +268,11 @@
 
   <div style="margin-left: 24%;">
     <a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
-    <a href="<@ofbizUrl>authview/${donePageFull}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>
+    <a href="<@ofbizUrl>authview?donePage=${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>
   </div>
   <#else>
   <div style="margin-left: 24%;">
-    <a href="<@ofbizUrl>authview/${donePageFull}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+    <a href="<@ofbizUrl>authview?donePage=${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
   </div>
   </#if>
 </div>

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/viewprofile.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/viewprofile.ftl	2006-10-05 21:13:28 UTC (rev 283)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/contactmech/viewprofile.ftl	2006-10-06 14:57:35 UTC (rev 284)
@@ -58,7 +58,7 @@
   <div class="subSectionTitle">${uiLabelMap.PartyContactInformation}</div>
   <#if hasUpdatePermission?exists>
   <#-- these have to be on one line to avoid space issues -->
-  <div class="subMenuBar"><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=POSTAL_ADDRESS&amp;DONE_PAGE=${donePageEscaped}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreateAddress}</a><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=TELECOM_NUMBER&amp;DONE_PAGE=${donePageEscaped}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreatePhoneNumber}</a><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=EMAIL_ADDRESS&amp;DONE_PAGE=${donePageEscaped}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreateEmail}</a><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=WEB_ADDRESS&amp;DONE_PAGE=${donePageEscaped}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreateWebUrl}</a></div>
+  <div class="subMenuBar"><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=POSTAL_ADDRESS&amp;donePage=${donePage}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreateAddress}</a><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=TELECOM_NUMBER&amp;donePage=${donePage}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreatePhoneNumber}</a><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=EMAIL_ADDRESS&amp;donePage=${donePage}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreateEmail}</a><a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;preContactMechTypeId=WEB_ADDRESS&amp;donePage=${donePage}</@ofbizUrl>" class="subMenuButton">${uiLabelMap.CrmCreateWebUrl}</a></div>
   </#if>
 </div>
 
@@ -164,8 +164,8 @@
 
             <#if hasUpdatePermission?exists>
             <td>
-                  <a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&contactMechId=${contactMech.contactMechId}&DONE_PAGE=${donePageEscaped}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a>&nbsp;
-                  <a href="<@ofbizUrl>deleteContactMech/${donePage}?partyId=${partySummary.partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonExpire}</a>&nbsp;&nbsp;
+                  <a href="<@ofbizUrl>${editContactMechPage}?partyId=${partySummary.partyId}&amp;contactMechId=${contactMech.contactMechId}&donePage=${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a>&nbsp;
+                  <a href="<@ofbizUrl>deleteContactMech?donePage=${donePage}&amp;partyId=${partySummary.partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonExpire}</a>&nbsp;&nbsp;
             </td>
             </#if>
 

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-05 21:13:28 UTC (rev 283)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-06 14:57:35 UTC (rev 284)
@@ -61,7 +61,7 @@
             header-link="${listSortTarget}?${activityValueParams}&amp;pendingActivitiesOrderBy=estimatedCompletionDate#ListPendingActivities" header-link-style="orderByHeaderLink">
             <display/>
         </field>
-        <field name="close" widget-style="buttontext"><hyperlink target="closeTask?workEffortId=${workEffortId}" description="close"/></field>
+        <field name="close" widget-style="buttontext"><hyperlink target="closeTask?workEffortId=${workEffortId}&amp;donePage=${donePage}" description="close"/></field>
     </form>   
     
     <form name="ListCompletedActivities" type="list" separate-columns="true" 
@@ -500,10 +500,11 @@
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
         <field name="workEffortId" widget-style="buttontext"><hyperlink target="viewActivity?workEffortId=${workEffortId}" description="${workEffortId}"/></field>
     </form>
-    <form name="ListWrongEmails" type="list" separate-columns="true" 
-        title="Email List"  default-title-style="tableheadtext" list-name="listIt" target=""
+    <form name="ListWrongEmails" type="multi" use-row-submit="true" 
+        title="Email List"  default-title-style="tableheadtext" list-name="listIt" 
         default-widget-style="tabletext" default-tooltip-style="tabletext"
         default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
+        target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y"
         paginate-target="listWrongEmails" default-entity-name="CommunicationEvent">
         <actions>
             <set field="findParam.noConditionFind" value="Y"/>
@@ -522,7 +523,10 @@
         <field name="entryDate"><display description="${bsh:entryDate.toString().substring(0,16)}"/></field>
         <!--field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field-->
         <field name="note" widget-area-style="fieldWidth200"><display/></field>
-        <field name="delete" widget-style="buttontext"><hyperlink description="delete" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y"/></field>
+        <!--field name="delete" widget-style="buttontext"><hyperlink description="delete" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y"/></field-->
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+        <field name="deleteSelectedButton" widget-style="smallSubmit"><submit/></field>
+        
     </form>
     <form name="ListTaskEmails" type="list" separate-columns="true" 
         title="Task related emails"  default-title-style="tableheadtext" target=""
@@ -551,8 +555,10 @@
     <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title=""
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
         <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
-        <field name="partyId" position="1"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>
-        <field name="emailAddress" position="2"><text default-value="${fromEmail}"/></field>
+        <field name="partyIdFrom" tooltip="leave empty for new 'Contact'" position="1" use-when="communicationEvent.get(&quot;partyIdFrom&quot;)==null"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>
+        <field name="emailAddressFrom" position="2" use-when="communicationEvent.get(&quot;partyIdFrom&quot;)==null"><text default-value="${fromEmail}"/></field>
+        <field name="partyIdTo" tooltip="leave empty for new 'Contact'" position="1" use-when="communicationEvent.get(&quot;partyIdTo&quot;)==null"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>
+        <field name="emailAddressTo" position="2" use-when="communicationEvent.get(&quot;partyIdTo&quot;)==null"><text default-value="${toEmail}"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>

Author: leon
Date: 2006-10-05 14:13:28 -0700 (Thu, 05 Oct 2006)
New Revision: 283

Added:
   versions/0.9/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl
   versions/0.9/trunk/webapp/crmsfa/includes/test.ftl
Modified:
   versions/0.9/trunk/config/CRMSFAUiLabels.properties
   versions/0.9/trunk/entitydef/entitymodel.xml
   versions/0.9/trunk/servicedef/services_opportunities.xml
   versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java
   versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java
   versions/0.9/trunk/webapp/crm_images/ajax.css
   versions/0.9/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh
   versions/0.9/trunk/webapp/crmsfa/WEB-INF/controller.xml
   versions/0.9/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl
   versions/0.9/trunk/widget/crmsfa/screens/common/CommonScreens.xml
Log:
Backported ajax developments up to this revision to 0.9.

Modified: versions/0.9/trunk/config/CRMSFAUiLabels.properties
===================================================================
--- versions/0.9/trunk/config/CRMSFAUiLabels.properties	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/config/CRMSFAUiLabels.properties	2006-10-05 21:13:28 UTC (rev 283)
@@ -20,6 +20,7 @@
 # Copyright (c) 2005-2006 Open Source Strategies, Inc.
 
 CrmTeamOpportunities = My Teams' Opportunities
+CrmAccountOrLead = Account or Lead Name
 CrmAccount = Account
 CrmAccountDeactivated = This Account Has Been Deactivated
 CrmAccountName = Account Name

Modified: versions/0.9/trunk/entitydef/entitymodel.xml
===================================================================
--- versions/0.9/trunk/entitydef/entitymodel.xml	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/entitydef/entitymodel.xml	2006-10-05 21:13:28 UTC (rev 283)
@@ -115,6 +115,13 @@
         <alias-all entity-alias="PG">
         	    <exclude field="comments"/>
         	</alias-all>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="P" rel-entity-alias="PG" rel-optional="true">
             <key-map field-name="partyId"/>
         </view-link>
@@ -148,6 +155,13 @@
         	    <exclude field="statusId"/>
         </alias-all>
         <alias entity-alias="PR" name="relationshipStatusId" field="statusId"/>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="PR" rel-entity-alias="P">
             <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
         </view-link>
@@ -184,6 +198,13 @@
         	    <exclude field="statusId"/>
         </alias-all>
         <alias entity-alias="PR" name="relationshipStatusId" field="statusId"/>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="PR" rel-entity-alias="P">
             <key-map field-name="partyIdTo" rel-field-name="partyId"/>
         </view-link>

Modified: versions/0.9/trunk/servicedef/services_opportunities.xml
===================================================================
--- versions/0.9/trunk/servicedef/services_opportunities.xml	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/servicedef/services_opportunities.xml	2006-10-05 21:13:28 UTC (rev 283)
@@ -46,11 +46,14 @@
     <!-- note that our services are prefixed with "crmsfa." to easily distinguish them from other services; perhaps a namespace system would be useful here -->
 
     <service name="crmsfa.createOpportunity" engine="java" location="com.opensourcestrategies.crmsfa.opportunities.OpportunitiesServices" invoke="createOpportunity">
-        <description>Creates an Opportunity for an account. The userLogin must have CRMSFA_OPP_CREATE permission on this account.</description>
+        <description>Creates an Opportunity for an account or lead. The userLogin must have CRMSFA_OPP_CREATE permission on this account or lead. 
+            Specify the account or lead with internalPartyId. Alternatively, the accountPartyId or leadPartyId may be specified.</description>
         <attribute name="opportunityName" type="String" mode="IN" optional="false"/>
+        <!-- TODO: once the form widget accepts autocomplete, remove accountPartyId and leadPartyId in favor of internalPartyId -->
+        <attribute name="internalPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="accountPartyId" type="String" mode="IN" optional="true"/>
+        <attribute name="leadPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="contactPartyId" type="String" mode="IN" optional="true"/>
-        <attribute name="leadPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="nextStep" type="String" mode="IN" optional="true"/>
         <attribute name="estimatedAmount" type="Double" mode="IN" optional="true"/>
         <attribute name="opportunityStageId" type="String" mode="IN" optional="true"/>

Modified: versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java
===================================================================
--- versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java	2006-10-05 21:13:28 UTC (rev 283)
@@ -18,12 +18,14 @@
 package com.opensourcestrategies.crmsfa.ajax;
 
 import java.util.*;
+import java.io.UnsupportedEncodingException;
 import javax.servlet.http.*;
 
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.*;
 import org.ofbiz.entity.condition.*;
-import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.entity.transaction.*;
 import org.ofbiz.service.*;
 
 /**
@@ -35,6 +37,9 @@
 
     public static final String module = AjaxEvents.class.getName();
 
+    /** How many results to show in the autocomplete list. */
+    public static final int DEFAULT_AUTOCOMPLETE_RESULTS_SIZE = 10;
+
     /**
      *  Obtains candidate accounts for an autocomplete element.  The input
      *  parameter is accoutName, which will be matched against 
@@ -44,14 +49,18 @@
         GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
 
         // get the accountName parameter and make sure it has some content
-        String accountName = request.getParameter("accountName");
+        String accountName = null;
+        try {
+            accountName = new String(request.getParameter("accountName").getBytes("iso-8859-1"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+        }
         if (accountName == null || accountName.trim().length() == 0) return "success";
 
         try {
             // select parties with ACCOUNT role and lowercase(groupName) like lowercase(accountName)
             List conditions = UtilMisc.toList(
                     new EntityExpr("roleTypeId", EntityOperator.EQUALS, "ACCOUNT"),
-                    new EntityExpr("groupName", true, EntityOperator.LIKE, "%" + accountName + "%", true));
+                    new EntityExpr("groupName", true, EntityOperator.LIKE, "%" + accountName.trim() + "%", true));
             EntityConditionList conditionList = new EntityConditionList(conditions, EntityOperator.AND);
             List accounts = delegator.findByCondition("PartyRoleAndPartyDetail", conditionList, UtilMisc.toList("partyId", "groupName"), UtilMisc.toList("groupName"));
 
@@ -63,4 +72,77 @@
             return "error";
         }
     }
+
+    // static data so these don't get created over and over again each request
+    private static EntityCondition accountOrProspectRoleCondition = new EntityConditionList( UtilMisc.toList(
+                new EntityExpr("roleTypeIdFrom", EntityOperator.EQUALS, "ACCOUNT"),
+                new EntityExpr("roleTypeIdFrom", EntityOperator.EQUALS, "PROSPECT")
+                ), EntityOperator.OR);
+    private static EntityFindOptions entityFindOptions = new EntityFindOptions(true, EntityFindOptions.TYPE_FORWARD_ONLY, EntityFindOptions.CONCUR_READ_ONLY, true);
+    private static List partyNameFields = UtilMisc.toList("partyId", "displayName");
+    private static List partyNameOrderBy = UtilMisc.toList("displayName");
+
+    /**
+     * Search for Accounts or Leads using a given search string partyName.  Constrains results to Accounts 
+     * or Leads that have any kind of active relationship with the userLogin.
+     * The search space is defined by UPPERCASE(groupName + firstName + lastName).
+     */
+    public static String autocompleteAccountsOrLeads(HttpServletRequest request, HttpServletResponse response) {
+        GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+        HttpSession session = request.getSession();
+        GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
+        if (delegator == null || userLogin == null) return "error";
+
+        // convert input to UTF-8 and make sure it has content
+        String partyName = null;
+        try {
+            partyName = new String(request.getParameter("partyName").getBytes("iso-8859-1"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Debug.logError(e, e.getMessage());
+        }
+        if (partyName == null || partyName.trim().length() == 0) return "success";
+
+        // format partyName for search
+        partyName = partyName.trim().toUpperCase();
+
+        try {
+            // find active ACCOUNT or PROSPECT parties that the userLogin has a relationship to
+            EntityCondition conditions = new EntityConditionList( UtilMisc.toList(
+                        new EntityExpr("partyIdTo", EntityOperator.EQUALS, userLogin.get("partyId")),
+                        EntityUtil.getFilterByDateExpr(),
+                        accountOrProspectRoleCondition
+                        ), EntityOperator.AND);
+
+            // get result as a list iterator (transaction block is to work around a bug in entity engine)
+            TransactionUtil.begin();
+            EntityListIterator iterator = delegator.findListIteratorByCondition("PartyFromSummaryByRelationship", conditions, null,
+                    partyNameFields, partyNameOrderBy, entityFindOptions);
+
+            // scan the parties by hand (prevents SQL injection)
+            ArrayList parties = new ArrayList();
+            GenericValue party = null;
+            String searchString = null;
+            int results = 0;
+            while ((party = (GenericValue) iterator.next()) != null) {
+                searchString = party.getString("displayName").toUpperCase();
+                if (searchString.indexOf(partyName) > -1) {
+                    parties.add(party);
+                    results += 1;
+                }
+                if (results >= DEFAULT_AUTOCOMPLETE_RESULTS_SIZE)
+                    break;
+            }
+
+            // clean up
+            iterator.close();
+            TransactionUtil.commit();
+
+            // put the results in the request as an attribute, which will be retrieved by the ftl
+            request.setAttribute("parties", parties);
+            return "success";
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+            return "error";
+        }
+    }
 }

Modified: versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java
===================================================================
--- versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java	2006-10-05 21:13:28 UTC (rev 283)
@@ -54,6 +54,7 @@
 
     public static final String module = OpportunitiesServices.class.getName();
 
+    // TODO: the input for this service should be vastly simplified when AJAX autocomplete is finished: only input should be internalPartyId
     public static Map createOpportunity(DispatchContext dctx, Map context) {
         GenericDelegator delegator = dctx.getDelegator();
         LocalDispatcher dispatcher = dctx.getDispatcher();
@@ -61,17 +62,21 @@
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
 
+        String internalPartyId = (String) context.get("internalPartyId");
         String accountPartyId = (String) context.get("accountPartyId");
         String contactPartyId = (String) context.get("contactPartyId");
         String leadPartyId = (String) context.get("leadPartyId");
 
-        // make sure either an account or lead is supplied, but not both
-        if ((accountPartyId == null && leadPartyId == null) || (accountPartyId != null && leadPartyId != null)) {
+        // if internal not supplied, then make sure either an account or lead is supplied, but not both
+        if (internalPartyId == null && ((accountPartyId == null && leadPartyId == null) || (accountPartyId != null && leadPartyId != null))) {
             return UtilCommon.createAndLogServiceError("Please specify an account or a lead (not both).", "CrmErrorCreateOpportunityFail", locale, module);
         }
 
         // track which partyId we're using, the account or the lead
-        String partyId = (accountPartyId != null ? accountPartyId : leadPartyId);
+        String partyId = null;
+        if (accountPartyId != null) partyId = accountPartyId;
+        if (leadPartyId != null) partyId = leadPartyId;
+        if (internalPartyId != null) partyId = internalPartyId;
 
         // make sure userLogin has CRMSFA_OPP_CREATE permission for the account or lead
         if (!CrmsfaSecurity.hasPartyRelationSecurity(security, "CRMSFA_OPP", "_CREATE", userLogin, partyId)) {
@@ -79,6 +84,13 @@
         }
 
         try {
+            // set the accountPartyId or leadPartyId according to the role of internalPartyId
+            if (internalPartyId != null) {
+                String roleTypeId = PartyHelper.getFirstValidInternalPartyRoleTypeId(internalPartyId, delegator);
+                if ("ACCOUNT".equals(roleTypeId)) accountPartyId = internalPartyId;
+                if ("PROSPECT".equals(roleTypeId)) leadPartyId = internalPartyId;
+            }
+
             // make sure the lead is qualified if we're doing initial lead
             if (leadPartyId != null) {
                 GenericValue party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", leadPartyId));

Modified: versions/0.9/trunk/webapp/crm_images/ajax.css
===================================================================
--- versions/0.9/trunk/webapp/crm_images/ajax.css	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/webapp/crm_images/ajax.css	2006-10-05 21:13:28 UTC (rev 283)
@@ -1,27 +1,26 @@
 /* Styles for Ajax autocomplete dropdown */
 
 div.autocomplete {
-  font: 8pt Arial;
-  width: 350px;
-  background: #fff;
+    font: 8pt Arial;
+    width: 350px;
+    background: #fff;
 }
 div.autocomplete ul {
-  border: 1px solid black;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  list-style-type: none;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    width:100%;
+    list-style-type:none;
 }
-div.autocomplete li {
-  border-bottom: 1px solid #888;
-  margin: 0;
-  padding: 3px;
+div.autocomplete ul li {
+    margin:0;
+    padding:3px;
 }
-div.autocomplete ul li.selected {
-  background-color: #ffb;
+div.autocomplete ul li.selected { 
+    background-color: #ffb; 
 }
-div.autocomplete ul strong.highlight {
-  color: #800;
-  margin: 0;
-  padding: 0;
+div.autocomplete ul strong.highlight { 
+    color: #800; 
+    margin:0;
+    padding:0;
 }

Modified: versions/0.9/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh
===================================================================
--- versions/0.9/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh	2006-10-05 21:13:28 UTC (rev 283)
@@ -1,23 +1,5 @@
-/*
- * Copyright (C) 2006  Open Source Strategies, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-// Copyright (c) 2005-2006 Open Source Strategies, Inc.
+import org.ofbiz.entity.condition.*;
+import org.ofbiz.entity.util.*;
 
-// This handy script is a place to test code. To call it, use the uri "test" and put a testResults in the context
-testResults = "Test";
-
-context.put("testResults", testResults);
+// this is a test script that can be accessed via /crmsfa/control/test
+// the ftl for this is webapp/crmsfa/includes/test.ftl

Modified: versions/0.9/trunk/webapp/crmsfa/WEB-INF/controller.xml
===================================================================
--- versions/0.9/trunk/webapp/crmsfa/WEB-INF/controller.xml	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/webapp/crmsfa/WEB-INF/controller.xml	2006-10-05 21:13:28 UTC (rev 283)
@@ -133,6 +133,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="myHomeMain"/>
     </request-map>
+    <request-map uri="test">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="test"/>
+    </request-map>
 
 
     <!-- ========================= -->
@@ -982,6 +986,11 @@
         <response name="success" type="view" value="autocompleteAccounts"/>
         <response name="error" type="view" value="autocompleteAccounts"/>
     </request-map>
+    <request-map uri="autocompleteAccountsOrLeads">
+        <event type="java" path="com.opensourcestrategies.crmsfa.ajax.AjaxEvents" invoke="autocompleteAccountsOrLeads"/>
+        <response name="success" type="view" value="autocompleteParties"/>
+        <response name="error" type="view" value="autocompleteParties"/>
+    </request-map>
 
 
     <!-- ==================== -->
@@ -1043,6 +1052,7 @@
 
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="login" type="screen" page="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml#login"/>
+    <view-map name="test" type="screen" page="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml#test"/>
 
     <!-- main screens for each section -->
     <view-map name="myHomeMain" type="screen" page="component://crmsfa/widget/crmsfa/screens/myhome/MyHomeScreens.xml#myHome"/>
@@ -1154,6 +1164,7 @@
 
     <!-- Ajax ftl: The response mime type is text/xml so that we can treat the response as a DOM object using xhr.responseXML() -->
     <view-map name="autocompleteAccounts" type="ftl" page="/ajax/autocompleteAccounts.ftl" content-type="text/xml"/>
+    <view-map name="autocompleteParties" type="ftl" page="/ajax/autocompleteParties.ftl" content-type="text/xml"/>
 
     <!-- ================================================================== -->
     <!-- ================================================================== -->

Copied: versions/0.9/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl (from rev 282, versions/1.0/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl)

Copied: versions/0.9/trunk/webapp/crmsfa/includes/test.ftl (from rev 282, versions/1.0/trunk/webapp/crmsfa/includes/test.ftl)

Modified: versions/0.9/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl
===================================================================
--- versions/0.9/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl	2006-10-05 21:13:28 UTC (rev 283)
@@ -24,48 +24,52 @@
     <div class="screenlet-header"><div class="boxhead">${uiLabelMap.CrmNewOpportunity}</div></div>
     <div class="screenlet-body">
 
-        <#-- hidden accountPartyId to be filled in by the autocomplete event callback -->
-        <input id="accountPartyIdInput" type="hidden" name="accountPartyId" value="" class="inputBox"/> 
+        <#-- hidden fields to be filled in by the autocomplete event callback -->
+        <input id="partyIdHidden" type="hidden" name="internalPartyId" value=""/> 
 
-        <#-- use onBlur to call autocompleteAccounts function each time the user presses a key -->
-        <span class="requiredFieldNormal">${uiLabelMap.CrmAccount}</span><br/>
-        <input id="accountName" name="accountName" type="text" class="inputBox" size="15" maxlength="200" onBlur="autocompleteAccounts(this.value)"/>
+        <#-- main input box with onBlur handler to deal with bad input -->
+        <span class="requiredFieldNormal">${uiLabelMap.CrmAccountOrLead}</span><br/>
+        <input id="partyName" name="partyName" type="text" class="inputBox" size="15" maxlength="200" onBlur="validatePartyName()"/>
 
         <#-- this div is where the autocomplete results will be shown -->
-        <div id="accountNamesDropdown" class="autocomplete"></div>
+        <div id="partyNamesDropdown" class="autocomplete"></div>
 
         <#-- AJAX autocomplete code.  See tutorial documentation to see how this works. -->
         <script type="text/javascript">
 
-          // autocomplete the account name using AJAX
-          function autocompleteAccounts(input) {
-            new Ajax.Updater("accountName", "autocompleteAccounts", {
-              asynchronous: true,
-              method: "get",
-              parameters: "accountName=" + input + "&type=html",
-              onSuccess: function(request) {
-                var item = request.responseXML.getElementsByTagName('li')[0];
-                if (item && item.getAttribute('accountPartyId')) {
-                  document.getElementById('accountPartyIdInput').value = item.getAttribute('accountPartyId');
-                  new Effect.Highlight('accountName'); // highlight effect to let the user know the input was accepted
-                } else {
-                  document.getElementById('accountPartyIdInput').value = '';
-                  new Effect.Pulsate('accountName'); // you could put an alert here instead
-                }
-              }
-            });
+          // Binds an autocomplete event to the partyName input, the dropdown div, the request URI, and a function to invoke after user selects an item
+          new Ajax.Autocompleter('partyName', 'partyNamesDropdown', 'autocompleteAccountsOrLeads', {afterUpdateElement: updatePartyId})
+
+          // when item is selected, record the selected ID and Name and highlight the input to inform user of success
+          function updatePartyId(inputField, selectedItem) {
+            document.getElementById('partyIdHidden').value = selectedItem.getAttribute('partyId');
+            new Effect.Highlight('partyName');
           }
 
-          // Binds an autocomplete event to the input accountName, the div accountNamesDropdown, and the url request autocompleteAccounts
-          new Ajax.Autocompleter('accountName', 'accountNamesDropdown', 'autocompleteAccounts', {})
+          // Autocompleter cannot handle the case where user does not select value, so we create
+          // an Ajax request to validate the input when user leaves the field.  The onSuccess
+          // callback handles the results of this request.
+          function validatePartyName() {
+            var partyName = document.getElementById('partyName').value;
+            new Ajax.Updater('partyName', 'autocompleteAccountsOrLeads', 
+                {asynchronous: true, method: 'get', parameters: 'partyName='+partyName, onSuccess: validateRequestForPartyName});
+          }
 
+          function validateRequestForPartyName(request) {
+            var list = request.responseXML.getElementsByTagName('li');
+            if (!list || list.length == 0) {
+              // If there are no search results, then clear out the hidden ID field and warn the user with a pulse effect
+              document.getElementById('partyIdHidden').value = '';
+              new Effect.Pulsate('partyName');
+            } else if (list.length > 1) {
+              // If more than one match, pick the first item and autocomplete it
+              var selectedItem = list[0];
+              document.getElementById('partyName').value = selectedItem.getAttribute('displayName');
+              updatePartyId(null, selectedItem);
+            }
+          }
         </script>
 
-        <span class="requiredFieldNormal">${uiLabelMap.CrmLead}</span><br/>
-        <input name="leadPartyId" type="text" class="inputBox" size="15" maxlength="20"/>
-        <a href="javascript:call_fieldlookup2(document.quickCreateOpportunityForm.leadPartyId, 'LookupLeads');"><img src="/content/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"></img></a>
-        <br/>
-
         <span class="requiredFieldNormal">${uiLabelMap.CrmOpportunityName}</span><br/>
         <input name="opportunityName" type="text" class="inputBox" size="15" maxlength="60"><br/>
 

Modified: versions/0.9/trunk/widget/crmsfa/screens/common/CommonScreens.xml
===================================================================
--- versions/0.9/trunk/widget/crmsfa/screens/common/CommonScreens.xml	2006-10-05 20:58:53 UTC (rev 282)
+++ versions/0.9/trunk/widget/crmsfa/screens/common/CommonScreens.xml	2006-10-05 21:13:28 UTC (rev 283)
@@ -266,5 +266,23 @@
         </section>
     </screen>
 
+    <!-- Screen for quick tests using test.bsh and test.ftl, wrapped in a none decorator -->
+    <screen name="test">
+        <section>
+            <actions>
+                <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/includes/test.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-none-decorator" location="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml">
+                    <decorator-section name="none-body">
+                        <platform-specific>
+                            <html><html-template location="component://crmsfa/webapp/crmsfa/includes/test.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>

Author: leon
Date: 2006-10-05 13:58:53 -0700 (Thu, 05 Oct 2006)
New Revision: 282

Added:
   versions/1.0/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl
   versions/1.0/trunk/webapp/crmsfa/includes/test.ftl
Modified:
   versions/1.0/trunk/config/CRMSFAUiLabels.properties
   versions/1.0/trunk/entitydef/entitymodel.xml
   versions/1.0/trunk/servicedef/services_opportunities.xml
   versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java
   versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java
   versions/1.0/trunk/webapp/crm_images/ajax.css
   versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh
   versions/1.0/trunk/webapp/crmsfa/WEB-INF/controller.xml
   versions/1.0/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl
   versions/1.0/trunk/widget/crmsfa/screens/common/CommonScreens.xml
Log:
Improved ajax autocomplete to use 'Accounts or Leads' input instead of two inputs.  This relies on new complex-alias functionality.  Also improved the ajax javascript to handle errors more gracefully.  Includes test.bsh, test.ftl and a test screen for quick tests.

Modified: versions/1.0/trunk/config/CRMSFAUiLabels.properties
===================================================================
--- versions/1.0/trunk/config/CRMSFAUiLabels.properties	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/config/CRMSFAUiLabels.properties	2006-10-05 20:58:53 UTC (rev 282)
@@ -20,6 +20,7 @@
 # Copyright (c) 2005-2006 Open Source Strategies, Inc.
 
 
+CrmAccountOrLead = Account or Lead Name
 CrmAccount = Account
 CrmAccountDeactivated = This Account Has Been Deactivated
 CrmAccountName = Account Name

Modified: versions/1.0/trunk/entitydef/entitymodel.xml
===================================================================
--- versions/1.0/trunk/entitydef/entitymodel.xml	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/entitydef/entitymodel.xml	2006-10-05 20:58:53 UTC (rev 282)
@@ -115,6 +115,13 @@
         <alias-all entity-alias="PG">
             <exclude field="comments"/>
         </alias-all>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="P" rel-entity-alias="PG" rel-optional="true">
             <key-map field-name="partyId"/>
         </view-link>
@@ -148,6 +155,13 @@
             <exclude field="statusId"/>
         </alias-all>
         <alias entity-alias="PR" name="relationshipStatusId" field="statusId"/>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="PR" rel-entity-alias="P">
             <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
         </view-link>
@@ -184,6 +198,13 @@
             <exclude field="statusId"/>
         </alias-all>
         <alias entity-alias="PR" name="relationshipStatusId" field="statusId"/>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="PR" rel-entity-alias="P">
             <key-map field-name="partyIdTo" rel-field-name="partyId"/>
         </view-link>
@@ -228,6 +249,13 @@
         <alias-all entity-alias="PA">
             <exclude field="contactMechId"/>
         </alias-all>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="P" rel-entity-alias="PG" rel-optional="true">
             <key-map field-name="partyId"/>
         </view-link>
@@ -284,6 +312,13 @@
         <alias-all entity-alias="PA">
             <exclude field="contactMechId"/>
         </alias-all>
+        <alias name="displayName">
+            <complex-alias operator="|| ' ' ||">
+                <complex-alias-field entity-alias="PG" field="groupName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="firstName" default-value="''"/>
+                <complex-alias-field entity-alias="PER" field="lastName" default-value="''"/>
+            </complex-alias>
+        </alias>
         <view-link entity-alias="CLP" rel-entity-alias="CL">
             <key-map field-name="contactListId"/>
         </view-link>

Modified: versions/1.0/trunk/servicedef/services_opportunities.xml
===================================================================
--- versions/1.0/trunk/servicedef/services_opportunities.xml	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/servicedef/services_opportunities.xml	2006-10-05 20:58:53 UTC (rev 282)
@@ -46,11 +46,14 @@
     <!-- note that our services are prefixed with "crmsfa." to easily distinguish them from other services; perhaps a namespace system would be useful here -->
 
     <service name="crmsfa.createOpportunity" engine="java" location="com.opensourcestrategies.crmsfa.opportunities.OpportunitiesServices" invoke="createOpportunity">
-        <description>Creates an Opportunity for an account. The userLogin must have CRMSFA_OPP_CREATE permission on this account.</description>
+        <description>Creates an Opportunity for an account or lead. The userLogin must have CRMSFA_OPP_CREATE permission on this account or lead. 
+            Specify the account or lead with internalPartyId. Alternatively, the accountPartyId or leadPartyId may be specified.</description>
         <attribute name="opportunityName" type="String" mode="IN" optional="false"/>
+        <!-- TODO: once the form widget accepts autocomplete, remove accountPartyId and leadPartyId in favor of internalPartyId -->
+        <attribute name="internalPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="accountPartyId" type="String" mode="IN" optional="true"/>
+        <attribute name="leadPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="contactPartyId" type="String" mode="IN" optional="true"/>
-        <attribute name="leadPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="nextStep" type="String" mode="IN" optional="true"/>
         <attribute name="estimatedAmount" type="Double" mode="IN" optional="true"/>
         <attribute name="opportunityStageId" type="String" mode="IN" optional="true"/>

Modified: versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java
===================================================================
--- versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/ajax/AjaxEvents.java	2006-10-05 20:58:53 UTC (rev 282)
@@ -24,7 +24,8 @@
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.*;
 import org.ofbiz.entity.condition.*;
-import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.entity.transaction.*;
 import org.ofbiz.service.*;
 
 /**
@@ -36,6 +37,9 @@
 
     public static final String module = AjaxEvents.class.getName();
 
+    /** How many results to show in the autocomplete list. */
+    public static final int DEFAULT_AUTOCOMPLETE_RESULTS_SIZE = 10;
+
     /**
      *  Obtains candidate accounts for an autocomplete element.  The input
      *  parameter is accoutName, which will be matched against 
@@ -56,7 +60,7 @@
             // select parties with ACCOUNT role and lowercase(groupName) like lowercase(accountName)
             List conditions = UtilMisc.toList(
                     new EntityExpr("roleTypeId", EntityOperator.EQUALS, "ACCOUNT"),
-                    new EntityExpr("groupName", true, EntityOperator.LIKE, "%" + accountName + "%", true));
+                    new EntityExpr("groupName", true, EntityOperator.LIKE, "%" + accountName.trim() + "%", true));
             EntityConditionList conditionList = new EntityConditionList(conditions, EntityOperator.AND);
             List accounts = delegator.findByCondition("PartyRoleAndPartyDetail", conditionList, UtilMisc.toList("partyId", "groupName"), UtilMisc.toList("groupName"));
 
@@ -68,4 +72,77 @@
             return "error";
         }
     }
+
+    // static data so these don't get created over and over again each request
+    private static EntityCondition accountOrProspectRoleCondition = new EntityConditionList( UtilMisc.toList(
+                new EntityExpr("roleTypeIdFrom", EntityOperator.EQUALS, "ACCOUNT"),
+                new EntityExpr("roleTypeIdFrom", EntityOperator.EQUALS, "PROSPECT")
+                ), EntityOperator.OR);
+    private static EntityFindOptions entityFindOptions = new EntityFindOptions(true, EntityFindOptions.TYPE_FORWARD_ONLY, EntityFindOptions.CONCUR_READ_ONLY, true);
+    private static List partyNameFields = UtilMisc.toList("partyId", "displayName");
+    private static List partyNameOrderBy = UtilMisc.toList("displayName");
+
+    /**
+     * Search for Accounts or Leads using a given search string partyName.  Constrains results to Accounts 
+     * or Leads that have any kind of active relationship with the userLogin.
+     * The search space is defined by UPPERCASE(groupName + firstName + lastName).
+     */
+    public static String autocompleteAccountsOrLeads(HttpServletRequest request, HttpServletResponse response) {
+        GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+        HttpSession session = request.getSession();
+        GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
+        if (delegator == null || userLogin == null) return "error";
+
+        // convert input to UTF-8 and make sure it has content
+        String partyName = null;
+        try {
+            partyName = new String(request.getParameter("partyName").getBytes("iso-8859-1"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            Debug.logError(e, e.getMessage());
+        }
+        if (partyName == null || partyName.trim().length() == 0) return "success";
+
+        // format partyName for search
+        partyName = partyName.trim().toUpperCase();
+
+        try {
+            // find active ACCOUNT or PROSPECT parties that the userLogin has a relationship to
+            EntityCondition conditions = new EntityConditionList( UtilMisc.toList(
+                        new EntityExpr("partyIdTo", EntityOperator.EQUALS, userLogin.get("partyId")),
+                        EntityUtil.getFilterByDateExpr(),
+                        accountOrProspectRoleCondition
+                        ), EntityOperator.AND);
+
+            // get result as a list iterator (transaction block is to work around a bug in entity engine)
+            TransactionUtil.begin();
+            EntityListIterator iterator = delegator.findListIteratorByCondition("PartyFromSummaryByRelationship", conditions, null,
+                    partyNameFields, partyNameOrderBy, entityFindOptions);
+
+            // scan the parties by hand (prevents SQL injection)
+            ArrayList parties = new ArrayList();
+            GenericValue party = null;
+            String searchString = null;
+            int results = 0;
+            while ((party = (GenericValue) iterator.next()) != null) {
+                searchString = party.getString("displayName").toUpperCase();
+                if (searchString.indexOf(partyName) > -1) {
+                    parties.add(party);
+                    results += 1;
+                }
+                if (results >= DEFAULT_AUTOCOMPLETE_RESULTS_SIZE)
+                    break;
+            }
+
+            // clean up
+            iterator.close();
+            TransactionUtil.commit();
+
+            // put the results in the request as an attribute, which will be retrieved by the ftl
+            request.setAttribute("parties", parties);
+            return "success";
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+            return "error";
+        }
+    }
 }

Modified: versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java
===================================================================
--- versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/src/com/opensourcestrategies/crmsfa/opportunities/OpportunitiesServices.java	2006-10-05 20:58:53 UTC (rev 282)
@@ -54,6 +54,7 @@
 
     public static final String module = OpportunitiesServices.class.getName();
 
+    // TODO: the input for this service should be vastly simplified when AJAX autocomplete is finished: only input should be internalPartyId
     public static Map createOpportunity(DispatchContext dctx, Map context) {
         GenericDelegator delegator = dctx.getDelegator();
         LocalDispatcher dispatcher = dctx.getDispatcher();
@@ -61,17 +62,21 @@
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
 
+        String internalPartyId = (String) context.get("internalPartyId");
         String accountPartyId = (String) context.get("accountPartyId");
         String contactPartyId = (String) context.get("contactPartyId");
         String leadPartyId = (String) context.get("leadPartyId");
 
-        // make sure either an account or lead is supplied, but not both
-        if ((accountPartyId == null && leadPartyId == null) || (accountPartyId != null && leadPartyId != null)) {
+        // if internal not supplied, then make sure either an account or lead is supplied, but not both
+        if (internalPartyId == null && ((accountPartyId == null && leadPartyId == null) || (accountPartyId != null && leadPartyId != null))) {
             return UtilCommon.createAndLogServiceError("Please specify an account or a lead (not both).", "CrmErrorCreateOpportunityFail", locale, module);
         }
 
         // track which partyId we're using, the account or the lead
-        String partyId = (accountPartyId != null ? accountPartyId : leadPartyId);
+        String partyId = null;
+        if (accountPartyId != null) partyId = accountPartyId;
+        if (leadPartyId != null) partyId = leadPartyId;
+        if (internalPartyId != null) partyId = internalPartyId;
 
         // make sure userLogin has CRMSFA_OPP_CREATE permission for the account or lead
         if (!CrmsfaSecurity.hasPartyRelationSecurity(security, "CRMSFA_OPP", "_CREATE", userLogin, partyId)) {
@@ -79,6 +84,13 @@
         }
 
         try {
+            // set the accountPartyId or leadPartyId according to the role of internalPartyId
+            if (internalPartyId != null) {
+                String roleTypeId = PartyHelper.getFirstValidInternalPartyRoleTypeId(internalPartyId, delegator);
+                if ("ACCOUNT".equals(roleTypeId)) accountPartyId = internalPartyId;
+                if ("PROSPECT".equals(roleTypeId)) leadPartyId = internalPartyId;
+            }
+
             // make sure the lead is qualified if we're doing initial lead
             if (leadPartyId != null) {
                 GenericValue party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", leadPartyId));

Modified: versions/1.0/trunk/webapp/crm_images/ajax.css
===================================================================
--- versions/1.0/trunk/webapp/crm_images/ajax.css	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/webapp/crm_images/ajax.css	2006-10-05 20:58:53 UTC (rev 282)
@@ -1,27 +1,26 @@
 /* Styles for Ajax autocomplete dropdown */
 
 div.autocomplete {
-  font: 8pt Arial;
-  width: 350px;
-  background: #fff;
+    font: 8pt Arial;
+    width: 350px;
+    background: #fff;
 }
 div.autocomplete ul {
-  border: 1px solid black;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  list-style-type: none;
+    border:1px solid #888;
+    margin:0;
+    padding:0;
+    width:100%;
+    list-style-type:none;
 }
-div.autocomplete li {
-  border-bottom: 1px solid #888;
-  margin: 0;
-  padding: 3px;
+div.autocomplete ul li {
+    margin:0;
+    padding:3px;
 }
-div.autocomplete ul li.selected {
-  background-color: #ffb;
+div.autocomplete ul li.selected { 
+    background-color: #ffb; 
 }
-div.autocomplete ul strong.highlight {
-  color: #800;
-  margin: 0;
-  padding: 0;
+div.autocomplete ul strong.highlight { 
+    color: #800; 
+    margin:0;
+    padding:0;
 }

Modified: versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/webapp/crmsfa/WEB-INF/actions/includes/test.bsh	2006-10-05 20:58:53 UTC (rev 282)
@@ -1,23 +1,5 @@
-/*
- * Copyright (C) 2006  Open Source Strategies, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-// Copyright (c) 2005-2006 Open Source Strategies, Inc.
+import org.ofbiz.entity.condition.*;
+import org.ofbiz.entity.util.*;
 
-// This handy script is a place to test code. To call it, use the uri "test" and put a testResults in the context
-testResults = "Test";
-
-context.put("testResults", testResults);
+// this is a test script that can be accessed via /crmsfa/control/test
+// the ftl for this is webapp/crmsfa/includes/test.ftl

Modified: versions/1.0/trunk/webapp/crmsfa/WEB-INF/controller.xml
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/WEB-INF/controller.xml	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/webapp/crmsfa/WEB-INF/controller.xml	2006-10-05 20:58:53 UTC (rev 282)
@@ -133,6 +133,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="myHomeMain"/>
     </request-map>
+    <request-map uri="test">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="test"/>
+    </request-map>
 
 
     <!-- ========================= -->
@@ -1110,6 +1114,11 @@
         <response name="success" type="view" value="autocompleteAccounts"/>
         <response name="error" type="view" value="autocompleteAccounts"/>
     </request-map>
+    <request-map uri="autocompleteAccountsOrLeads">
+        <event type="java" path="com.opensourcestrategies.crmsfa.ajax.AjaxEvents" invoke="autocompleteAccountsOrLeads"/>
+        <response name="success" type="view" value="autocompleteParties"/>
+        <response name="error" type="view" value="autocompleteParties"/>
+    </request-map>
 
 
     <!-- ==================== -->
@@ -1247,6 +1256,7 @@
 
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="login" type="screen" page="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml#login"/>
+    <view-map name="test" type="screen" page="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml#test"/>
 
     <!-- main screens for each section -->
     <view-map name="myHomeMain" type="screen" page="component://crmsfa/widget/crmsfa/screens/myhome/MyHomeScreens.xml#myHome"/>
@@ -1379,6 +1389,7 @@
 
     <!-- Ajax ftl: The response mime type is text/xml so that we can treat the response as a DOM object using xhr.responseXML() -->
     <view-map name="autocompleteAccounts" type="ftl" page="/ajax/autocompleteAccounts.ftl" content-type="text/xml"/>
+    <view-map name="autocompleteParties" type="ftl" page="/ajax/autocompleteParties.ftl" content-type="text/xml"/>
 
     <!-- ================================================================== -->
     <!-- ================================================================== -->

Added: versions/1.0/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/webapp/crmsfa/ajax/autocompleteParties.ftl	2006-10-05 20:58:53 UTC (rev 282)
@@ -0,0 +1,9 @@
+<#-- code to generate the dropdown autocomplete list goes here -->
+
+<#if requestAttributes.parties?exists>
+<ul>
+  <#list requestAttributes.parties as party>
+  <li partyId="${party.partyId}">${party.displayName?if_exists}</li>
+  </#list>
+</ul>
+</#if>

Added: versions/1.0/trunk/webapp/crmsfa/includes/test.ftl
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/includes/test.ftl	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/webapp/crmsfa/includes/test.ftl	2006-10-05 20:58:53 UTC (rev 282)
@@ -0,0 +1 @@
+<#-- test ftl accessed at /crmsfa/control/test.  The bsh for this is webapp/crmsfa/WEB-INF/actions/includes/test.bsh -->

Modified: versions/1.0/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl
===================================================================
--- versions/1.0/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/webapp/crmsfa/opportunities/screenlets/quickCreateOpportunity.ftl	2006-10-05 20:58:53 UTC (rev 282)
@@ -24,48 +24,52 @@
     <div class="screenlet-header"><div class="boxhead">${uiLabelMap.CrmNewOpportunity}</div></div>
     <div class="screenlet-body">
 
-        <#-- hidden accountPartyId to be filled in by the autocomplete event callback -->
-        <input id="accountPartyIdInput" type="hidden" name="accountPartyId" value="" class="inputBox"/> 
+        <#-- hidden fields to be filled in by the autocomplete event callback -->
+        <input id="partyIdHidden" type="hidden" name="internalPartyId" value=""/> 
 
-        <#-- use onBlur to call autocompleteAccounts function each time the user presses a key -->
-        <span class="requiredFieldNormal">${uiLabelMap.CrmAccount}</span><br/>
-        <input id="accountName" name="accountName" type="text" class="inputBox" size="15" maxlength="200" onBlur="autocompleteAccounts(this.value)"/>
+        <#-- main input box with onBlur handler to deal with bad input -->
+        <span class="requiredFieldNormal">${uiLabelMap.CrmAccountOrLead}</span><br/>
+        <input id="partyName" name="partyName" type="text" class="inputBox" size="15" maxlength="200" onBlur="validatePartyName()"/>
 
         <#-- this div is where the autocomplete results will be shown -->
-        <div id="accountNamesDropdown" class="autocomplete"></div>
+        <div id="partyNamesDropdown" class="autocomplete"></div>
 
         <#-- AJAX autocomplete code.  See tutorial documentation to see how this works. -->
         <script type="text/javascript">
 
-          // autocomplete the account name using AJAX
-          function autocompleteAccounts(input) {
-            new Ajax.Updater("accountNamesDropdown", "autocompleteAccounts", {
-              asynchronous: true,
-              method: "get",
-              parameters: "accountName=" + input + "&type=html",
-              onSuccess: function(request) {
-                var item = request.responseXML.getElementsByTagName('li')[0];
-                if (item && item.getAttribute('accountPartyId')) {
-                  document.getElementById('accountPartyIdInput').value = item.getAttribute('accountPartyId');
-                  new Effect.Highlight('accountName'); // highlight effect to let the user know the input was accepted
-                } else {
-                  document.getElementById('accountPartyIdInput').value = '';
-                  new Effect.Pulsate('accountName'); // pulse to warn user of bad input
-                }
-              }
-            });
+          // Binds an autocomplete event to the partyName input, the dropdown div, the request URI, and a function to invoke after user selects an item
+          new Ajax.Autocompleter('partyName', 'partyNamesDropdown', 'autocompleteAccountsOrLeads', {afterUpdateElement: updatePartyId})
+
+          // when item is selected, record the selected ID and Name and highlight the input to inform user of success
+          function updatePartyId(inputField, selectedItem) {
+            document.getElementById('partyIdHidden').value = selectedItem.getAttribute('partyId');
+            new Effect.Highlight('partyName');
           }
 
-          // Binds an autocomplete event to the input accountName, the div accountNamesDropdown, and the url request autocompleteAccounts
-          new Ajax.Autocompleter('accountName', 'accountNamesDropdown', 'autocompleteAccounts', {})
+          // Autocompleter cannot handle the case where user does not select value, so we create
+          // an Ajax request to validate the input when user leaves the field.  The onSuccess
+          // callback handles the results of this request.
+          function validatePartyName() {
+            var partyName = document.getElementById('partyName').value;
+            new Ajax.Updater('partyName', 'autocompleteAccountsOrLeads', 
+                {asynchronous: true, method: 'get', parameters: 'partyName='+partyName, onSuccess: validateRequestForPartyName});
+          }
 
+          function validateRequestForPartyName(request) {
+            var list = request.responseXML.getElementsByTagName('li');
+            if (!list || list.length == 0) {
+              // If there are no search results, then clear out the hidden ID field and warn the user with a pulse effect
+              document.getElementById('partyIdHidden').value = '';
+              new Effect.Pulsate('partyName');
+            } else if (list.length > 1) {
+              // If more than one match, pick the first item and autocomplete it
+              var selectedItem = list[0];
+              document.getElementById('partyName').value = selectedItem.getAttribute('displayName');
+              updatePartyId(null, selectedItem);
+            }
+          }
         </script>
 
-        <span class="requiredFieldNormal">${uiLabelMap.CrmLead}</span><br/>
-        <input name="leadPartyId" type="text" class="inputBox" size="15" maxlength="20"/>
-        <a href="javascript:call_fieldlookup2(document.quickCreateOpportunityForm.leadPartyId, 'LookupLeads');"><img src="/content/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"></img></a>
-        <br/>
-
         <span class="requiredFieldNormal">${uiLabelMap.CrmOpportunityName}</span><br/>
         <input name="opportunityName" type="text" class="inputBox" size="15" maxlength="60"><br/>
 

Modified: versions/1.0/trunk/widget/crmsfa/screens/common/CommonScreens.xml
===================================================================
--- versions/1.0/trunk/widget/crmsfa/screens/common/CommonScreens.xml	2006-10-03 14:52:19 UTC (rev 281)
+++ versions/1.0/trunk/widget/crmsfa/screens/common/CommonScreens.xml	2006-10-05 20:58:53 UTC (rev 282)
@@ -351,5 +351,23 @@
         </section>
     </screen>
 
+    <!-- Screen for quick tests using test.bsh and test.ftl, wrapped in a none decorator -->
+    <screen name="test">
+        <section>
+            <actions>
+                <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/includes/test.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-none-decorator" location="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml">
+                    <decorator-section name="none-body">
+                        <platform-specific>
+                            <html><html-template location="component://crmsfa/webapp/crmsfa/includes/test.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>

Author: hans
Date: 2006-10-03 07:52:19 -0700 (Tue, 03 Oct 2006)
New Revision: 281

Modified:
   versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
Log:
allow deletion of an email with attachements

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl	2006-10-03 03:50:21 UTC (rev 280)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl	2006-10-03 14:52:19 UTC (rev 281)
@@ -28,7 +28,7 @@
     	<a class="subMenuButton" href="updateCommunicationEventStatus?communicationEventId=${communicationEvent.communicationEventId}${parameters.origCommunicationEventId?if_exists}&amp;statusId=COM_PENDING">Close Email</a>
     	<a class="subMenuButton" href="closeTask?workEffortId=${parameters.workEffortId}">Close Task</a>
     	</#if>
-    	<a class="subMenuButton" href="deleteCommunicationEvent?communicationEventId=${communicationEvent.communicationEventId}${parameters.origCommunicationEventId?if_exists}">Delete Email</a>
+    	<a class="subMenuButton" href="deleteCommunicationEvent?communicationEventId=${communicationEvent.communicationEventId}${parameters.origCommunicationEventId?if_exists}&amp;delContentDataResource=Y">Delete Email</a>
    	</div>
     </#if>
 </div>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-03 03:50:21 UTC (rev 280)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-03 14:52:19 UTC (rev 281)
@@ -522,7 +522,7 @@
         <field name="entryDate"><display description="${bsh:entryDate.toString().substring(0,16)}"/></field>
         <!--field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field-->
         <field name="note" widget-area-style="fieldWidth200"><display/></field>
-        <field name="delete" widget-style="buttontext"><hyperlink description="delete" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}"/></field>
+        <field name="delete" widget-style="buttontext"><hyperlink description="delete" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y"/></field>
     </form>
     <form name="ListTaskEmails" type="list" separate-columns="true" 
         title="Task related emails"  default-title-style="tableheadtext" target=""

Author: hans
Date: 2006-10-02 20:50:21 -0700 (Mon, 02 Oct 2006)
New Revision: 280

Modified:
   versions/1.0/branches/emailPayment/servicedef/smcas.xml
Log:
better do not have condition on smca rule other wise messages get ifnored...

Modified: versions/1.0/branches/emailPayment/servicedef/smcas.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/smcas.xml	2006-10-02 16:09:25 UTC (rev 279)
+++ versions/1.0/branches/emailPayment/servicedef/smcas.xml	2006-10-03 03:50:21 UTC (rev 280)
@@ -44,7 +44,7 @@
     <mca mail-rule-name="processIncomingEmail">
         <!-- the matching is a regular expression match against the email address.  this format seems to work for
         both "xyz@..." and "Mr. XYZ <xyz@...>" -->
-        <condition-field field-name="to" operator="matches" value=".*@a-net.nl>*"/>
+        <!--condition-field field-name="to" operator="matches" value=".*@a-net.nl>*"/--><!-- better not put any conditions, otherwise messages may be ignored like to mailinglist etc... -->
         <action service="crmsfa.processIncomingEmail" mode="sync"/>
     </mca>
 </service-mca>

Author: leon
Date: 2006-10-02 09:09:25 -0700 (Mon, 02 Oct 2006)
New Revision: 279

Modified:
   versions/1.0/trunk/entitydef/entitymodel.xml
Log:
Fix tabs

Modified: versions/1.0/trunk/entitydef/entitymodel.xml
===================================================================
--- versions/1.0/trunk/entitydef/entitymodel.xml	2006-10-02 14:41:02 UTC (rev 278)
+++ versions/1.0/trunk/entitydef/entitymodel.xml	2006-10-02 16:09:25 UTC (rev 279)
@@ -109,12 +109,12 @@
         <member-entity entity-alias="PSD" entity-name="PartySupplementalData"/>
         <alias-all entity-alias="P"/>
         <alias-all entity-alias="PER">
-        	    <exclude field="comments"/>
-        	</alias-all>
+            <exclude field="comments"/>
+        </alias-all>
         <alias-all entity-alias="PSD"/>
         <alias-all entity-alias="PG">
-        	    <exclude field="comments"/>
-        	</alias-all>
+            <exclude field="comments"/>
+        </alias-all>
         <view-link entity-alias="P" rel-entity-alias="PG" rel-optional="true">
             <key-map field-name="partyId"/>
         </view-link>
@@ -138,14 +138,14 @@
         <alias-all entity-alias="P"/>
         <alias-all entity-alias="PER">
             <exclude field="comments"/>
-        	</alias-all>
+        </alias-all>
         <alias-all entity-alias="PSD"/>
         <alias-all entity-alias="PG">
             <exclude field="comments"/>
-        	</alias-all>
+        </alias-all>
         <alias-all entity-alias="PR">
             <exclude field="comments"/>
-        	    <exclude field="statusId"/>
+            <exclude field="statusId"/>
         </alias-all>
         <alias entity-alias="PR" name="relationshipStatusId" field="statusId"/>
         <view-link entity-alias="PR" rel-entity-alias="P">
@@ -174,14 +174,14 @@
         <alias-all entity-alias="P"/>
         <alias-all entity-alias="PER">
             <exclude field="comments"/>
-        	</alias-all>
+        </alias-all>
         <alias-all entity-alias="PSD"/>
         <alias-all entity-alias="PG">
-        	    <exclude field="comments"/>
-        	</alias-all>
+            <exclude field="comments"/>
+        </alias-all>
         <alias-all entity-alias="PR">
             <exclude field="comments"/>
-        	    <exclude field="statusId"/>
+            <exclude field="statusId"/>
         </alias-all>
         <alias entity-alias="PR" name="relationshipStatusId" field="statusId"/>
         <view-link entity-alias="PR" rel-entity-alias="P">

Author: hans
Date: 2006-10-02 07:41:02 -0700 (Mon, 02 Oct 2006)
New Revision: 278

Added:
   versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
   versions/1.0/branches/emailPayment/servicedef/services_paymentMethods.xml
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/common/PaymentMethodServices.java
   versions/1.0/branches/emailPayment/webapp/crmsfa/accounts/submenus/viewPaymentMethods.ftl
   versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl
Modified:
   versions/1.0/branches/emailPayment/servicedef/services_activities.xml
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml
Log:
missing files and fixes

Added: versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
===================================================================
--- versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml	2006-10-02 14:41:02 UTC (rev 278)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Copyright (C) 2006  Open Source Strategies, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA-->
+<!-- 
+@author     Leon Torres (leon@...)
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../ofbiz/framework/minilang/dtd/simple-methods.xsd">
+    
+    <simple-method method-name="closeEmailTask" short-description="close a task and all its dependent commmunication events">
+        
+        <entity-and entity-name="WorkEffortCommunicationEventView" list-name="commEvents">
+            <field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
+        </entity-and>
+        
+        <!-- change all the status of the communication events to completed -->
+        <iterate entry-name="communicationEvent" list-name="commEvents">
+            <if-compare field-name="communicationEvent.statusId" value="COM_ENTERED" operator="equals">
+                <set field="inMap.communicationEventId" from-field="communicationEvent.communicationEventId"/>
+                <set field="inMap.statusId" value="COM_PENDING"/>
+                <call-service service-name="updateCommunicationEvent" in-map-name="inMap"/>
+                <set field="communicationEvent.statusId" value="COM_PENDING"/>
+            </if-compare>
+            <if-compare field-name="communicationEvent.statusId" value="COM_PENDING" operator="equals">
+                <set field="inMap.communicationEventId" from-field="communicationEvent.communicationEventId"/>
+                <set field="inMap.statusId" value="COM_COMPLETE"/>
+                <call-service service-name="updateCommunicationEvent" in-map-name="inMap"/>
+            </if-compare>
+        </iterate>
+        
+        <!-- change the status of the workeffort to completed -->
+        <set field="inWf.workEffortId" from-field="parameters.workEffortId"/>
+        <set field="inWf.currentStatusId" value="TASK_STARTED"/>
+        <call-service service-name="updateWorkEffort" in-map-name="inWf"/>
+        <set field="inWf.currentStatusId" value="TASK_COMPLETED"/>
+        <now-timestamp-to-env env-name="inWf.actualCompletionDate"/>
+        <call-service service-name="updateWorkEffort" in-map-name="inWf"/>
+        
+    </simple-method>
+    
+    <simple-method method-name="allocateMsgToParty" short-description="Allocate an email to a party, update the communication accordingly and connect to a new WorkEffort">
+
+        <if-empty field-name="parameters.partyId">
+            <set field="newParty.firstName" value="Not"/>
+            <set field="newParty.lastName" value="Known"/>
+            <set field="newParty.companyName" value="Unknown"/>
+            <call-service service-name="crmsfa.createLead" in-map-name="newParty">
+                <result-to-field result-name="partyId" field-name="parameters.partyId"/>
+            </call-service>
+            <set field="successMessage" value="Party ${parameters.partyId} created and ${parameters.emailAddress} assigned"/>
+            <else>
+                <set field="successMessage" value="${parameters.emailAddress allocated to party: ${parameters.partyId}"/>
+            </else>
+        </if-empty>
+
+        <!-- add the email address to the party -->
+        <set-service-fields service-name="createPartyEmailAddress" map-name="parameters" to-map-name="newEmail"/>
+        <set field="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
+        <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
+            <result-to-field result-name="contactMechId" field-name="contactMechId"/>
+        </call-service>
+        
+        <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+
+        <!-- find the to party again if missing -->
+        <if-empty field-name="communicationEvent.partyIdTo">
+            <set field="contactInput.address" value="."/>        
+            <call-bsh><![CDATA[
+                int start = communicationEvent.getString("note").indexOf("Sent from: ") + 11;
+                int end = communicationEvent.getString("note").indexOf(";",start);
+                if (end > start) contactInput.put("address", communicationEvent.getString("note").substring(start,end));
+                ]]>
+            </call-bsh>
+            <call-service service-name="findPartyFromEmailAddress" in-map-name="contactInput">
+                <result-to-field result-name="partyId" field-name="inCom.partyIdTo"/>
+                <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdTo"/>
+            </call-service>
+            <set field="communicationEvent.partyIdTo" from-field="inCom.partyIdTo"/>
+        </if-empty>
+        
+        <!-- update the communication event -->
+        <set field="inCom.communicationEventId" from-field="parameters.communicationEventId"/>
+        <if-not-empty field-name="communicationEvent.partyIdTo">
+            <set field="inCom.statusId" value="COM_ENTERED"/>
+        </if-not-empty>
+        <set field="inCom.partyIdFrom" from-field="parameters.partyId"/>
+        <set field="inCom.contactMechIdFrom" from-field="contactMechId"/>
+        <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
+        
+        
+        <!-- reprocess the create updated communicationEvent -->
+        <if-not-empty field-name="communicationEvent.partyIdTo">
+            <set field="input.communicationEventId" from-field="parameters.communicationEventId"/>
+            <call-service service-name="crmsfa.reProcessIncomingEmail" in-map-name="input"/>
+        </if-not-empty>
+        
+        <field-to-result field-name="parameters.communicationEventId" result-name="communicationEventId"/>
+    </simple-method>
+</simple-methods>


Property changes on: versions/1.0/branches/emailPayment/script/com/opensourcestrategies/crmsfa/ActivitiesServices.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: versions/1.0/branches/emailPayment/servicedef/services_activities.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-02 14:41:02 UTC (rev 278)
@@ -209,10 +209,10 @@
     
     <service name="allocateMsgToParty" engine="simple" 
         location="com/opensourcestrategies/crmsfa/ActivitiesServices.xml" invoke="allocateMsgToParty" auth="true">
-        <description>Allocate an email to a party, update the communication accordingly and connect to a new WorkEffort</description>
+        <description>If party empty, create a 'lead',  if exist add email to party, update the communication accordingly and connect to a new WorkEffort</description>
         <attribute name="communicationEventId" type="String" mode="INOUT" optional="false"/>
-        <attribute name="partyId" type="String" mode="IN" optional="false"/>
-        <attribute name="emailAddress" type="String" mode="IN" optional="true"/>
+        <attribute name="partyId" type="String" mode="IN" optional="true"/>
+        <attribute name="emailAddress" type="String" mode="IN" optional="false"/>
     </service>    
     
 </services>

Added: versions/1.0/branches/emailPayment/servicedef/services_paymentMethods.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_paymentMethods.xml	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/servicedef/services_paymentMethods.xml	2006-10-02 14:41:02 UTC (rev 278)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright (C) 2006  Open Source Strategies, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<!--
+ *  Copyright (c) 2001-2005 The Open For Business Project - http://www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
+    <description>CRM SFA Payment Method Services</description>
+    <vendor>Open Source Strategies, Inc.</vendor>
+    <version>0.8</version>
+
+    <service name="crmsfa.addAccountPaymentMethod" engine="java" location="com.opensourcestrategies.crmsfa.common.PaymentMethodServices" invoke="addAccountPaymentMethod">
+        <description>Adds a DataSource to the Account. The userLogin is required to have CRMSFA_ACCOUNT_UPDATE permission on this account.</description>
+        <attribute name="partyId" type="String" mode="IN" optional="false"/>
+        <attribute name="paymentMethodTypeId" type="String" mode="IN" optional="false"/>
+        <attribute name="bankName" type="String" mode="IN" optional="false"/>
+        <attribute name="routingNumber" type="String" mode="IN" optional="false"/>
+        <attribute name="accountNumber" type="String" mode="IN" optional="false"/>
+        <attribute name="nameOnAccount" type="String" mode="IN" optional="true"/>
+    </service>
+
+    <service name="crmsfa.removeAccountPaymentMethod" engine="java" location="com.opensourcestrategies.crmsfa.common.PaymentMethodServices" invoke="removeAccountPaymentMethod">
+        <description>Removes a DataSource from the Account. The userLogin is required to have CRMSFA_ACCOUNT_UPDATE permission on this account.</description>
+        <attribute name="partyId" type="String" mode="IN" optional="false"/>
+        <attribute name="paymentMethodId" type="String" mode="IN" optional="false"/>
+    </service>
+
+
+</services>
+


Property changes on: versions/1.0/branches/emailPayment/servicedef/services_paymentMethods.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/common/PaymentMethodServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/common/PaymentMethodServices.java	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/common/PaymentMethodServices.java	2006-10-02 14:41:02 UTC (rev 278)
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2006  Open Source Strategies, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+/* Copyright (c) 2005-2006 Open Source Strategies, Inc. */
+
+/*
+ *  Copyright (c) 2001-2005 The Open For Business Project - http://www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.opensourcestrategies.crmsfa.common;
+
+import java.util.Map;
+import java.util.List;
+import java.util.Locale;
+import java.util.Iterator;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.security.Security;
+
+import com.opensourcestrategies.crmsfa.party.PartyHelper;
+import com.opensourcestrategies.crmsfa.security.CrmsfaSecurity;
+import com.opensourcestrategies.crmsfa.util.UtilCommon;
+
+/**
+ * Payment method services. 
+ *
+ * @author     <a href="mailto:h.bakker@... Bakker</a>
+ * @version    $Rev$
+ */
+
+public class PaymentMethodServices {
+
+    public static final String module = PaymentMethodServices.class.getName();
+
+    public static Map addAccountPaymentMethod(DispatchContext dctx, Map context) {
+        return addPaymentMethodWithPermission(dctx, context, "CRMSFA_ACCOUNT", "_UPDATE");
+    }
+
+
+    /**
+     * Parametrized service to add a data source to a party. Pass in the security to check.
+     */
+    private static Map addPaymentMethodWithPermission(DispatchContext dctx, Map context, String module, String operation) {
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Security security = dctx.getSecurity();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+        Locale locale = (Locale) context.get("locale");
+        String partyId = (String) context.get("partyId");
+
+        // check parametrized security
+        if (!CrmsfaSecurity.hasPartyRelationSecurity(security, module, operation, userLogin, partyId)) {
+            return UtilCommon.createAndLogServiceError("CrmErrorPermissionDenied", locale, module);
+        }
+        
+        String paymentMethodTypeId = (String) context.get("paymentMethodTypeId");
+        try {
+            // create the PartyPaymentMethod to relate bankaccounts to this party
+            if (paymentMethodTypeId.equals("EFT_ACCOUNT")) {
+                Map serviceResults = null;                
+                Map accountMap = UtilMisc.toMap("partyId", partyId, "bankName", (String) context.get("bankName"), "routingNumber", 
+                        (String) context.get("routingNumber"), "accountType", "checking");
+                accountMap.put("accountNumber", (String) context.get("accountNumber"));
+                String nameOnAccount = (String) context.get("nameOnAccount");
+                if (nameOnAccount == null || nameOnAccount.length() == 0) {
+                    nameOnAccount = new String(".");
+                }
+                else {
+                    accountMap.put("nameOnAccount", nameOnAccount);
+                }
+                accountMap.put("userLogin", userLogin);
+                serviceResults = dispatcher.runSync("createEftAccount", accountMap);
+                if (ServiceUtil.isError(serviceResults)) {
+                    return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorCreateAccountFail", locale, module);
+                }
+                if (ServiceUtil.isError(serviceResults)) {
+                    return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorAddPaymentMethod", locale, module);
+                }
+            }
+        } catch (GenericServiceException e) {
+            return UtilCommon.createAndLogServiceError(e, "CrmErrorAddPaymentMethod", locale, module);
+        }
+        return ServiceUtil.returnSuccess();
+    }
+
+    public static Map removeAccountPaymentMethod(DispatchContext dctx, Map context) {
+        return removePaymentMethodWithPermission(dctx, context, "CRMSFA_ACCOUNT", "_UPDATE");
+    }
+
+    public static Map removeLeadPaymentMethod(DispatchContext dctx, Map context) {
+        return removePaymentMethodWithPermission(dctx, context, "CRMSFA_LEAD", "_UPDATE");
+    }
+
+    /**
+     * Parametrized method to remove a data source from a party. Pass in the security to check.
+     * TODO: this isn't implemented until necessary
+     */
+    private static Map removePaymentMethodWithPermission(DispatchContext dctx, Map context, String module, String operation) {
+        GenericDelegator delegator = dctx.getDelegator();
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Security security = dctx.getSecurity();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+        Locale locale = (Locale) context.get("locale");
+
+        String partyId = (String) context.get("partyId");
+        String dataSourceId = (String) context.get("dataSourceId");
+
+        // check parametrized security
+        if (!CrmsfaSecurity.hasPartyRelationSecurity(security, module, operation, userLogin, partyId)) {
+            return UtilCommon.createAndLogServiceError("CrmErrorPermissionDenied", locale, module);
+        }
+
+        // don't do anything yet
+        return ServiceUtil.returnSuccess();
+    }
+}


Property changes on: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/common/PaymentMethodServices.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml	2006-10-02 14:41:02 UTC (rev 278)
@@ -874,8 +874,20 @@
         <response name="success" type="request" value="activitiesMain"/>
         <response name="error" type="request" value="activitiesMain"/>
     </request-map>
+    <request-map uri="deleteCommunicationEvent">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteCommunicationEvent"/>
+        <response name="success" type="request" value="myHome"/>
+    </request-map>
     
+    <request-map uri="deletePartyCommunicationEvent">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteCommunicationEvent"/>
+        <response name="success" type="view" value="myHome"/>
+        <response name="success" type="view" value="myHome"/>
+    </request-map>
     
+    
     <!-- ====================== -->
     <!-- Forecasts Request Maps -->
     <!-- ====================== -->

Added: versions/1.0/branches/emailPayment/webapp/crmsfa/accounts/submenus/viewPaymentMethods.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/accounts/submenus/viewPaymentMethods.ftl	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/accounts/submenus/viewPaymentMethods.ftl	2006-10-02 14:41:02 UTC (rev 278)
@@ -0,0 +1,25 @@
+<#--
+ * Copyright (C) 2006  Open Source Strategies, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<#-- Copyright (c) 2005-2006 Open Source Strategies, Inc. -->
+
+<div class="subSectionHeader">
+    <div class="subSectionTitle">${uiLabelMap.CrmEftAccounts}</div>
+    <#if hasUpdatePermission?exists>
+    <div class="subMenuBar"><a class="subMenuButton" href="addAccountPaymentMethodForm?partyId=${parameters.partyId}">${uiLabelMap.CrmCreateNew}</a></div>
+    </#if>
+</div>


Property changes on: versions/1.0/branches/emailPayment/webapp/crmsfa/accounts/submenus/viewPaymentMethods.ftl
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Date Rev Author URL Id"
Name: svn:eol-style
   + native

Added: versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl	2006-10-02 14:41:02 UTC (rev 278)
@@ -0,0 +1,34 @@
+<#--
+ * Copyright (C) 2006  Open Source Strategies, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<#-- Copyright (c) 2005-2006 Open Source Strategies, Inc. -->
+
+<#assign activityTypeLabel = uiLabelMap.CrmEmail>
+
+<div class="subSectionHeader">
+    <div class="subSectionTitle">${activityTypeLabel}</div>
+    <div class="subMenuBar">
+    <#if hasUpdatePermission == true>
+    	<#if workEffort?has_content>
+    	<a class="subMenuButton" href="writeEmail?origCommunicationEventId=${communicationEvent.communicationEventId}&amp;workEffortId=${parameters.workEffortId}&amp;contactMechIdTo=${communicationEvent.contactMechIdFrom}&amp;internalPartyId=${communicationEvent.partyIdFrom}&amp;subject=Re: ${communicationEvent.subject}">Reply Email</a>
+    	<a class="subMenuButton" href="updateCommunicationEventStatus?communicationEventId=${communicationEvent.communicationEventId}${parameters.origCommunicationEventId?if_exists}&amp;statusId=COM_PENDING">Close Email</a>
+    	<a class="subMenuButton" href="closeTask?workEffortId=${parameters.workEffortId}">Close Task</a>
+    	</#if>
+    	<a class="subMenuButton" href="deleteCommunicationEvent?communicationEventId=${communicationEvent.communicationEventId}${parameters.origCommunicationEventId?if_exists}">Delete Email</a>
+   	</div>
+    </#if>
+</div>


Property changes on: versions/1.0/branches/emailPayment/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Date Rev Author URL Id"
Name: svn:eol-style
   + native

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml	2006-10-02 14:41:02 UTC (rev 278)
@@ -119,7 +119,7 @@
             </drop-down>
         </field>
         <field name="  " widget-area-style="formSectionHeader" widget-style="formSectionHeaderTitle"><display description="${uiLabelMap.CrmBankInfo}"/> </field>
-        <field name="paymentMethodTypeId"><hidden value="EFT_ACCOUNT"/>></field>
+        <field name="paymentMethodTypeId"><hidden value="EFT_ACCOUNT"/></field>
         <field name="bankName" position="1"><text/></field>
         <field name="routingNumber" position="2"><text/></field>
         <field name="accountNumber" position="1"><text/></field>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml	2006-10-02 05:06:23 UTC (rev 277)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml	2006-10-02 14:41:02 UTC (rev 278)
@@ -178,10 +178,17 @@
                     </html>
                 </platform-specific>
                 <platform-specific><html><html-template location="component://crmsfa/webapp/crmsfa/activities/viewEmail.ftl"/></html></platform-specific>
-                <container style="form">
-                    <label style="head1" text="Allocate this message to a partytask and add an email address to the Party."/>
-                    <include-form name="allocateMsgToPartyForm" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
-                </container>
+                <section>
+                    <condition>
+                        <if-empty field-name="communicationEvent.partyIdFrom"/>
+                    </condition>
+                    <widgets>
+                        <container style="form">
+                            <label style="head1" text="Allocate this message to a partytask and add an email address to the Party."/>
+                            <include-form name="allocateMsgToPartyForm" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+                        </container>
+                    </widgets>
+                </section>
             </widgets>
         </section>
     </screen>

Author: hans
Date: 2006-10-01 22:06:23 -0700 (Sun, 01 Oct 2006)
New Revision: 277

Modified:
   versions/1.0/branches/emailPayment/build.xml
   versions/1.0/branches/emailPayment/config/CRMSFAUiLabels.properties
   versions/1.0/branches/emailPayment/config/CRMSFAUiLabels_nl.properties
   versions/1.0/branches/emailPayment/config/crmsfa.properties
   versions/1.0/branches/emailPayment/data/CRMSFASecurityData.xml
   versions/1.0/branches/emailPayment/ofbiz-component.xml
   versions/1.0/branches/emailPayment/servicedef/services_accounts.xml
   versions/1.0/branches/emailPayment/servicedef/services_activities.xml
   versions/1.0/branches/emailPayment/servicedef/smcas.xml
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/leads/LeadsServices.java
   versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyServices.java
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewActivity.bsh
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewEmail.bsh
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/writeEmail.bsh
   versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml
   versions/1.0/branches/emailPayment/webapp/crmsfa/activities/viewEmail.ftl
   versions/1.0/branches/emailPayment/webapp/crmsfa/activities/writeEmail.ftl
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/forms/common/CommonForms.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/screens/accounts/AccountsScreens.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/CommonScreens.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/ContactScreens.xml
   versions/1.0/branches/emailPayment/widget/crmsfa/screens/myhome/MyHomeScreens.xml
Log:
added firtst version of payment methods and email functionality

Modified: versions/1.0/branches/emailPayment/build.xml
===================================================================
--- versions/1.0/branches/emailPayment/build.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/build.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -61,7 +61,7 @@
          The default setting would work if you have checked out the financials module into your ofbiz/hot-deploy/ directory.
          It would NOT work if you checked it out somewhere else and symlinked to it in your hot-deploy/ directory.
          If you experience build problems, put the full path here -->
-        <property name="ofbiz.dir" value="../../"/> 
+        <property name="ofbiz.dir" value="/home/hans/ofbiz/"/> 
     </target>
 
     <target name="classpath">

Modified: versions/1.0/branches/emailPayment/config/CRMSFAUiLabels.properties
===================================================================
--- versions/1.0/branches/emailPayment/config/CRMSFAUiLabels.properties	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/config/CRMSFAUiLabels.properties	2006-10-02 05:06:23 UTC (rev 277)
@@ -40,6 +40,7 @@
 CrmAssignTeam = Assign Team
 CrmAvailability = Availability
 CrmAvailableToAdd = Available to Add
+CrmBankInfo=Bank Account information
 CrmCase = Case
 CrmCaseClosed = Case Closed
 CrmCaseHistory = Case History
@@ -81,6 +82,7 @@
 CrmCreateOpportunity = Create Opportunity
 CrmCreateOrder = Create Order
 CrmCreatePhoneNumber = Create Phone Number
+CrmCreatePaymentMethod = Create Payment Method
 CrmCreateQuote = Create Quote
 CrmCreateTask = Create Task
 CrmCreateWebUrl = Create Web Url
@@ -91,7 +93,9 @@
 CrmDepartment = Department
 CrmDuplicateLead = Duplicate Lead
 CrmDuration = Duration
+CrmEftAccounts=Bank Accounts
 CrmEmailAttachments = Attachments
+CrmEmail = Email
 CrmEmailParty = Email for
 CrmErrorAddContactToOpportunity = Could not add contact to opportunity: 
 CrmErrorAddMarketingCampaign = Failed to add marketing campaign:
@@ -258,6 +262,7 @@
 CrmOwnership = Ownership
 CrmParentParty = Parent Account
 CrmPartners = Partners
+CrmPaymentMethod=Payment Method
 CrmPendingActivities = Pending Activities
 CrmPeriod = Period
 CrmPersonResponsibleFor = Person Responsible For
@@ -319,6 +324,7 @@
 CrmViewCase = View Case
 CrmViewContactList = View Contact List
 CrmViewContact = View Contact
+CrmViewEmail=View Email
 CrmViewEvent = Event Details
 CrmViewForecast = Forecast Details
 CrmViewForecasts = View Forecasts

Modified: versions/1.0/branches/emailPayment/config/CRMSFAUiLabels_nl.properties
===================================================================
--- versions/1.0/branches/emailPayment/config/CRMSFAUiLabels_nl.properties	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/config/CRMSFAUiLabels_nl.properties	2006-10-02 05:06:23 UTC (rev 277)
@@ -32,6 +32,7 @@
 CrmAssign = Wijs toe
 CrmAssignTeam = Wijstoe aan team
 CrmAvailability = Beschikbaarheid
+CrmBankInfo=Bank Rekening Informatie
 CrmCase = Aanvraag
 CrmCaseClosed = Aanvraag afgesloten
 CrmCaseHistory = Aanvraag geschiedenis
@@ -66,6 +67,7 @@
 CrmCreateNote = Nieuwe Opmerking
 CrmCreateOpportunity = Nieuwe kans
 CrmCreatePhoneNumber = Nieuw Telefoonnummer
+CrmCreatePaymentMethod = Nieuwe Bankrekening
 CrmCreateTask = Nieuwe Taak
 CrmCreateWebUrl = Nieuwe internet url
 CrmDataSource = Bron
@@ -75,8 +77,10 @@
 CrmDepartment = Afdeling
 CrmDuplicateLead = Lead dupliceren
 CrmDuration = Tijdsduur
+CrmEftAccounts=Bank Rekeningen
 CrmEmailAttachments = Aanhangsel
-CrmEmailParty = Partiij geassocieerd met de email
+CrmEmail = Email
+CrmEmailParty = Van partij
 CrmErrorAddContactToOpportunity = on de contactpersoon niet aan de kans toevoegen: 
 CrmErrorAddQuoteFail = Offerte toevoegen mislukt
 CrmErrorAlreadyMember = Deze persoon is reeds lid van dit team.
@@ -222,7 +226,8 @@
 CrmOwnership = Eigendom van
 CrmParentParty = Moeder Account
 CrmPartners = Partners
-CrmPendingActivities = Afhankelijke Activiteiten
+CrmPaymentMethod=Betaal Methode
+CrmPendingActivities = Openstaande Activiteiten
 CrmPeriod = Periode
 CrmPersonResponsibleFor = Verantwoordellijke persoon voor:
 CrmPhoneAskForName = Persoon om naar te vragen
@@ -278,7 +283,8 @@
 CrmViewAsContact = Bekijk als Contactpersoon
 CrmViewCase = Bekijk Aanvraag
 CrmViewContact = Bekijk Contactpersoon
-CrmViewEvent = Detailinformatie gebeurtenis
+CrmViewEvent =Gebeurtenis Detailinformatie
+CrmViewEmail=Email Informatie
 CrmViewForecast = Toekomstverwachting detail informatie
 CrmViewForecasts = Bekijk toekomstverwachting
 CrmViewLead = Bekijk Lead

Modified: versions/1.0/branches/emailPayment/config/crmsfa.properties
===================================================================
--- versions/1.0/branches/emailPayment/config/crmsfa.properties	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/config/crmsfa.properties	2006-10-02 05:06:23 UTC (rev 277)
@@ -61,6 +61,8 @@
 crmsfa.calendar.endHour = 18
 # default pagination size (number of items to list for all lists)
 crmsfa.pagination.size.default = 20
+# prefix in the subjectline to identify the workEffortId
+crmsfa.workEffortPrefix=OFB#
 
 ##
 ## Themes

Modified: versions/1.0/branches/emailPayment/data/CRMSFASecurityData.xml
===================================================================
--- versions/1.0/branches/emailPayment/data/CRMSFASecurityData.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/data/CRMSFASecurityData.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -71,7 +71,10 @@
     <SecurityPermission description="Create a forecast" permissionId="CRMSFA_4C_CREATE"/>
     <SecurityPermission description="Update a forecast" permissionId="CRMSFA_4C_UPDATE"/>
     <SecurityPermission description="View all forecasts" permissionId="CRMSFA_4C_VIEWALL"/>
-
+    
+    <SecurityPermission description="Create a paymentMethod" permissionId="CRMSFA_PM_VIEW"/>
+    <SecurityPermission description="Update a paymentMethod" permissionId="CRMSFA_PM_UPDATE"/>
+    
     <SecurityPermission description="Access to the Quotes function of the application." permissionId="CRMSFA_QUOTES_VIEW"/>
     <SecurityPermission description="View any Quote." permissionId="CRMSFA_QUOTE_VIEW"/>
     <SecurityPermission description="Create a new Quote." permissionId="CRMSFA_QUOTE_CREATE"/>    
@@ -174,6 +177,10 @@
     <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="MARKETING_CREATE"/> <!-- is this a bit redundant after all? -->
     <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="MARKETING_UPDATE"/> <!-- is this a bit redundant after all? -->
 
+    <!-- the payment view/update are given to the sale manager -->
+    <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="ORDERMGR_PM_VIEW"/>
+    <SecurityGroupPermission groupId="SALES_MANAGER" permissionId="ORDERMGR_PM_UPDATE"/>
+    
     <!-- A sales rep has the ability to view and update accounts, contacts, and leads but does not have the ability 
         to manage team members or deactivate accounts.  Only in the context of relationship to their accounts do they
         have such permissions, as defined in PatyRelationship.securityGroupId -->

Modified: versions/1.0/branches/emailPayment/ofbiz-component.xml
===================================================================
--- versions/1.0/branches/emailPayment/ofbiz-component.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/ofbiz-component.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -58,6 +58,7 @@
     <service-resource type="model" loader="main" location="servicedef/services_party.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_notes.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_datasources.xml"/>
+    <service-resource type="model" loader="main" location="servicedef/services_paymentMethods.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_marketing.xml"/>
 
     <!-- eca service chain files -->

Modified: versions/1.0/branches/emailPayment/servicedef/services_accounts.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_accounts.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/servicedef/services_accounts.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -69,6 +69,10 @@
         <attribute name="initialTeamPartyId" type="String" mode="IN" optional="true"/>
         <attribute name="partyId" type="String" mode="OUT" optional="false"/>
         <attribute name="dataSourceId" type="String" mode="IN" optional="true"/> <!-- initial data source -->
+        <attribute name="bankName" type="String" mode="IN" optional="true"/> <!-- initial data source -->
+        <attribute name="routingNumber" type="String" mode="IN" optional="true"/> <!-- initial data source -->
+        <attribute name="accountNumber" type="String" mode="IN" optional="true"/> <!-- initial data source -->
+        <attribute name="nameOnAccount" type="String" mode="IN" optional="true"/> <!-- initial data source -->
         <attribute name="marketingCampaignId" type="String" mode="IN" optional="true"/> <!-- initial marketing campaign -->
     </service>
 

Modified: versions/1.0/branches/emailPayment/servicedef/services_activities.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/servicedef/services_activities.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -59,6 +59,7 @@
         <!-- saved emails can be sent/saved by passing in these parameters -->
         <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
         <attribute name="workEffortId" type="String" mode="IN" optional="true"/>
+        <attribute name="origCommunicationEventId" type="String" mode="IN" optional="true"/><!-- for a reply -->
     </service>
 
     <service name="crmsfa.activityAssociationInterface" engine="interface" location="" invoke="">
@@ -189,12 +190,30 @@
         <attribute name="messageWrapper" type="org.ofbiz.service.mail.MimeMessageWrapper" mode="IN"/>
     </service>
     
+    <service name="crmsfa.reProcessIncomingEmail" engine="java" location="com.opensourcestrategies.crmsfa.activities.ActivitiesServices" invoke="reProcessIncomingEmail">
+        <description>Reprocesses incoming emails which were the email address was added to the party and the fields on the communicationEvent were adjusted.</description>
+        <attribute name="communicationEventId" type="String" mode="IN" optional="false"/>
+    </service>
+    
     <service name="crmsfa.updateActivityCommEvent" engine="java" location="com.opensourcestrategies.crmsfa.activities.ActivitiesServices" invoke="updateActivityCommEvent">
         <description>Updates the status of the CommunicationEvents associated with a WorkEffort. 
             If WorkEffort status is started then change the status of related CommunicationEvents from entered to pending. 
             If WorkEffort status is completed then change the status of related CommunicationEvents from pending to completed.</description>
         <attribute name="workEffortId" type="String" mode="IN" optional="false"/>
     </service>
-
+    <service name="closeEmailTask" engine="simple" 
+        location="com/opensourcestrategies/crmsfa/ActivitiesServices.xml" invoke="closeEmailTask" auth="true">
+        <description>Close a task and its dependent emails</description>
+        <attribute name="workEffortId" type="String" mode="IN" optional="false"/>
+    </service>    
+    
+    <service name="allocateMsgToParty" engine="simple" 
+        location="com/opensourcestrategies/crmsfa/ActivitiesServices.xml" invoke="allocateMsgToParty" auth="true">
+        <description>Allocate an email to a party, update the communication accordingly and connect to a new WorkEffort</description>
+        <attribute name="communicationEventId" type="String" mode="INOUT" optional="false"/>
+        <attribute name="partyId" type="String" mode="IN" optional="false"/>
+        <attribute name="emailAddress" type="String" mode="IN" optional="true"/>
+    </service>    
+    
 </services>
 

Modified: versions/1.0/branches/emailPayment/servicedef/smcas.xml
===================================================================
--- versions/1.0/branches/emailPayment/servicedef/smcas.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/servicedef/smcas.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -44,7 +44,7 @@
     <mca mail-rule-name="processIncomingEmail">
         <!-- the matching is a regular expression match against the email address.  this format seems to work for
         both "xyz@..." and "Mr. XYZ <xyz@...>" -->
-        <condition-field field-name="to" operator="matches" value=".*@opentaps.org>*"/>
+        <condition-field field-name="to" operator="matches" value=".*@a-net.nl>*"/>
         <action service="crmsfa.processIncomingEmail" mode="sync"/>
     </mca>
 </service-mca>

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/accounts/AccountsServices.java	2006-10-02 05:06:23 UTC (rev 277)
@@ -92,7 +92,7 @@
         try {
             // create the Party and PartyGroup, which results in a partyId
             Map input = UtilMisc.toMap("groupName", context.get("groupName"), "groupNameLocal", context.get("groupNameLocal"), 
-                    "officeSiteName", context.get("officeSiteName"), "description", context.get("description"));
+                    "officeSiteName", context.get("officeSiteName"), "description", context.get("description"),"userLogin",context.get("userLogin"));
             Map serviceResults = dispatcher.runSync("createPartyGroup", input);
             if (ServiceUtil.isError(serviceResults)) {
                 return serviceResults;
@@ -132,6 +132,27 @@
                     return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorCreateAccountFail", locale, module);
                 }
             }
+            
+            // add the eft account if provided
+            String accountNumber = (String) context.get("accountNumber");
+            if(accountNumber != null && accountNumber.length() > 0) {    // minimum is provided
+                Map accountMap = UtilMisc.toMap("partyId", accountPartyId, "bankName", (String) context.get("bankName"), 
+                        "routingNumber", (String) context.get("routingNumber"), "accountType", "checking");
+                accountMap.put("accountNumber", (String) context.get("accountNumber"));
+                String nameOnAccount = (String) context.get("nameOnAccount");
+                if (nameOnAccount == null || nameOnAccount.length() == 0) {
+                    nameOnAccount = new String(".");
+                }
+                else {
+                    accountMap.put("nameOnAccount", nameOnAccount);
+                }
+                accountMap.put("userLogin", userLogin);
+                serviceResults = dispatcher.runSync("createEftAccount", accountMap);
+                if (ServiceUtil.isError(serviceResults)) {
+                    return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorCreateAccountFail", locale, module);
+                }
+            }
+            
  
             // if there's an initialTeamPartyId, assign the team to the account
             String initialTeamPartyId = (String) context.get("initialTeamPartyId");

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/activities/ActivitiesServices.java	2006-10-02 05:06:23 UTC (rev 277)
@@ -108,16 +108,18 @@
         Security security = dctx.getSecurity();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
+        String workEffortPrefix = (String) org.ofbiz.base.util.UtilProperties.getProperties("crmsfa.properties").get("crmsfa.workEffortPrefix");
 
         // use the toEmail and internalPartyId to find the contactMechIdTo
         String toEmail = (String) context.get("toEmail");
         String internalPartyId = (String) context.get("internalPartyId");
 
-        // if the email exists already, these will be set
+        // if the email exists already or a reply, these will be set
         String communicationEventId = (String) context.get("communicationEventId");
+        boolean existing = ((communicationEventId == null) || communicationEventId.equals("") ? false : true);
+        String origCommunicationEventId = (String) context.get("origCommunicationEventId");
+        boolean reply = ((origCommunicationEventId == null) || origCommunicationEventId.equals("") ? false : true);
         String workEffortId = (String) context.get("workEffortId");
-        boolean existing = ((communicationEventId == null) || communicationEventId.equals("") ? false : true);
-
         try {
             // validate the associations
             Map serviceResults = validateWorkEffortAssociations(dctx, context);
@@ -161,6 +163,7 @@
             input.put("roleTypeIdTo", roleTypeIdTo);
             input.put("partyIdFrom", userLogin.getString("partyId"));
             input.put("roleTypeIdFrom", PartyHelper.getFirstValidRoleTypeId(userLogin.getString("partyId"), PartyHelper.TEAM_MEMBER_ROLES, delegator));
+            String subject = (String) input.get("subject");
             serviceResults = dispatcher.runSync(serviceName, input);
             if (ServiceUtil.isError(serviceResults)) {
                 return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
@@ -170,42 +173,60 @@
             if (!existing) communicationEventId = (String) serviceResults.get("communicationEventId");
 
             if (sending) {
+                // now update or create a work effort to record this email as a started task, can be completed manual if email discussion finshed
+                input = UtilMisc.toMap("workEffortTypeId", "TASK", "currentStatusId", "TASK_STARTED", "userLogin", userLogin);
+                if (existing || reply) input.put("workEffortId", workEffortId);
+                input.put("actualStartDate", context.get("datetimeStarted"));
+                if (!reply) input.put("workEffortName", context.get("subject")); // do not overwrite subject if a reply
+                input.put("workEffortPurposeTypeId", "WEPT_TASK_EMAIL");
+                serviceName = (existing || reply ? "updateWorkEffort" : "createWorkEffort");
+                serviceResults = dispatcher.runSync(serviceName, input);
+                if (ServiceUtil.isError(serviceResults)) {
+                    return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
+                }
                 // Update communication event to status IN_PROGRESS: this causes it to be sent by OFBiz synchronously
+                if (!existing && !reply) workEffortId = (String) serviceResults.get("workEffortId");
                 input = UtilMisc.toMap("communicationEventId", communicationEventId, "statusId", "COM_IN_PROGRESS", "userLogin", userLogin);
                 input.put("communicationEventTypeId", "EMAIL_COMMUNICATION"); // this also needs to be specified to force the ECA that sends email to pass its conditions
                 input.put("datetimeEnded", UtilDateTime.nowTimestamp());
-                serviceResults = dispatcher.runSync("updateCommunicationEvent", input);
-                if (ServiceUtil.isError(serviceResults)) {
-                    return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
+                
+                // update subject field of new commucationEvent
+                if(subject.indexOf(workEffortPrefix.concat("NotFound")) > -1) { // remove not found string in subject
+                    int start = subject.indexOf(workEffortPrefix.concat("NotFound"));
+                    int end = subject.indexOf(workEffortPrefix.concat("NotFound") + workEffortPrefix.concat("NotFound").length()); 
+                    subject = subject.substring(0,start).concat(subject.substring(end, subject.length()));
                 }
+                if(subject.indexOf(workEffortPrefix) == -1) subject = workEffortPrefix.concat(workEffortId.toString()).concat(" ").concat(subject);
+                input.put("subject", subject);
 
-                // now update or create a work effort to record this email as a completed task
-                input = UtilMisc.toMap("workEffortTypeId", "TASK", "currentStatusId", "TASK_COMPLETED", "userLogin", userLogin);
-                if (existing) input.put("workEffortId", workEffortId);
-                input.put("actualStartDate", context.get("datetimeStarted"));
-                input.put("actualCompletionDate", UtilDateTime.nowTimestamp());
-                input.put("workEffortName", context.get("subject"));
-                input.put("workEffortPurposeTypeId", "WEPT_TASK_EMAIL");
-                serviceName = (existing ? "updateWorkEffort" : "createWorkEffort");
-                serviceResults = dispatcher.runSync(serviceName, input);
+                serviceResults = dispatcher.runSync("updateCommunicationEvent", input);
                 if (ServiceUtil.isError(serviceResults)) {
                     return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
                 }
+                // change the status of the original communicationEvent so that it will not show on the outstanding emaillist anymore
+                if (reply) {
+                    serviceResults = dispatcher.runSync("updateCommunicationEvent", 
+                            UtilMisc.toMap("communicationEventId", origCommunicationEventId, "statusId", "COM_COMPLETE", 
+                                    "datetimeEnded", UtilDateTime.nowTimestamp() ,"userLogin", userLogin));
+                    if (ServiceUtil.isError(serviceResults)) {
+                        return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
+                    }
+                }
             } else {
                 // Create or update a scheduled (TASK_STARTED) TASK WorkEffort to save this email
                 input = UtilMisc.toMap("workEffortTypeId", "TASK", "currentStatusId", "TASK_STARTED", "userLogin", userLogin);
-                if (existing) input.put("workEffortId", workEffortId);
+                if (existing || reply) input.put("workEffortId", workEffortId);
                 input.put("actualStartDate", context.get("datetimeStarted"));
-                input.put("workEffortName", context.get("subject"));
+                if (!reply) input.put("workEffortName", context.get("subject")); // do not overwrite subject if a reply
                 input.put("workEffortPurposeTypeId", "WEPT_TASK_EMAIL");
-                serviceResults = dispatcher.runSync(existing ? "updateWorkEffort" : "createWorkEffort", input);
+                serviceResults = dispatcher.runSync(existing || reply ? "updateWorkEffort" : "createWorkEffort", input);
                 if (ServiceUtil.isError(serviceResults)) {
                     return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
                 }
+                // get the work effort ID from the serviceResults if a workEffort was created 
+                if (!existing && !reply) workEffortId = (String) serviceResults.get("workEffortId");
             }
 
-            // get the work effort ID from the serviceResults if a workEffort was created (note that the last service run in this case is always createWorkEffort)
-            if (!existing) workEffortId = (String) serviceResults.get("workEffortId");
 
             // create an association between the task and comm event (safe even if existing)
             input = UtilMisc.toMap("userLogin", userLogin, "communicationEventId", communicationEventId, "workEffortId", workEffortId);
@@ -213,14 +234,15 @@
             if (ServiceUtil.isError(serviceResults)) {
                 return UtilCommon.createAndLogServiceError(serviceResults, errorLabel, locale, module);
             }
-
+            
             // we need to zap all associations now if there are any previously saved ones
             if (existing) {
                 UtilActivity.removeAllAssociationsForWorkEffort(workEffortId, delegator);
             }
 
             // create the associations and finish
-            return createWorkEffortPartyAssociations(dctx, context, workEffortId, errorLabel, !existing);
+            if (!existing && !reply) return createWorkEffortPartyAssociations(dctx, context, workEffortId, errorLabel, !existing);
+            else return ServiceUtil.returnSuccess();
 
         } catch (GenericEntityException e) {
             return UtilCommon.createAndLogServiceError(e, errorLabel, locale, module);
@@ -233,7 +255,12 @@
      * If the party is a member of the team, then Creates a Work Effort, associates it with the Communication Event, 
      * and assigns it to the Party with Work Effort 
      */
-    private static void associateCommunicationEventWorkEffortAndParty(String partyIdTo, GenericValue communicationEvent, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, Locale locale, DispatchContext dctx, Map context) 
+    private static void associateCommunicationEventWorkEffortAndParty(String partyIdTo, GenericValue communicationEvent, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, Locale locale, DispatchContext dctx, Map context)
+        throws GenericEntityException, GenericServiceException {
+        associateCommunicationEventWorkEffortAndParty(null, partyIdTo, communicationEvent, delegator, dispatcher, userLogin, locale,  dctx, context);
+    }
+
+    private static void associateCommunicationEventWorkEffortAndParty(String workEffortId, String partyIdTo, GenericValue communicationEvent, GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, Locale locale, DispatchContext dctx, Map context) 
                    throws GenericEntityException, GenericServiceException {
         // create an association between the WorkEffort and the CommunicationEvent using the partyIdTo field provided
         // partyIdTo is not null and the party has a CRM/SFA team member role (ie, is a CRM/SFA user)
@@ -245,22 +272,24 @@
                 Map input = null;
                 String communicationEventId = communicationEvent.getString("communicationEventId");
                 
-                //Create Workeffort from CommunicationEvent with task status as scheduled (TASK_SCHEDULED) instead of complete (TASK_COMPLETED)
-                //so that it shows up in Pending Activities rather than Activities History
-                input = UtilMisc.toMap("workEffortTypeId", "TASK", "currentStatusId", "TASK_SCHEDULED", "userLogin", userLogin);
-                input.put("actualStartDate", communicationEvent.getTimestamp("datetimeStarted"));
-                input.put("actualCompletionDate", communicationEvent.getTimestamp("datetimeEnded"));
-                input.put("workEffortName", communicationEvent.getString("subject"));
-                input.put("workEffortPurposeTypeId", "WEPT_TASK_EMAIL");
-                serviceResults = dispatcher.runSync("createWorkEffort", input);
-                if (ServiceUtil.isError(serviceResults)) {
-                    Debug.logError(ServiceUtil.getErrorMessage(serviceResults), module);
-                    throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));
+                if(workEffortId == null) {
+                    //Create Workeffort from CommunicationEvent with task status as scheduled (TASK_SCHEDULED) instead of complete (TASK_COMPLETED)
+                    //so that it shows up in Pending Activities rather than Activities History
+                    if (userLogin.getString("userLoginId").equals("system")) userLogin.set("partyId", partyIdTo); // to allow prefixing the workeffortId in the sharedOfbiz system
+                    input = UtilMisc.toMap("workEffortTypeId", "TASK", "currentStatusId", "TASK_SCHEDULED", "userLogin", userLogin);
+                    input.put("actualStartDate", communicationEvent.getTimestamp("datetimeStarted"));
+                    input.put("actualCompletionDate", communicationEvent.getTimestamp("datetimeEnded"));
+                    input.put("workEffortName", communicationEvent.getString("subject"));
+                    input.put("workEffortPurposeTypeId", "WEPT_TASK_EMAIL");
+                    serviceResults = dispatcher.runSync("createWorkEffort", input);
+                    if (ServiceUtil.isError(serviceResults)) {
+                        Debug.logError(ServiceUtil.getErrorMessage(serviceResults), module);
+                        throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));
+                    }
+                    //get the work effort ID from the serviceResults
+                    workEffortId = (String) serviceResults.get("workEffortId");
                 }
                 
-                //get the work effort ID from the serviceResults
-                String workEffortId = (String) serviceResults.get("workEffortId");
-                
                 //create an association between the task and comm event
                 input = UtilMisc.toMap("userLogin", userLogin, "communicationEventId", communicationEventId, "workEffortId", workEffortId);
                 serviceResults = dispatcher.runSync("createCommunicationEventWorkEff", input);
@@ -283,8 +312,16 @@
             }
         }
     }
-    
+
     /**
+     * Reprocesses incoming emails which were the email address was added to the party and the fields on the communicationEvent were adjusted. 
+     */
+    public static Map reProcessIncomingEmail(DispatchContext dctx, Map context) {
+        context.put("reProcess", "Y");
+        return processIncomingEmail(dctx, context);
+    }
+
+    /**
      * Calls the storeIncomingEmail service to process incoming emails 
      */
     public static Map processIncomingEmail(DispatchContext dctx, Map context) {
@@ -292,37 +329,73 @@
         LocalDispatcher dispatcher = dctx.getDispatcher();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
-        MimeMessageWrapper wrapper = (MimeMessageWrapper) context.get("messageWrapper");
+        String workEffortPrefix = (String) org.ofbiz.base.util.UtilProperties.getProperties("crmsfa.properties").get("crmsfa.workEffortPrefix");
+        String communicationEventId = (String) context.get("communicationEventId");
+        String reProcessStr = (String) context.get("reProcess");
+        boolean reProcess = ((reProcessStr == null) || reProcessStr.equals("") ? false : true);
         Map serviceResults = null; 
-        Map input = null;
         try {
-            //Call storeIncomingEmail service
-        	input = UtilMisc.toMap("messageWrapper", wrapper, "userLogin", userLogin);        
-			serviceResults = dispatcher.runSync("storeIncomingEmail", input);
-			if (ServiceUtil.isError(serviceResults)) {
-	            return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorProcessIncomingEmailFail", locale, module);
-	        }
-			
-			//Get communicationEventId
-			String communicationEventId = (String) serviceResults.get("communicationEventId");
-			
-			//Find CommunicationEvent from its Id
+            if(!reProcess) {
+                MimeMessageWrapper wrapper = (MimeMessageWrapper) context.get("messageWrapper");
+                Map input = null;
+                //Call storeIncomingEmail service
+                input = UtilMisc.toMap("messageWrapper", wrapper, "userLogin", userLogin);
+                serviceResults = dispatcher.runSync("storeIncomingEmail", input);
+                if (ServiceUtil.isError(serviceResults)) {
+                    return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorProcessIncomingEmailFail", locale, module);
+                }
+                
+                //Get communicationEventId
+                communicationEventId = (String) serviceResults.get("communicationEventId");
+                if (communicationEventId == null) return ServiceUtil.returnSuccess( (String) serviceResults.get("successMessage")); // no emailMessage stored by storeIncomingMail service
+            }
+
+            //Find CommunicationEvent from its Id
 			GenericValue communicationEvent = delegator.findByPrimaryKey("CommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId));
-            
-            String partyIdTo = communicationEvent.getString("partyIdTo");
-            
-            //Associate partyIdTo of CommunicationEvent
-            associateCommunicationEventWorkEffortAndParty(partyIdTo, communicationEvent, delegator, dispatcher, userLogin, locale, dctx, context);
 			
-			//Associate partyIds of CommunicationEventRoles associated with the CommunicationEvent
-            List commEventRoles = delegator.findByAnd("CommunicationEventRole", UtilMisc.toMap("communicationEventId", communicationEventId));
-            Iterator itr = commEventRoles.iterator();
-            
-            while (itr.hasNext()) {
-                GenericValue commEventRole = (GenericValue) itr.next();
-                
-                associateCommunicationEventWorkEffortAndParty(commEventRole.getString("partyId"), communicationEvent, delegator, dispatcher, userLogin, locale, dctx, context);
+			// only process commucation events where the communicationeventid properly entered
+			if (!communicationEvent.getString("statusId").equals("COM_ENTERED")) {
+                Debug.logInfo("Incoming email with unknown party, no task created, but email entered in the communicationEvent table",module);
+                return ServiceUtil.returnSuccess();
             }
+            else {
+			    String partyIdTo = communicationEvent.getString("partyIdTo");
+			    
+			    //check if there is a workeffort number in the subject of the communication event and see if it is valid.
+			    String subject = (String) communicationEvent.getString("subject");
+			    String workEffortId = null;
+			    if(subject.indexOf(workEffortPrefix) != -1) {
+			        int start = subject.indexOf(workEffortPrefix) + workEffortPrefix.length();
+			        int end = subject.indexOf(" ", start);
+			        workEffortId = subject.substring(start, end);
+			        GenericValue workEffort = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
+			        if (workEffort == null) {
+			            workEffortId = null;  // make sure we make a new one
+			            Debug.logInfo("===does not exist",module);
+			            // replace number with 'notFound' string
+			            Debug.logInfo("===update subject: " + subject, module);
+			            subject = subject.substring(0,start).concat("NotFound").concat(subject.substring(end, subject.length()));
+			            Debug.logInfo("=== new subject: " + subject, module);
+			            serviceResults = dispatcher.runSync("updateCommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId, "subject", subject, "statusId", communicationEvent.getString("statusId"), "userLogin", userLogin));
+			            if (ServiceUtil.isError(serviceResults)) {
+			                return UtilCommon.createAndLogServiceError(serviceResults, "error updating communication event", locale, module);
+			            }
+			        }
+			    }
+			    
+			    //Associate partyIdTo of CommunicationEvent
+			    associateCommunicationEventWorkEffortAndParty(workEffortId, partyIdTo, communicationEvent, delegator, dispatcher, userLogin, locale, dctx, context);
+			    
+			    //Associate partyIds of CommunicationEventRoles associated with the CommunicationEvent
+			    List commEventRoles = delegator.findByAnd("CommunicationEventRole", UtilMisc.toMap("communicationEventId", communicationEventId));
+			    Iterator itr = commEventRoles.iterator();
+			    
+			    while (itr.hasNext()) {
+			        GenericValue commEventRole = (GenericValue) itr.next();
+			        if (userLogin.getString("userLoginId").equals("system")) userLogin.set("partyId",commEventRole.getString("partyId"));// to allow prefixing the workeffortId in the shared ofbiz system
+			        associateCommunicationEventWorkEffortAndParty(commEventRole.getString("partyId"), communicationEvent, delegator, dispatcher, userLogin, locale, dctx, context);
+			    }
+			}
         } catch (GenericEntityException e) {
             return UtilCommon.createAndLogServiceError(e, "CrmErrorProcessIncomingEmailFail", locale, module);
         } catch (GenericServiceException e) {
@@ -371,6 +444,7 @@
             ModelService service = dctx.getModelService("createWorkEffort");
             Map input = service.makeValid(context, "IN");
             input.put("estimatedCompletionDate", estimatedCompletionDate);
+            input.put("userLogin", userLogin);
             serviceResults = dispatcher.runSync("createWorkEffort", input);
             if (ServiceUtil.isError(serviceResults)) {
                 return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorCreateActivityFail", locale, module);
@@ -411,6 +485,9 @@
 
             // get the estimated completion date from the duration
             Timestamp estimatedStartDate = (Timestamp) context.get("estimatedStartDate");
+            if (estimatedStartDate == null) {
+                estimatedStartDate = UtilDateTime.nowTimestamp();
+            }
             Timestamp estimatedCompletionDate = UtilCommon.getEndTimestamp(estimatedStartDate, (String) context.get("duration"), locale);
 
             // check for conflicts
@@ -712,7 +789,7 @@
 
             // remove by hand because service in work effort uses fromDate as a required field
             List associations = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment",
-                        UtilMisc.toMap("workEffortId", workEffortId, "partyId", partyId, "roleTypeId", "CAL_ATTENDEE")));
+                        UtilMisc.toMap("workEffortId", workEffortId, "partyId", partyId, "roleTypeId", (String) context.get("roleTypeId"))));
             if (associations.size() == 0) {
                 return UtilCommon.createAndLogServiceError("Cannot remove party with ID [" + partyId + "]", "CrmErrorUpdateActivityFail", locale, module);
             }

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/contacts/ContactsServices.java	2006-10-02 05:06:23 UTC (rev 277)
@@ -101,6 +101,7 @@
             input.put("preferredCurrencyUomId", context.get("preferredCurrencyUomId"));
             input.put("description", context.get("description"));
             input.put("birthDate", context.get("birthDate"));
+            input.put("userLogin", context.get("userLogin"));
             Map serviceResults = dispatcher.runSync("createPerson", input);
             if (ServiceUtil.isError(serviceResults)) {
                 return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorCreateContactFail", locale, module);

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/leads/LeadsServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/leads/LeadsServices.java	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/leads/LeadsServices.java	2006-10-02 05:06:23 UTC (rev 277)
@@ -99,6 +99,7 @@
             input.put("description", context.get("description"));
             input.put("birthDate", context.get("birthDate"));
             input.put("statusId", statusId); // initial status
+            input.put("userLogin", context.get("userLogin"));
             Map serviceResults = dispatcher.runSync("createPerson", input);
             if (ServiceUtil.isError(serviceResults)) {
                 return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorCreateLeadFail", locale, module);

Modified: versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyServices.java
===================================================================
--- versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyServices.java	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/src/com/opensourcestrategies/crmsfa/party/PartyServices.java	2006-10-02 05:06:23 UTC (rev 277)
@@ -160,7 +160,15 @@
             if (ServiceUtil.isError(serviceResults)) {
                 return UtilCommon.createAndLogServiceError(serviceResults, "CrmErrorMergePartiesFail", locale, module);
             }
-
+            
+            // change the payment methods
+            List paymentMethods = delegator.findByAnd("PaymentMethod", UtilMisc.toMap("partyId", partyIdFrom));
+            for (Iterator iter = paymentMethods.iterator(); iter.hasNext(); ) {
+                GenericValue paymentMethod = (GenericValue) iter.next();
+                paymentMethod.set("partyId", partyIdTo);
+                paymentMethod.store();
+            }
+            
             // merge workefforts by changing partyIdFrom to partyIdTo in WorkEffortPartyAssignment, but avoid duplicates
             List associations = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", UtilMisc.toMap("partyId", partyIdFrom)));
             for (Iterator iter = associations.iterator(); iter.hasNext(); ) {
@@ -230,6 +238,38 @@
                 note.remove();
             }
 
+            // merge payment from party (here we just change the fromPartyId because it's not a pk)
+            List payments1 = delegator.findByAnd("Payment", UtilMisc.toMap("partyIdFrom", partyIdFrom));
+            for (Iterator iter = payments1.iterator(); iter.hasNext(); ) {
+                GenericValue payment = (GenericValue) iter.next();
+                payment.set("partyIdFrom", partyIdTo);
+                payment.store();
+            }
+
+            // merge payment to party (here we just change the fromPartyId because it's not a pk)
+            List payments2 = delegator.findByAnd("Payment", UtilMisc.toMap("partyIdTo", partyIdFrom));
+            for (Iterator iter = payments2.iterator(); iter.hasNext(); ) {
+                GenericValue payment = (GenericValue) iter.next();
+                payment.set("partyIdTo", partyIdTo);
+                payment.store();
+            }
+
+            // merge invoice from party (here we just change the fromPartyId because it's not a pk)
+            List invoices1 = delegator.findByAnd("Invoice", UtilMisc.toMap("partyIdFrom", partyIdFrom));
+            for (Iterator iter = invoices1.iterator(); iter.hasNext(); ) {
+                GenericValue invoice = (GenericValue) iter.next();
+                invoice.set("partyIdFrom", partyIdTo);
+                invoice.store();
+            }
+            
+            // merge invoice from party (here we just change the fromPartyId because it's not a pk)
+            List invoices2 = delegator.findByAnd("Invoice", UtilMisc.toMap("partyId", partyIdFrom));
+            for (Iterator iter = invoices2.iterator(); iter.hasNext(); ) {
+                GenericValue invoice = (GenericValue) iter.next();
+                invoice.set("partyId", partyIdTo);
+                invoice.store();
+            }
+            
             // now delete the from party
             PartyHelper.deleteCrmParty(partyIdFrom, delegator);
 

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/accounts/viewAccount.bsh	2006-10-02 05:06:23 UTC (rev 277)
@@ -106,6 +106,11 @@
                 "inputFields", UtilMisc.toMap("targetPartyId", partyId), "orderBy", "noteDateTime DESC"));
     context.put("notesListIt", results.get("listIt"));
 
+    // payment Methods
+    results = dispatcher.runSync("performFind", UtilMisc.toMap("entityName", "PaymentMethodAndEftAccount", 
+                "inputFields", UtilMisc.toMap("partyId", partyId, "orderBy", "fromDate DESC")));
+    context.put("EftAccounts", results.get("listIt"));
+
     // cases related to this account (see myCases.bsh for another example)
     context.put("casesListIt", UtilCase.getCasesForParty(delegator, partyId, "ACCOUNT", parameters.get("casesOrderBy")));
 

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewActivity.bsh
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewActivity.bsh	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewActivity.bsh	2006-10-02 05:06:23 UTC (rev 277)
@@ -124,6 +124,7 @@
     // get the first related comm event (we're supposed to have only one but the data model is too flexible)
     candidates = workEffort.getRelated("CommunicationEventWorkEff");
     if (candidates.size() > 0) {
+    	// communicationevents = candidates.getRelated("CommunicationEvent");
         communicationEvent = candidates.get(0).getRelatedOne("CommunicationEvent");
         context.put("communicationEvent", communicationEvent);
 

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewEmail.bsh
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewEmail.bsh	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/viewEmail.bsh	2006-10-02 05:06:23 UTC (rev 277)
@@ -17,35 +17,80 @@
  */
 /* Copyright (c) 2005-2006 Open Source Strategies, Inc. */
 
+import java.sql.*;
 import org.ofbiz.base.util.*;
+import org.ofbiz.entity.*;
 import org.ofbiz.entity.condition.*;
 import org.ofbiz.entity.util.EntityUtil;
 
 import com.opensourcestrategies.crmsfa.party.PartyHelper;
 
+dispatcher = request.getAttribute("dispatcher");
+String getName(String partyId, Timestamp emailDate) {
+	String content = "";
+	result = dispatcher.runSync("getPartyNameForDate", UtilMisc.toMap("partyId", partyId, "compareDate", emailDate, "userLogin", userLogin));
+	if (result.get("groupName") != null)  content = content.concat(result.get("groupName"));
+	if (result.get("lastName") != null)  content = content.concat(result.get("lastName"));
+	if (result.get("firstName") != null)  content = content.concat(" ,").concat(result.get("firstName"));
+	if (result.get("middleName") != null)  content = content.concat(" ").concat(result.get("middleName"));
+	return content;
+}
+
+GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+
+// add permission checking
+context.put("hasUpdatePermission", true);
+
+
 // extract the work effort again
-workEffort = context.get("workEffort");
-if (workEffort == null) return;
-workEffortId = workEffort.get("workEffortId");
-workEffort = delegator.findByPrimaryKeyCache("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId)); 
+String workEffortId = parameters.get("workEffortId");
+GenericValue workEffort = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
+context.put("workEffort", workEffort);
 
-// we should be passed a communicationEvent
-communicationEvent = context.get("communicationEvent");
-if ((communicationEvent == null)) {
-    return;
+// we should be passed a communicationEventId
+String communicationEventId = parameters.get("communicationEventId");
+GenericValue communicationEvent = null;
+if(cummunicationEventId != null) {
+    communicationEvent = delegator.findByPrimaryKey("CommunicationEvent", UtilMisc.toMap("communicationEventId", communicationEventId));
 }
+else {
+	return;
+}
+context.put("communicationEvent", communicationEvent);
 
 // we need the from and to emails
-if(communicationEvent.getRelatedOne("FromContactMech") != null) {
+if(communicationEvent.get("contactMechIdFrom") != null) {
     context.put("fromEmail", communicationEvent.getRelatedOne("FromContactMech").getString("infoString"));
 }
+else { //email address in the note field
+	if (communicationEvent.get("note") != null && communicationEvent.getString("note").indexOf("Sent from: ") > -1) {
+		int start = communicationEvent.getString("note").indexOf("Sent from: ") + 11;
+		int end = communicationEvent.getString("note").indexOf(";",start);
+		if (end > start) context.put("fromEmail", communicationEvent.getString("note").substring(start,end));
+	}
+}
 
-if(communicationEvent.getRelatedOne("ToContactMech") != null) {
+if(communicationEvent.get("contactMechIdTo") != null) {
     context.put("toEmail", communicationEvent.getRelatedOne("ToContactMech").getString("infoString"));
 }
+else { //email address in the note field
+	if (communicationEvent.get("note") != null && communicationEvent.getString("note").indexOf("Sent to: ") > -1) {
+		int start = communicationEvent.getString("note").indexOf("Sent to: ") + 9;
+		int end = communicationEvent.getString("note").indexOf(";",start);
+		if (end > start) context.put("toEmail", communicationEvent.getString("note").substring(start,end));
+	}
+}
 
 // from party
-context.put("fromParty", communicationEvent.getRelatedOne("FromParty").getRelatedOne("Person"));
+if(communicationEvent.get("partyIdFrom") != null) {
+	context.put("fromPartyName", getName(communicationEvent.getString("partyIdFrom"), communicationEvent.getTimestamp("entryDate")));
+	context.put("fromPartyId", communicationEvent.getString("partyIdFrom"));
+}
+// to party
+if(communicationEvent.get("partyIdTo") != null) {
+	context.put("toPartyName", getName(communicationEvent.getString("partyIdTo"), communicationEvent.getTimestamp("entryDate")));
+	context.put("toPartyId", communicationEvent.getString("partyIdTo"));
+}
 
 // and the parties associated with email
 wepaCondition = new EntityConditionList(UtilMisc.toList(
@@ -66,6 +111,7 @@
     else if (role.equals("PROSPECT")) target = "viewLead";
     context.put("internalPartyTarget", target);
 }
+if (workEffort != null) {
 opportunities = workEffort.getRelated("SalesOpportunityWorkEffort");
 if (opportunities.size() > 0) {
     context.put("salesOpportunity", opportunities.get(0).getRelatedOne("SalesOpportunity"));
@@ -74,7 +120,7 @@
 if (cases.size() > 0) {
     context.put("custRequest", cases.get(0).getRelatedOne("CustRequest"));
 }
-
+}
 // Get all the recipients which are stored in CommunicationEventRole
 commEventRoles = communicationEvent.getRelated("CommunicationEventRole");
 rolesItr = commEventRoles.iterator();
@@ -98,3 +144,4 @@
 }
 
 context.put("attachments", attachments);
+

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/writeEmail.bsh
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/writeEmail.bsh	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/actions/activities/writeEmail.bsh	2006-10-02 05:06:23 UTC (rev 277)
@@ -20,6 +20,17 @@
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.condition.*;
 import org.ofbiz.entity.util.EntityUtil;
+                
+dispatcher = request.getAttribute("dispatcher");
+String getName(String partyId) {
+	String content = "";
+	result = dispatcher.runSync("getPartyNameForDate", UtilMisc.toMap("partyId", partyId,"userLogin", userLogin));
+	if (result.get("groupName") != null)  content = content.concat(result.get("groupName"));
+	if (result.get("lastName") != null)  content = content.concat(result.get("lastName"));
+	if (result.get("firstName") != null)  content = content.concat(" ,").concat(result.get("firstName"));
+	if (result.get("middleName") != null)  content = content.concat(" ").concat(result.get("middleName"));
+	return content;
+}
 
 userLogin = request.getAttribute("userLogin");
 
@@ -95,3 +106,14 @@
     // if there's a toEmail in the parameter but no contactMechIdTo, put it back in the context (happens when user types in an email and then switches input mode)
     parameters.put("toEmail", parameters.get("toEmail"));
 }
+
+// if a reply copy over the original text and add a header
+origCommunicationEventId = parameters.get("origCommunicationEventId");
+if (origCommunicationEventId != null) { // is a reply?
+	origCommunicationEvent = delegator.findByPrimaryKey("CommunicationEvent", UtilMisc.toMap("communicationEventId", origCommunicationEventId));
+	String content = "\n\n\n Original message:\nFrom: ".concat(getName(origCommunicationEvent.getString("partyIdFrom")));
+	content = content.concat("\n    To: ").concat(getName(origCommunicationEvent.getString("partyIdTo")));
+	content = content.concat("\n  Date: ").concat(origCommunicationEvent.getString("entryDate").toString().substring(0,16));
+    content = content.concat("\n> ").concat(origCommunicationEvent.getString("content").replaceAll("\n", "\n> "));
+    parameters.put("content", content);
+    }

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/WEB-INF/controller.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -295,6 +295,23 @@
         <response name="success" type="request-redirect" value="viewAccount"/>
         <response name="error" type="view" value="viewAccount"/>
     </request-map>
+    <request-map uri="addAccountPaymentMethodForm"> 
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="addAccountPaymentMethodForm"/>
+        <response name="error" type="view" value="addAccountPaymentMethodForm"/>
+    </request-map>
+    <request-map uri="addAccountPaymentMethod"> 
+        <security https="true" auth="true"/>
+        <event type="service" invoke="crmsfa.addAccountPaymentMethod"/>
+        <response name="success" type="request-redirect" value="viewAccount"/>
+        <response name="error" type="view" value="viewAccount"/>
+    </request-map>
+    <request-map uri="removeAccountPaymentMethod"> 
+        <security https="true" auth="true"/>
+        <event type="service" invoke="crmsfa.removeAccountPaymentMethod"/>
+        <response name="success" type="request-redirect" value="viewAccount"/>
+        <response name="error" type="view" value="viewAccount"/>
+    </request-map>
     <request-map uri="addAccountMarketingCampaign">
         <security https="true" auth="true"/>
         <event type="service" invoke="crmsfa.addAccountMarketingCampaign"/>
@@ -467,6 +484,12 @@
         <response name="success" type="view" value="ordersEditContactMech"/>
     </request-map>
 
+    <!--================ display any party ================-->
+    <request-map uri="partyProfile">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="partyProfile"/>
+    </request-map>
+    
     <!-- ===================== -->
     <!-- Contacts Request Maps -->
     <!-- ===================== -->
@@ -740,6 +763,10 @@
     <!-- Activities Requests -->
     <!-- =================== -->
 
+    <request-map uri="viewEmail">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="viewEmail"/>
+    </request-map>
     <request-map uri="writeEmail">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="writeEmail"/>
@@ -835,7 +862,20 @@
         <response name="success" type="request-redirect" value="viewActivity"/>
         <response name="error" type="view" value="viewActivity"/>
     </request-map>
-
+    <request-map uri="closeTask">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="closeEmailTask"/>
+        <response name="success" type="request" value="activitiesMain"/>
+        <response name="error" type="view" value="activitiesMain"/>
+    </request-map>
+    <request-map uri="allocateMsgToParty">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="allocateMsgToParty"/>
+        <response name="success" type="request" value="activitiesMain"/>
+        <response name="error" type="request" value="activitiesMain"/>
+    </request-map>
+    
+    
     <!-- ====================== -->
     <!-- Forecasts Request Maps -->
     <!-- ====================== -->
@@ -1281,12 +1321,16 @@
     <!-- myHome screens -->
     <view-map name="myHome" type="screen" page="component://crmsfa/widget/crmsfa/screens/myhome/MyHomeScreens.xml#myHome"/>
 
+    <!-- general party display -->
+    <view-map name="partyProfile" type="screen" page="component://crmsfa/widget/crmsfa/screens/common/ContactScreens.xml#partyProfile"/>
+    
     <!-- accounts screens -->
     <view-map name="myAccounts" type="screen" page="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml#myAccounts"/>
     <view-map name="viewAccount" type="screen" page="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml#viewAccount"/>
     <view-map name="findAccounts" type="screen" page="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml#findAccounts"/>
     <view-map name="createAccountForm" type="screen" page="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml#createAccountForm"/>
     <view-map name="updateAccountForm" type="screen" page="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml#updateAccountForm"/>
+    <view-map name="addAccountPaymentMethodForm" type="screen" page="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml#addAccountPaymentMethodForm"/>
 
     <!-- contacts screens -->
     <view-map name="myContacts" type="screen" page="component://crmsfa/widget/crmsfa/screens/contacts/ContactsScreens.xml#myContacts"/>
@@ -1320,6 +1364,7 @@
     <view-map name="findCases" type="screen" page="component://crmsfa/widget/crmsfa/screens/cases/CasesScreens.xml#findCases"/>
 
     <!-- activities screens -->
+    <view-map name="viewEmail" type="screen" page="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml#viewEmail"/>
     <view-map name="writeEmail" type="screen" page="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml#writeEmail"/>
     <view-map name="createEventForm" type="screen" page="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml#createEventForm"/>
     <view-map name="createTaskForm" type="screen" page="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml#createTaskForm"/>

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/activities/viewEmail.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/activities/viewEmail.ftl	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/activities/viewEmail.ftl	2006-10-02 05:06:23 UTC (rev 277)
@@ -18,29 +18,23 @@
 <#-- Copyright (c) 2005-2006 Open Source Strategies, Inc. -->
 
 <div class="form">
-
+<#if workEffort?has_content>
   <div class="formRow">
-    <span class="formLabel">${uiLabelMap.CrmEmailParty}</span>
-    <span class="formInputSpan">
-      <#if internalPartyTarget?exists>
-        <a class="buttontext" href="${internalPartyTarget}?partyId=${internalParty.partyId}">
-            ${internalParty.groupName?if_exists} ${internalParty.firstName?if_exists} ${internalParty.lastName?if_exists} (${internalParty.partyId})
-        </a>
-      <#elseif internalParty?exists>
-        ${internalParty.groupName?if_exists} ${internalParty.firstName?if_exists} ${internalParty.lastName?if_exists}
-       </#if>
-    </span>
+    <span class="formLabel">${uiLabelMap.CrmTask}</span>
+    <span class="formInputSpan">${workEffort.workEffortName}<a href="viewActivity?workEffortId=${workEffort.workEffortId}"> [${workEffort.workEffortId}]</a></span>
+    <span class="formLabel">${uiLabelMap.CommonDate}</span>
+    <span class="formInputSpan">${communicationEvent.entryDate}</span>
   </div>
-
+</#if>
   <div class="formRow">
     <span class="formLabel">${uiLabelMap.CommonFrom}</span>
-    <span class="formInputSpan">${fromEmail?if_exists} <#if fromParty?has_content>(${fromParty.firstName} ${fromParty.lastName})</#if></span>
+    <span class="formInputSpan">${fromEmail?if_exists} <#if fromPartyName?has_content><a href="partyProfile?partyId=${fromPartyId}">(${fromPartyName} [${fromPartyId}])</a></#if></span>
   </div>
 
   <#if toEmail?has_content>
   <div class="formRow">
     <span class="formLabel">${uiLabelMap.CommonTo}</span>
-    <span class="formInputSpan">${toEmail}<#if otherEmailAddresses?has_content><#list otherEmailAddresses as emailAddress>, ${emailAddress}</#list></#if>
+    <span class="formInputSpan">${toEmail} <#if toPartyName?has_content><a href="partyProfile?partyId=${toPartyId}">(${toPartyName}- [${toPartyId}])</a></#if><#if otherEmailAddresses?has_content><#list otherEmailAddresses as emailAddress>, ${emailAddress}</#list></#if>
     </span>
   </div>
   </#if>
@@ -85,7 +79,7 @@
     <span class="formLabel">${uiLabelMap.CommonMessage}</span>
     <span class="formInputSpan">
     <#if (communicationEvent.contentMimeTypeId?has_content) && (communicationEvent.contentMimeTypeId == "text/plain")>
-    <textarea class="inputBox" cols="100" rows="20" readonly>${communicationEvent.content?if_exists}</textarea>
+    <textarea class="inputBox" cols="70" rows="20" readonly>${communicationEvent.content?if_exists}</textarea>
     <#else>
     <#-- wrap html emails around a little box -->    
     <div class="form">

Modified: versions/1.0/branches/emailPayment/webapp/crmsfa/activities/writeEmail.ftl
===================================================================
--- versions/1.0/branches/emailPayment/webapp/crmsfa/activities/writeEmail.ftl	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/webapp/crmsfa/activities/writeEmail.ftl	2006-10-02 05:06:23 UTC (rev 277)
@@ -53,9 +53,10 @@
   <input type="hidden" name="donePage" value="${parameters.donePage?if_exists}"></input>
   <input type="hidden" name="contentMimeTypeId" value="${parameters.contentMimeTypeId?default("text/plain")}"></input>
   <input type="hidden" name="datetimeStarted" value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()}"></input> <#-- for now we hardcode the start time -->
-  <#-- these our set if we have a saved email -->
+  <#-- these are set if we have a saved or reply email -->
   <input type="hidden" name="communicationEventId" value="${parameters.communicationEventId?if_exists}"></input>
   <input type="hidden" name="workEffortId" value="${parameters.workEffortId?if_exists}"></input>
+  <input type="hidden" name="origCommunicationEventId" value="${parameters.origCommunicationEventId?if_exists}"></input>
   <#-- pass-through parameters for donePage, so we can go to, for instance, viewContactList?contactListId=${parameters.contactListId} -->
   <#if parameters.contactListId?exists>
   <input type="hidden" name="contactListId" value="${parameters.contactListId}"></input>
@@ -159,7 +160,7 @@
   <div class="formRow">
     <span class="formLabelRequired">${uiLabelMap.CommonMessage}</span>
     <span class="formInputSpan">
-      <textarea name="content" class="inputBox" rows="5" cols="60">${parameters.content?if_exists}</textarea>
+      <textarea name="content" class="inputBox" rows="20" cols="70">${parameters.content?if_exists}</textarea>
     </span>
   </div>
 

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/accounts/AccountsForms.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -118,7 +118,12 @@
                 </entity-options>
             </drop-down>
         </field>
-
+        <field name="  " widget-area-style="formSectionHeader" widget-style="formSectionHeaderTitle"><display description="${uiLabelMap.CrmBankInfo}"/> </field>
+        <field name="paymentMethodTypeId"><hidden value="EFT_ACCOUNT"/>></field>
+        <field name="bankName" position="1"><text/></field>
+        <field name="routingNumber" position="2"><text/></field>
+        <field name="accountNumber" position="1"><text/></field>
+        <field name="nameOnAccount" position="2"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CrmCreateAccount}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/activities/ActivitiesForms.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -61,8 +61,9 @@
             header-link="${listSortTarget}?${activityValueParams}&amp;pendingActivitiesOrderBy=estimatedCompletionDate#ListPendingActivities" header-link-style="orderByHeaderLink">
             <display/>
         </field>
+        <field name="close" widget-style="buttontext"><hyperlink target="closeTask?workEffortId=${workEffortId}" description="close"/></field>
     </form>   
-
+    
     <form name="ListCompletedActivities" type="list" separate-columns="true" 
         title="CompletedActivites"  default-title-style="tableheadtext" target=""
         default-widget-style="tabletext" default-tooltip-style="tabletext"
@@ -423,7 +424,7 @@
         </field>
         <field name="Remove" title="" widget-style="buttontext" use-when="context.get(&quot;hasUpdatePartiesPermission&quot;)!=null">
             <hyperlink description="${uiLabelMap.CommonRemove}" 
-                target="removeWorkEffortPartyAssignment?workEffortId=${workEffortId}&amp;partyId=${partyId}"/> 
+                target="removeWorkEffortPartyAssignment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}"/> 
         </field>
         <field name="availabilityStatusId" title="${uiLabelMap.CrmAvailability}" widget-area-style="fieldWidth100"
             use-when="context.get(&quot;hasUpdatePartiesPermission&quot;)==null">
@@ -464,5 +465,95 @@
         <field name="subject" title="${uiLabelMap.PartySubject}"><display/></field>
         <field name="content" title="${uiLabelMap.CommonMessage}"><display/></field>
     </form>
-
+    <form name="ListEmails" type="list" separate-columns="true" 
+        title="Email List"  default-title-style="tableheadtext" list-name="listIt" target=""
+        default-widget-style="tabletext" default-tooltip-style="tabletext"
+        default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
+        paginate-target="listEmails" default-entity-name="CommunicationEvent">
+        <actions>
+            <set field="findParam.noConditionFind" value="Y"/>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="entityName" value="WorkEffortCommunicationEventView"/>
+                <field-map field-name="inputFields" env-name="findParam"/>
+                <!--field-map field-name="orderBy" value="entryDate DESC"/-->
+            </service>
+        </actions>
+        <row-actions>
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
+                <field-map field-name="partyId" env-name="partyIdFrom"/>
+                <field-map field-name="compareDate" env-name="entryDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
+                <field-map field-name="partyId" env-name="partyIdTo"/>
+                <field-map field-name="compareDate" env-name="entryDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+        </row-actions>
+        <field name="communicationEventId"><hidden/></field>
+        <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+            <hyperlink description="${subject}" target="viewEmail?communicationEventId=${communicationEventId}&amp;workEffortId=${workEffortId}"/>
+        </field>
+        <field name="partyIdFrom" widget-style="buttontext"><hyperlink target="partyProfile?partyId=${partyIdFrom}" description="${partyNameResultFrom.fullName} (${partyIdFrom})"/></field>
+        <field name="partyIdTo" widget-style="buttontext"><hyperlink target="partyProfile?partyId=${partyIdTo}" description="${partyNameResultTo.fullName} (${partyIdTo})"/></field>
+        <field name="entryDate"><display description="${bsh:entryDate.toString().substring(0,16)}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="workEffortId" widget-style="buttontext"><hyperlink target="viewActivity?workEffortId=${workEffortId}" description="${workEffortId}"/></field>
+    </form>
+    <form name="ListWrongEmails" type="list" separate-columns="true" 
+        title="Email List"  default-title-style="tableheadtext" list-name="listIt" target=""
+        default-widget-style="tabletext" default-tooltip-style="tabletext"
+        default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
+        paginate-target="listWrongEmails" default-entity-name="CommunicationEvent">
+        <actions>
+            <set field="findParam.noConditionFind" value="Y"/>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="entityName" value="CommunicationEvent"/>
+                <field-map field-name="inputFields" env-name="findParam"/>
+                <!--field-map field-name="orderBy" value="entryDate DESC"/-->
+            </service>
+        </actions>
+        <field name="communicationEventId"><hidden/></field>
+        <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+            <hyperlink description="${subject}" target="viewEmail?communicationEventId=${communicationEventId}&amp;workEffortId=${workEffortId}"/>
+        </field>
+        <field name="partyIdFrom"><display/></field>
+        <field name="partyIdTo"><display/></field>
+        <field name="entryDate"><display description="${bsh:entryDate.toString().substring(0,16)}"/></field>
+        <!--field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field-->
+        <field name="note" widget-area-style="fieldWidth200"><display/></field>
+        <field name="delete" widget-style="buttontext"><hyperlink description="delete" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}"/></field>
+    </form>
+    <form name="ListTaskEmails" type="list" separate-columns="true" 
+        title="Task related emails"  default-title-style="tableheadtext" target=""
+        default-widget-style="tabletext" default-tooltip-style="tabletext"
+        default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
+        paginate-target="${listSortTarget}" paginate-target-anchor="ListCompletedActivities" paginate-size-field="actHistSize" paginate-index-field="actHistIndex"
+        list-name="emails">
+        <row-actions>
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
+                <field-map field-name="partyId" env-name="partyIdFrom"/>
+                <field-map field-name="compareDate" env-name="entryDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
+                <field-map field-name="partyId" env-name="partyIdTo"/>
+                <field-map field-name="compareDate" env-name="entryDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+        </row-actions>
+        <field name="communicationEventTypeId" title="Type"><display-entity entity-name="CommunicationEventType" description="${description}"/></field>
+        <field name="subject"><hyperlink target="viewEmail?communicationEventId=${communicationEventId}&amp;workEffortId=${workEffortId}" description="${subject}"/></field>
+        <field name="partyIdFrom" ><hyperlink target="partyProfile?partyId=${partyIdFrom}" description="${partyNameResultFrom.fullName} (${partyIdFrom})"/></field>
+        <field name="partyIdTo" ><hyperlink target="partyProfile?partyId=${partyIdTo}" description="${partyNameResultTo.fullName} (${partyIdTo})"/></field>
+        <field name="entryDate"><display description="${bsh:entryDate.toString().substring(0,16)}"/></field>
+    </form>   
+    <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title=""
+        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
+        <field name="partyId" position="1"><lookup target-form-name="LookupClients" size="20" maxlength="20"/></field>
+        <field name="emailAddress" position="2"><text default-value="${fromEmail}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
 </forms>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/forms/common/CommonForms.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/forms/common/CommonForms.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/forms/common/CommonForms.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -52,12 +52,41 @@
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-area-style="fieldWidth200"><display/></field>
         <!-- TODO: need a way to check complex security here (maybe use-when?) also for marketing campaigns below
-        <field name="Remove" widget-style="buttontext" title=" ">
+            <field name="Remove" widget-style="buttontext" title=" ">
             <hyperlink description="${uiLabelMap.CommonRemove}" target="${removeDataSourceFormTarget}?partyId=${parameters.partyId}&amp;dataSourceId=${dataSourceId}"/>
-        </field>
+            </field>
         -->
     </form>
-
+    
+    <!-- parametrized Payment methods sources list -->
+    <form name="listPaymentMethods" type="list" separate-columns="true" 
+        default-title-style="tableheadtext" target=""
+        default-widget-style="tabletext" default-tooltip-style="tabletext"
+        default-table-style="crmsfaListTable" header-row-style="crmsfaListTableHeader" even-row-style="rowWhite" odd-row-style="rowLightGray"
+        list-name="EftAccounts">
+        <field name="bankName"><display/></field>
+        <field name="routingNumber"><display/></field>
+        <field name="nameOnAccount"><display/></field>
+        <field name="accountNumber"><display/></field>
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-area-style="fieldWidth200"><display/></field>
+        <!-- TODO: need a way to check complex security here (maybe use-when?) also for marketing campaigns below
+            <field name="Remove" widget-style="buttontext" title=" ">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="${removePaymentMethodFormTarget}?partyId=${parameters.partyId}&amp;PaymentMethodId=${PaymentMethodId}"/>
+            </field>
+        -->
+    </form>
+    
+    <!-- parametrized add payment method source form -->
+    <form name="addPaymentMethodForm" type="single" target="${addPaymentMethodFormTarget}?partyId=${parameters.partyId}"
+        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <field name="paymentMethodTypeId"><hidden value="EFT_ACCOUNT"/></field>
+        <field name="bankName" position="1"><text/></field>
+        <field name="routingNumber" position="2"><text/></field>
+        <field name="accountNumber" position="1"><text/></field>
+        <field name="nameOnAccount" position="2"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallsubmit"><submit/></field>
+    </form>
+    
     <!-- parametrized add data source form -->
     <form name="addDataSourceForm" type="single" target="${addDataSourceFormTarget}?partyId=${parameters.partyId}"
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
@@ -71,7 +100,7 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallsubmit"><submit/></field>
     </form>
-
+    
     <!-- simple, parameterized marketing campaigns list (the full one is in MarketingForms.xml) -->
     <form name="listMarketingCampaigns" type="list" separate-columns="true" 
         default-title-style="tableheadtext" target=""

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/screens/accounts/AccountsScreens.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/screens/accounts/AccountsScreens.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/screens/accounts/AccountsScreens.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -54,7 +54,7 @@
                 <set field="sectionName" value="accounts" global="true"/> <!-- to tell common elements what section we are in -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="section-decorator">
 
                         <!-- screenlets on the left column -->
@@ -290,6 +290,17 @@
                             <include-form name="ListCases" location="component://crmsfa/widget/crmsfa/forms/cases/CasesForms.xml"/>
                         </container>
 
+                        <!-- EftAccounts -->
+                        <container style="subSectionBlock">
+                            <section>
+                                <!--condition><if-compare field-name="hasViewPermission" operator="equals" value="true" type="Boolean"/></condition-->
+                                <widgets>
+                                    <platform-specific><html><html-template location="component://crmsfa/webapp/crmsfa/accounts/submenus/viewPaymentMethods.ftl"/></html></platform-specific>
+                                    <include-screen name="viewAccountPaymentMethods"/>
+                                </widgets>
+                            </section>
+                        </container>
+                        
                         <!-- completed activities -->
                         <include-screen name="completedActivities" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
 
@@ -330,7 +341,38 @@
             </widgets>
         </section>
     </screen>
-
+    
+    <!-- account payment methods -->
+    <screen name="viewAccountPaymentMethods">
+        <section>
+            <actions>
+                <!-- set the form parameters -->
+                <set field="addPaymentMethodFormTarget" value="addAccountPaymentMethod"/>
+                <set field="removePaymentMethodFormTarget" value="removeAccountPaymentMethod"/>
+            </actions>
+            <widgets>
+                <include-screen name="viewPaymentMethods" location="component://crmsfa/widget/crmsfa/screens/common/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="addAccountPaymentMethodForm">
+        <section>
+            <actions>
+                <!-- set the form parameters -->
+                <set field="sectionHeaderUiLabel" value="CrmCreatePaymentMethod"/>
+                <set field="addPaymentMethodFormTarget" value="addAccountPaymentMethod"/>
+                <set field="removePaymentMethodFormTarget" value="removeAccountPaymentMethod"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-accounts-decorator">
+                    <decorator-section name="accounts-body">
+                        <include-form name="addPaymentMethodForm" location="component://crmsfa/widget/crmsfa/forms/common/CommonForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <!-- account marketing campaigns -->
     <screen name="viewAccountMarketingCampaigns">
         <section>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/screens/activities/ActivitiesScreens.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -94,7 +94,8 @@
                 <set field="sectionHeaderUiLabel" value="CrmActivities"/>
                 <set field="listSortTarget" value="activitiesMain"/>
                 <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/includes/pagination.bsh"/>
-                <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/activities/findActivitiesByName.bsh"/>
+                <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/activities/setMyActivities.bsh"/>
+                <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/activities/findActivities.bsh"/>                                
                 <set field="findActivitiesTarget" value="activitiesMain"/>
             </actions>
             <widgets>
@@ -107,8 +108,10 @@
                         </container>
 
                         <container style="subSectionBlock">
-                            <platform-specific><html><html-template location="component://crmsfa/webapp/crmsfa/activities/submenus/generalActivitiesMenu.ftl"/></html></platform-specific>
-                            <include-form name="ListCompletedActivities" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+                            <include-screen name="ListWrongEmails" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
+                            <include-screen name="ListOpenEmails" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
+                            <include-screen name="pendingActivities" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
+                            <include-screen name="completedActivities" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
                         </container>
                     </decorator-section>
                 </decorator-screen>
@@ -145,6 +148,23 @@
         </section>
     </screen>
 
+    <screen name="viewEmail">
+        <section>
+            <actions>
+                <set field="pageTitleLabel" value="CrmViewEmail"/>
+                <set field="sectionHeaderUiLabel" value="CrmViewEmail"/>
+                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-activities-decorator">
+                    <decorator-section name="activities-body">
+                        <include-screen name="viewEmailScreen"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <!-- this screen is for rendering emails -->
     <screen name="viewEmailScreen">
         <section>
@@ -152,7 +172,16 @@
                 <script location="component://crmsfa/webapp/crmsfa/WEB-INF/actions/activities/viewEmail.bsh"/>
             </actions>
             <widgets>
+                <platform-specific>
+                    <html>
+                        <html-template location="component://crmsfa/webapp/crmsfa/activities/submenus/emailDetailMenu.ftl"/>
+                    </html>
+                </platform-specific>
                 <platform-specific><html><html-template location="component://crmsfa/webapp/crmsfa/activities/viewEmail.ftl"/></html></platform-specific>
+                <container style="form">
+                    <label style="head1" text="Allocate this message to a partytask and add an email address to the Party."/>
+                    <include-form name="allocateMsgToPartyForm" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+                </container>
             </widgets>
         </section>
     </screen>
@@ -319,7 +348,7 @@
                                 <!-- display the comm event = email -->
                                 <section>
                                     <condition><if-compare field-name="isCrmEmail" operator="equals" value="true" type="Boolean"/></condition>
-                                    <widgets><include-screen name="viewOrWriteEmailScreen"/></widgets>
+                                    <widgets><include-screen name="listTaskEmails"/></widgets>
                                 </section>
 
                                 <!-- display all other kinds of comm events -->
@@ -401,5 +430,72 @@
             </widgets>
         </section>
     </screen>
+    <screen name="ListWrongEmails">
+        <section>
+            <actions>
+                <set field="title" value="Problem Emails"/>
+                <set field="titleProperty" value="PageTitleFindEmail"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="30"/>
+                <set field="findParam.statusId" value="COM_UNKNOWN_PARTY"/>
+            </actions>
+            <widgets>
+                <container style="subSectionBlock">
+                    <container style="subSectionHeader">
+                        <label style="subSectionTitle" text="Problem Emails"/>
+                    </container>
+                    <include-form name="ListWrongEmails"  location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="ListOpenEmails">
+        <section>
+            <actions>
+                <set field="title" value="List open Emails"/>
+                <set field="titleProperty" value="PageTitleFindEmail"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="30"/>
+                <set field="findParam.statusId" value="COM_ENTERED"/>
+            </actions>
+            <widgets>
+                <container style="subSectionBlock">
+                    <container style="subSectionHeader">
+                        <label style="subSectionTitle" text="Outstanding emails"/>
+                    </container>
+                    <include-form name="ListEmails" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="pendingActivities">
+        <section>
+            <actions>
+            </actions>
+            <widgets>
+                <container style="subSectionBlock">
+                    <platform-specific><html><html-template location="component://crmsfa/webapp/crmsfa/activities/submenus/pendingActivitiesMenu.ftl"/></html></platform-specific>
+                    <include-form name="ListPendingActivities" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+                </container>
+            </widgets>
+        </section>
+    </screen>
 
+    <!-- this is the includable screen for listing emails for a task -->
+    <screen name="listTaskEmails">
+        <section>
+            <actions>
+                <entity-and entity-name="WorkEffortCommunicationEventView" list-name="emails">
+                    <field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
+                    <order-by field-name="entryDate DESC"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://crmsfa/webapp/crmsfa/activities/submenus/pendingActivitiesMenu.ftl"/></html></platform-specific>
+                <include-form name="ListTaskEmails" location="component://crmsfa/widget/crmsfa/forms/activities/ActivitiesForms.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    
+    
 </screens>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/CommonScreens.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/CommonScreens.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/CommonScreens.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -229,7 +229,22 @@
             </widgets>
         </section>
     </screen>
-
+    
+    <!-- common PaymentMethodse list screen (see AccountScreens.xml#viewAccountPaymentMethod for an example) -->
+    <screen name="viewPaymentMethods">
+        <section>
+            <widgets>
+                <container style="subSectionBlock">
+                    <include-form name="listPaymentMethods" location="component://crmsfa/widget/crmsfa/forms/common/CommonForms.xml"/>
+                    <!--section>
+                        <condition><if-compare field-name="hasUpdatePermission" operator="equals" value="true" type="Boolean"/></condition>
+                        <widgets><include-form name="addPaymentMethodForm" location="component://crmsfa/widget/crmsfa/forms/common/CommonForms.xml"/></widgets>
+                    </section-->
+                </container>
+            </widgets>
+        </section>
+    </screen>
+    
     <!-- common marketing campaign list/add-form combo screen (see LeadsScreens.xml#viewLeadMarketingCampaign for an example) -->
     <screen name="viewMarketingCampaigns">
         <section>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/ContactScreens.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/ContactScreens.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/screens/common/ContactScreens.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -130,4 +130,57 @@
             </widgets>
         </section>
     </screen>
+    <screen name="partyProfile">
+        <section>
+            <actions>
+                <set field="findParam.partyIdFrom" from-field="parameters.partyId"/>
+                <service service-name="performFindItem" result-map-name="result">
+                    <field-map field-name="entityName" value="PartyRelationship"/>
+                    <field-map field-name="inputFields" env-name="findParam"/>
+                </service>
+            </actions>
+            <widgets>
+                <section>
+                    <condition>
+                        <if-compare field-name="result.item.roleTypeIdFrom" operator="equals" value="ACCOUNT"/>
+                    </condition>
+                    <widgets>
+                        <include-screen name="viewAccount" location="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml"/>
+                    </widgets>
+                </section>
+                <section>
+                    <condition>
+                        <if-compare field-name="result.item.roleTypeIdFrom" operator="equals" value="CONTACT"/>
+                    </condition>
+                    <widgets>
+                        <include-screen name="viewContact" location="component://crmsfa/widget/crmsfa/screens/contacts/ContactsScreens.xml"/>/>
+                    </widgets>
+                </section>
+                <section>
+                    <condition>
+                        <if-compare field-name="result.item.roleTypeIdFrom" operator="equals" value="PROSPECT"/>
+                    </condition>
+                    <widgets>
+                        <include-screen name="viewLead" location="component://crmsfa/widget/crmsfa/screens/leads/LeadsScreens.xml"/>/>
+                    </widgets>
+                </section>
+                <section>
+                    <condition>
+                        <and>
+                            <if-compare field-name="result.item.roleTypeIdFrom" operator="not-equals" value="PROSPECT"/>
+                            <if-compare field-name="result.item.roleTypeIdFrom" operator="not-equals" value="CONTACT"/>
+                            <if-compare field-name="result.item.roleTypeIdFrom" operator="not-equals" value="ACCOUNT"/>
+                        </and>
+                    </condition>
+                    <widgets>
+                        <decorator-screen name="main-accounts-decorator" location="component://crmsfa/widget/crmsfa/screens/accounts/AccountsScreens.xml">
+                            <decorator-section name="accounts-body">
+                            <label style="head1" text="      No suitable type defined for this party"/>
+                            </decorator-section>
+                        </decorator-screen>
+                    </widgets>
+                </section>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: versions/1.0/branches/emailPayment/widget/crmsfa/screens/myhome/MyHomeScreens.xml
===================================================================
--- versions/1.0/branches/emailPayment/widget/crmsfa/screens/myhome/MyHomeScreens.xml	2006-10-02 04:32:09 UTC (rev 276)
+++ versions/1.0/branches/emailPayment/widget/crmsfa/screens/myhome/MyHomeScreens.xml	2006-10-02 05:06:23 UTC (rev 277)
@@ -110,6 +110,8 @@
 
                         <!-- pending activities -->
                         <container style="subSectionBlock">
+                            <include-screen name="ListWrongEmails" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
+                            <include-screen name="ListOpenEmails" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
                             <include-screen name="pendingActivities" location="component://crmsfa/widget/crmsfa/screens/activities/ActivitiesScreens.xml"/>
                         </container>
                     </decorator-section>

Author: hans
Date: 2006-10-01 21:32:09 -0700 (Sun, 01 Oct 2006)
New Revision: 276

Removed:
   versions/1.0/branches/paymentmethods/README.txt
   versions/1.0/branches/paymentmethods/build.xml
   versions/1.0/branches/paymentmethods/config/
   versions/1.0/branches/paymentmethods/data/
   versions/1.0/branches/paymentmethods/docs/
   versions/1.0/branches/paymentmethods/entitydef/
   versions/1.0/branches/paymentmethods/gpl.txt
   versions/1.0/branches/paymentmethods/ofbiz-component.xml
   versions/1.0/branches/paymentmethods/script/
   versions/1.0/branches/paymentmethods/servicedef/
   versions/1.0/branches/paymentmethods/src/
   versions/1.0/branches/paymentmethods/templates/
   versions/1.0/branches/paymentmethods/webapp/
   versions/1.0/branches/paymentmethods/widget/
Log:
branch delete in favor of emailPayment branch

Deleted: versions/1.0/branches/paymentmethods/README.txt
===================================================================
--- versions/1.0/branches/paymentmethods/README.txt	2006-10-02 04:29:27 UTC (rev 275)
+++ versions/1.0/branches/paymentmethods/README.txt	2006-10-02 04:32:09 UTC (rev 276)
@@ -1,32 +0,0 @@
-    opentaps Customer Relation Manager and Sales Forecast Module
-    ------------------------------------------------------------
-
-    This application is a CRM and Sales Forecast module for the opentaps/OFBiz applications suite
-
-    To use it, put this entire module and all its sub-directories in the hot-deploy/ directory
-of your opentaps/OFBiz suite.  Then load the seed data from the crmsfa/data directory.  
-
-    If you have problems with building the file with ant,
-then edit the crmsfa/build.xml file and change the line for
-      <property name="ofbiz.dir" value="../../"/>
-to the absolute path of your ofbiz/ directory.
-
-    Please see the files in config/ and data/ directory for examples of how to configure the application.
-
-    If you are using Eclipse, edit the .classpath file in your ofbiz/ directory and add the line
-      <classpathentry kind="src" path="hot-deploy/crmsfa/src"/>
-so that Eclipse would load the CRM/SFA application's src/ directory files as Java source code.
-
-    Licensing
-    ---------
-
-    This application is released free of charge to you under the General Public License (GPL), which
-allows you to use, modify, and re-distribute it, provided you meet the requirements of the GPL.
-The GPL is a very different license than the MIT/Apache License of OFBiz.  Please take the time to
-understand its differences and observe them in your use of both the CRM/SFA module and of larger
-applications with which you have combined it.
-
-    If you do not wish to be bound by the GPL in your use of this application, we also offer
-commercial licenses which meet the needs of users, vendors, and services providers.  Please contact
-us at info@... for additional information.
- 

Deleted: versions/1.0/branches/paymentmethods/build.xml
===================================================================
--- versions/1.0/branches/paymentmethods/build.xml	2006-10-02 04:29:27 UTC (rev 275)
+++ versions/1.0/branches/paymentmethods/build.xml	2006-10-02 04:32:09 UTC (rev 276)
@@ -1,151 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Copyright (C) 2006  Open Source Strategies, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--->
-<!--
- *  Copyright (c) 2001 The Open For Business Project - http://www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *  This is the CRMSFA build script
- *  $Id: $
- *
- *  @author   Leon Torres (leon@...)
--->
-
-<project name="opentaps - CRMSFA Component" default="jar" basedir=".">
-
-    <!-- ================================================================== -->
-    <!-- Initialization of all property settings                            -->
-    <!-- ================================================================== -->
-
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="CRMSFA Component"/>
-        <property name="name" value="opentaps-crmsfa"/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-        <!-- This parameter must point to your ofbiz/ directory or the libraries for the financials app would not be found.
-         The default setting would work if you have checked out the financials module into your ofbiz/hot-deploy/ directory.
-         It would NOT work if you checked it out somewhere else and symlinked to it in your hot-deploy/ directory.
-         If you experience build problems, put the full path here -->
-        <property name="ofbiz.dir" value="../../"/> 
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${ofbiz.dir}/framework/base/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/base/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/entity/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/entity/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/datafile/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/security/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/service/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/service/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/minilang/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/webapp/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/framework/common/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/applications/accounting/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/applications/securityext/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/applications/product/build/lib" includes="*.jar"/>
-            <fileset dir="${ofbiz.dir}/applications/order/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Compilation of the source files                                                                                                                         -->
-    <!-- ================================================================== -->
-
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.4" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
-        <!-- also put the DTDs in the jar file... -->
-        <copy todir="${build.dir}/classes">
-            <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
-        </copy>
-    </target>
-
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Build JavaDoc                                                      -->
-    <!-- ================================================================== -->
-
-    <target name="docs" depends="prepare-docs,classpath">
-        <javadoc packagenames="com.opensourcestrategies.crmsfa.*"
-            classpathref="local.class.path"
-            destdir="${build.dir}/javadocs"
-            Windowtitle="Open Source Strategies - ${desc}">
-            <sourcepath path="${src.dir}"/>
-        </javadoc>
-    </target>
-
-    <target name="all" depends="jar,docs"/>
-</project>

Deleted: versions/1.0/branches/paymentmethods/gpl.txt
===================================================================
--- versions/1.0/branches/paymentmethods/gpl.txt	2006-10-02 04:29:27 UTC (rev 275)
+++ versions/1.0/branches/paymentmethods/gpl.txt	2006-10-02 04:32:09 UTC (rev 276)
@@ -1,281 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

Deleted: versions/1.0/branches/paymentmethods/ofbiz-component.xml
===================================================================
--- versions/1.0/branches/paymentmethods/ofbiz-component.xml	2006-10-02 04:29:27 UTC (rev 275)
+++ versions/1.0/branches/paymentmethods/ofbiz-component.xml	2006-10-02 04:32:09 UTC (rev 276)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2006  Open Source Strategies, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--->
-<!--
- *  @author Si Chen (sichen@...)
- *  @author Leon Torres (leon@...) 
--->
-
-<!-- name of the component which is used in references starting with "component://" throughout.  Also must not duplicate any other component name -->
-<ofbiz-component name="crmsfa"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/ofbiz-component.xsd">
-    <resource-loader name="main" type="component"/>
-
-    <!-- class path for Java build files, config properties files, and script files -->
-    <classpath type="dir" location="config"/>
-    <classpath type="dir" location="script"/>
-    <classpath type="jar" location="build/lib/*"/>
-
-    <!-- seed data which will be loaded on "ant run install" and "ant run install-seed" -->
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CRMSFASeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CRMSFASecurityData.xml"/>
-    
-    <!-- demo data which will be loaded only on "ant run install" -->
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/CRMSFADemoData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/CRMSFAOFBizSecurityData.xml"/>
-
-    <!-- this file defines the data model specific to this application -->
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <!-- this file associates the data model's entities (analogous to tables or objects) with a "group" which is then associated with a
-        delegator in entityengine.xml.  The delegator is then associated with a database -->
-    <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup.xml"/>
-
-    <!-- service definition files -->
-    <service-resource type="model" loader="main" location="servicedef/services_accounts.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_contacts.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_leads.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_opportunities.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_cases.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_activities.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_forecasts.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_teams.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_party.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_notes.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_datasources.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_paymentMethods.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_marketing.xml"/>
-
-    <!-- eca service chain files -->
-    <service-resource type="eca" loader="main" location="servicedef/secas_contacts.xml"/>
-    <service-resource type="eca" loader="main" location="servicedef/secas_activities.xml"/>
-    
-    <!-- this MCA or mail-condition-action is used for sorting incoming emails -->
-    <service-resource type="mca" loader="main" location="servicedef/smcas.xml"/>
-
-    <!-- These are here for reference, should we ever need them.
-    <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
-    <service-resource type="eca" loader="main" location="servicedef/secas_foo.xml"/>
-    <service-resource type="group" loader="main" location="servicedef/groups_foo.xml"/>
-    -->
-
-   <!-- webapps
-     "location" is the directory of the files for this webapp
-     "mount-point" is where this is mounted for the web server 
-     "base-permission" is the prefix of security permission required for accessing this webapp.  In this case, the user must have
-     CRMSFA_VIEW or CRMSFA_MANAGER permission.
-     "app-bar-display" controls if the application will show up on the OFBIZ app header along with Accounting, Catalog, Order, etc.-->
-    <webapp name="crmsfa"
-        title="CRMSFA"
-        server="default-server"
-        location="webapp/crmsfa"
-        mount-point="/crmsfa"
-        base-permission="CRMSFA"
-        app-bar-display="true"/>
-   <webapp name="crm_images"
-        title="Images for the CRM Application"
-        server="default-server"
-        location="webapp/crm_images" 
-        mount-point="/crm_images"    
-        app-bar-display="false"/>    
-    <webapp name="crm_surveys" 
-    	    title="CRM External Surveys" 
-    	    server="default-server" 
-    	    location="webapp/surveys" 
-    	    mount-point="/surveys"
-    	    app-bar-display="false"/>     
-
-</ofbiz-component>
-
-

Author: hans
Date: 2006-10-01 21:29:27 -0700 (Sun, 01 Oct 2006)
New Revision: 275

Added:
   versions/1.0/branches/emailPayment/
Log:
branch create from version 274

Copied: versions/1.0/branches/emailPayment (from rev 274, versions/1.0/trunk)