svn commit: r778588 - in /ofbiz/trunk/applications/marketing/widget/sfa: OpportunityScreens.xml forms/OpportunityForms.xml

[ashish-18]

Author: ashish
Date: Tue May 26 07:16:16 2009
New Revision: 778588

URL: http://svn.apache.org/viewvc?rev=778588&view=rev
Log:
Showing LeadParty and Account party on the EditSalesOpportunity screen.

Modified:
    ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=778588&r1=778587&r2=778588&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Tue May 26 07:16:16 2009
@@ -74,11 +74,16 @@
                 <set field="tabButtonItem" value="EditSalesOpportunity"/>
                 <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
                 <entity-one entity-name="SalesOpportunity" value-field="salesOpportunity"/>
-                <service service-name="findPartyInSalesOpportunityRole" result-map="findResult">
+                <service service-name="findPartyInSalesOpportunityRole" result-map="accountPartyResult">
                     <field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
                     <field-map field-name="roleTypeId" value="ACCOUNT"/>
                 </service>
-                <set field="accountPartyId" from-field="findResult.partyId"/>
+                <set field="accountPartyId" from-field="accountPartyResult.partyId"/>
+                <service service-name="findPartyInSalesOpportunityRole" result-map="leadPartyResult">
+                    <field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
+                    <field-map field-name="roleTypeId" value="LEAD"/>
+                </service>
+                <set field="leadPartyId" from-field="leadPartyResult.partyId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=778588&r1=778587&r2=778588&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Tue May 26 07:16:16 2009
@@ -78,8 +78,8 @@
 
         <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}" widget-style="required"><text size="30"/></field>
         
-        <field name="accountPartyId" title="${uiLabelMap.SfaInitialAccount}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="leadPartyId" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="accountPartyId" title="${uiLabelMap.SfaInitialAccount}" widget-style="required"><lookup target-form-name="LookupPartyName" default-value="${accountPartyId}"/></field>
+        <field name="leadPartyId" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupPartyName" default-value="${leadPartyId}"/></field>
         <field name="typeEnumId" title="${uiLabelMap.SfaType}"></field>
         <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}" widget-style="required"><text size="25"></text></field>
         <field name="typeEnumId" position="1" title="${uiLabelMap.SfaType}">