svn commit: r658118 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: mor
Date: Mon May 19 23:24:00 2008 New Revision: 658118 URL: http://svn.apache.org/viewvc?rev=658118&view=rev Log: Patch (SfaMergeLeads.patch) from Jyotsna Rathore for jira issue OFBIZ-1643 (https://issues.apache.org/jira/browse/OFBIZ-1643) Added: ofbiz/trunk/applications/marketing/webapp/sfa/lead/ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (with props) Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Mon May 19 23:24:00 2008 @@ -1149,6 +1149,9 @@ <property key="SfaCanNotMergeSameContact"> <value xml:lang="en">Failed to merge contacts. You have selected same contact to merge.</value> </property> + <property key="SfaCanNotMergeSameLeads"> + <value xml:lang="en">Failed to merge Leads. You have selected same Lead to merge.</value> + </property> <property key="SfaCompetitors"> <value xml:lang="en">Competitors & Partners </value> </property> @@ -1221,8 +1224,8 @@ <property key="SfaMergeContacts"> <value xml:lang="en">Merge Contacts</value> </property> - <property key="SfaMergeParty"> - <value xml:lang="en">Merge Party</value> + <property key="SfaMergeLeads"> + <value xml:lang="en">Merge Leads</value> </property> <property key="SfaNewOpportunity"> <value xml:lang="en">Create New Opportunity</value> @@ -1230,6 +1233,9 @@ <property key="SfaNextStep"> <value xml:lang="en">Next Step</value> </property> + <property key="SfaNoLeadsSelectedToMerged"> + <value xml:lang="en">No leads selected to merge</value> + </property> <property key="SfaOpportunities"> <value xml:lang="en">Opportunities</value> </property> Modified: ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml (original) +++ ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml Mon May 19 23:24:00 2008 @@ -60,4 +60,14 @@ <Enumeration description="URL Parameter" enumCode="URL_PARAM" enumId="TKCDSRC_URL_PARAM" sequenceId="01" enumTypeId="TRACKINGCODE_SRC"/> <DataSourceType dataSourceTypeId="LEAD_SOURCE" description="Lead Source"/> + + <StatusType parentTypeId="PARTY_STATUS" hasTable="" statusTypeId="LEAD_STATUS" description="Lead Status"/> + <StatusItem description="Assigned" sequenceId="01" statusCode="ASSIGNED" statusId="LEAD_ASSIGNED" statusTypeId="LEAD_STATUS"/> + <StatusItem description="Converted" sequenceId="02" statusCode="CONVERTED" statusId="LEAD_CONVERTED" statusTypeId="LEAD_STATUS"/> + <StatusItem description="Qualified" sequenceId="03" statusCode="QUALIFIED" statusId="LEAD_QUALIFIED" statusTypeId="LEAD_STATUS"/> + + <StatusValidChange condition="" statusId="PARTY_ENABLED" statusIdTo="LEAD_ASSIGNED" transitionName="Assigned"/> + <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="LEAD_CONVERTED" transitionName="Converted"/> + <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="LEAD_QUALIFIED" transitionName="Qualified"/> + </entity-engine-xml> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Mon May 19 23:24:00 2008 @@ -37,6 +37,10 @@ <set field="partyRelationshipContext.roleTypeIdTo" value="LEAD"/> <set field="partyRelationshipContext.partyRelationshipTypeId" value="LEAD_OWNER"/> <call-service service-name="createPartyRelationship" in-map-name="partyRelationshipContext"/> + + <set field="updatePartyCtx.partyId" from-field="partyId"/> + <set field="updatePartyCtx.statusId" value="LEAD_ASSIGNED"/> + <call-service service-name="setPartyStatus" in-map-name="updatePartyCtx"/> </if-not-empty> <!-- Now create PartyGroup corresponding to the companyName, if its not null and then set up relationship of Person and PartyGroup as Employee and title --> <if-not-empty field-name="parameters.groupName"> @@ -126,6 +130,9 @@ <set field="partyRelationshipCtx.roleTypeIdTo" value="CONTACT"/> <set field="partyRelationshipCtx.partyRelationshipTypeId" value="CONTACT_REL"/> <call-service service-name="createPartyRelationship" in-map-name="partyRelationshipCtx"/> - </if-empty> + </if-empty> + <set field="updatePartyCtx.partyId" from-field="leadPartyId"/> + <set field="updatePartyCtx.statusId" value="LEAD_CONVERTED"/> + <call-service service-name="setPartyStatus" in-map-name="updatePartyCtx"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Mon May 19 23:24:00 2008 @@ -113,7 +113,16 @@ <response name="success" type="view" value="viewLead"/> <response name="error" type="view" value="FindLeads"/> </request-map> - + <request-map uri="MergeLeads"> + <security https="true" auth="true"/> + <response name="success" type="view" value="MergeLeads"/> + </request-map> + <request-map uri="mergeLeads"> + <security https="true" auth="true"/> + <event type="service" invoke="mergeLeads"/> + <response name="success" type="view" value="viewprofile"/> + <response name="error" type="view" value="MergeLeads"/> + </request-map> <!-- Contact Requests --> <request-map uri="FindContacts"> <security https="true" auth="true"/> @@ -159,7 +168,8 @@ <view-map name="CreateLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#CreateLead"/> <view-map name="CloneLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#CloneLead"/> <view-map name="ConvertLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#ConvertLead"/> - + <view-map name="MergeLeads" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#MergeLeads"/> + <view-map name="FindContacts" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#FindContacts"/> <view-map name="CreateContact" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#CreateContact"/> <view-map name="MergeContacts" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#MergeContacts"/> Added: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=658118&view=auto ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (added) +++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Mon May 19 23:24:00 2008 @@ -0,0 +1,122 @@ +<div class="screenlet"> +<div class="screenlet-title-bar"><h3>${uiLabelMap.SfaMergingFollowing} ${uiLabelMap.SfaMergeLeads}</h3></div> +<div class="screenlet-body"> + <form method="post" action="<@ofbizUrl>mergeContacts</@ofbizUrl>" class="basic-form"> + <table border="0" width="100%" > + <tr> + <td> + <#if contactInfoList?has_content > + <#assign contactInfo1 = contactInfoList[0]/> + <#assign contactInfo2 = contactInfoList[1]/> + <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId?if_exists}"> + <input type="hidden" name="partyId" value="${contactInfo2.partyId?if_exists}"> + + <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId?if_exists}"> + <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId?if_exists}"> + <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId?if_exists}"> + + <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId?if_exists}"> + <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId?if_exists}"> + <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}"> + + <table align="left" > + <tr width="100%"> + <td width="20%" ></td> + <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br/></b></td> + <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br/></b></td> + <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td> + <br/><br/> + </tr> + <tr width="100%"> + <td width="20%">${uiLabelMap.CommonFirstName?if_exists}</td> + <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td> + <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td> + <td width="20%"></td> + </tr> + <tr width="100%"> + <td width="20%">${uiLabelMap.CommonLastName?if_exists}</td> + <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> + <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> + <td width="20%"></td> + </tr><br/> + <tr> + <td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress?if_exists}</h3></td> + <td width="30"></td> + <tr> + <td width="20%" >${uiLabelMap.CommonAddress1?if_exists}</td> + <td width="30%">${contactInfo1.address1?if_exists}</td> + <td width="30%">${contactInfo2.address1?if_exists}</td> + <td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td> + </tr> + + <tr> + <td width="20%" >${uiLabelMap.CommonAddress2?if_exists}</td> + <td width="30%">${contactInfo1.address2?if_exists}</td> + <td width="30%">${contactInfo2.address2?if_exists}</td> + <td width="20%"></td> + </tr> + + <tr> + <td width="20%" >${uiLabelMap.CommonCity?if_exists}</td> + <td width="30%">${contactInfo1.city?if_exists}</td> + <td width="30%">${contactInfo2.city?if_exists}</td> + <td width="20%"></td> + </tr> + <tr> + <td width="20%">${uiLabelMap.CommonState?if_exists}</td> + <td width="30%">${contactInfo1.state?if_exists}</td> + <td width="30%">${contactInfo2.state?if_exists}</td> + <td width="20%"></td> + </tr> + <tr> + <td width="20%">${uiLabelMap.CommonZipPostalCode?if_exists}</td> + <td width="30%">${contactInfo1.postalCode?if_exists}</td> + <td width="30%">${contactInfo2.postalCode?if_exists}</td> + <td width="20%"></td> + </tr> + <tr> + <td width="20%" >${uiLabelMap.CommonCountry?if_exists}</td> + <td width="30%">${contactInfo1.country?if_exists}</td> + <td width="30%">${contactInfo2.country?if_exists}</td> + <td width="20%"></td> + </tr><br/> + <tr><td><br/><h3>${uiLabelMap.PartyPrimaryPhone?if_exists}</h3></td></tr> + <tr> + <td width="20%">${uiLabelMap.PartyCountryCode?if_exists}</td> + <td width="30%">${contactInfo1.countryCode?if_exists}</td> + <td width="30%">${contactInfo2.countryCode?if_exists}</td> + <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> + </tr> + <tr> + <td width="20%" >${uiLabelMap.PartyAreaCode?if_exists}</td> + <td width="30%">${contactInfo1.areaCode?if_exists}</td> + <td width="30%">${contactInfo2.areaCode?if_exists}</td> + <td width="20%"></td> + </tr> + <tr> + <td width="20%" >${uiLabelMap.PartyPhoneNumber?if_exists}</td> + <td width="30%">${contactInfo1.contactNumber?if_exists}</td> + <td width="30%">${contactInfo2.contactNumber?if_exists}</td> + <td width="20%"></td> + </tr> + <tr> + <td width="20%" >${uiLabelMap.CommonEmail?if_exists}</td> + <td width="30%">${contactInfo1.primaryEmail?if_exists}</td> + <td width="30%">${contactInfo2.primaryEmail?if_exists}</td> + <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> + </tr> + <tr> + <td colspan="4" align="center"><br/> + <input type="submit" value="submit"/> + </td> + </tr> + </table> + <#else> + <h3>${uiLabelMap.SfaNoLeadsSelectedToMerged?if_exists}</h3> + </#if> + </td> + </tr> + </table> + </form> +</div> +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Mon May 19 23:24:00 2008 @@ -179,4 +179,27 @@ </widgets> </section> </screen> + <screen name="CommonLeadDecorator"> + <section> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <section> + <widgets> + <include-menu name="LeadTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> + </widgets> + </section> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ProjectMgrViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Mon May 19 23:24:00 2008 @@ -29,11 +29,10 @@ <service service-name="findParty" auto-field-map="true"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <widgets> - <container><link target="CreateLead" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}" style="buttontext"/></container> <section> <widgets> <platform-specific> @@ -79,7 +78,7 @@ <set field="tabButtonItem" value="Leads"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar boxhead"> @@ -105,7 +104,7 @@ <screen name="ConvertLead"> <section> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar boxhead"> @@ -134,7 +133,7 @@ <script location="component://marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar boxhead"> @@ -157,4 +156,40 @@ </widgets> </section> </screen> + <screen name="MergeLeads"> + <section> + <actions> + <set field="tabButtonItem" value="Leads"/> + <script location="component://marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh"/> + </actions> + <widgets> + <decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"><label text="${uiLabelMap.SfaMergeLeads}"/></container> + </container> + <container style="screenlet-body"> + <label><br/></label> + <include-form name="MergeLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/> + </container> + </container> + <section> + <condition> + <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="parameters.partyIdTo"/> + </condition> + <widgets> + <platform-specific> + <html><html-template location="component://marketing/webapp/sfa/lead/mergeLeads.ftl"/></html> + </platform-specific> + </widgets> + <fail-widgets> + <label text="${uiLabelMap.SfaCanNotMergeSameLeads}" style="h3"></label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Mon May 19 23:24:00 2008 @@ -49,12 +49,20 @@ </menu> <menu name="LeadTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> + <menu-item name="CreateLead" title="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}"> + <link target="CreateLead"/> + </menu-item> <menu-item name="convertLead" title="${uiLabelMap.SfaConvertLead}"> + <condition><not><if-empty field-name="parameters.partyId"/></not></condition> <link target="ConvertLead?leadPartyId=${parameters.partyId}"/> </menu-item> <menu-item name="CloneLead" title="${uiLabelMap.SfaCloneLead}"> + <condition><not><if-empty field-name="parameters.partyId"/></not></condition> <link target="CloneLead?leadPartyId=${parameters.partyId}"/> </menu-item> + <menu-item name="MergeLeads" title="${uiLabelMap.SfaMergeLeads}"> + <link target="MergeLeads"/> + </menu-item> </menu> <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Mon May 19 23:24:00 2008 @@ -71,7 +71,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="MergeContacts" type="single" target="MergeContacts"> - <field name="partyIdFrom" title="${uiLabelMap.SfaMergeParty}" position="1"> + <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="1"> <drop-down allow-empty="false"> <list-options list-name="partyList" key-name="contact.partyId" list-entry-name="contact" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${contact.partyId}", false)} [${contact.partyId}]"/> </drop-down> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=658118&r1=658117&r2=658118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Mon May 19 23:24:00 2008 @@ -23,9 +23,6 @@ <form name="ListLeads" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindLead" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <row-actions> - <entity-one entity-name="PartyGroup" value-name="partyGroup"> - <field-map field-name="partyId" env-name="partyRow.partyId"/> - </entity-one> <entity-one entity-name="Person" value-name="person"> <field-map field-name="partyId" env-name="partyRow.partyId"/> </entity-one> @@ -36,8 +33,8 @@ <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <hyperlink target="viewprofile?partyId=${partyRow.partyId}&roleTypeId=LEAD" description="${partyRow.partyId}" target-type="inter-app"/> </field> - <field name="partyName" title="${uiLabelMap.PartyName}" use-when="partyGroup != null"><display description="${partyGroup.groupName}"/></field> - <field name="partyName" title="${uiLabelMap.PartyName}" use-when="person != null"><display description="${person.lastName}, ${person.firstName}"/></field> + <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"><display description=""/></field> <field name="partyTypeId" title="${uiLabelMap.PartyType}"><display description="${partyType.description}"/> </field> </form> @@ -95,4 +92,23 @@ </field> <field name="submitButton"><submit button-type="button"/></field> </form> + <form name="MergeLeads" type="single" target="MergeLeads"> + <actions> + <set field="roleTypeId" value="LEAD"/> + <set field="partyTypeId" value="PERSON"/> + <set field="lookupFlag" value="Y"/> + <service service-name="findParty" auto-field-map="true"/> + </actions> + <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="1"> + <drop-down allow-empty="false"> + <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${lead.partyId}", false)} [${lead.partyId}]"/> + </drop-down> + </field> + <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="2"> + <drop-down allow-empty="false"> + <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${lead.partyId}", false)} [${lead.partyId}]"/> + </drop-down> + </field> + <field name="submitButton" position="3" title="${uiLabelMap.SfaMergeleads}" widget-style="buttontext" tooltip-style="button-text"><submit button-type="text-link"/></field> + </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |