OFBiz › OFBiz - Commits

svn commit: r661619 - in /ofbiz/trunk/applications/marketing/widget/sfa: CommonScreens.xml forms/LeadForms.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r661619 - in /ofbiz/trunk/applications/marketing/widget/sfa: CommonScreens.xml forms/LeadForms.xml

Author: hansbak
Date: Fri May 30 02:44:46 2008
New Revision: 661619

URL: http://svn.apache.org/viewvc?rev=661619&view=rev
Log:
show related partygroup of a lead in the lead profile

Modified:
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=661619&r1=661618&r2=661619&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri May 30 02:44:46 2008
@@ -225,7 +225,10 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="leadDescription"/></not>
+ <or>
+ <not><if-empty field-name="leadDescription"/></not>
+ <not><if-empty field-name="accountLeadDescription"/></not>
+ </or>
</condition>
<actions>
<set field="headerItem" value="Leads"/>
@@ -292,11 +295,28 @@
</section>
<section>
<condition>
- <not><if-empty field-name="leadDescription"/></not>
+ <or>
+ <not><if-empty field-name="leadDescription"/></not>
+ <not><if-empty field-name="accountLeadDescription"/></not>
+ </or>
</condition>
<widgets>
<container style="profile-left">
<include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <section>
+ <actions>
+ <entity-one entity-name="PartyGroup" value-name="lookupGroup">
+ <field-map field-name="partyId" env-name="partyGroupId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template location="component://party/webapp/partymgr/party/profileblocks/Party.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
<include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
</container>
<container style="profile-right">

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=661619&r1=661618&r2=661619&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Fri May 30 02:44:46 2008
@@ -33,7 +33,7 @@
<set field="statusId" from-field="partyRow.statusId"/>
</row-actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
- <hyperlink target="viewprofile?partyId=${partyRow.partyId}&roleTypeId=LEAD" description="${partyRow.partyId}" target-type="inter-app"/>
+ <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}" target-type="inter-app"/>
</field>
<field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>