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

[hansbak-2]

Author: hansbak
Date: Fri Dec  2 02:56:42 2011
New Revision: 1209341

URL: http://svn.apache.org/viewvc?rev=1209341&view=rev
Log:
In the sfa opportunity detail screen show all partygroups in the account selection and all persons in the lead field also allow ajax drop down

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

Modified: ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml?rev=1209341&r1=1209340&r2=1209341&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml Fri Dec  2 02:56:42 2011
@@ -28,10 +28,14 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="queryString" from-field="result.queryString"/>
                 <set field="partyRelationshipTypeId" value="LEAD_OWNER"/>
                 <set field="title" value="${uiLabelMap.SfaFindLeads}"/>
                 <set field="partyTypeId" value="PERSON"/>
                 <set field="currentUrl" value="LookupLeads"/>
+                <set field="entityName" value="PartyRoleAndContactMechDetail"/>
+                <set field="searchFields" value="[partyId, firstName, lastName, middleName, groupName]"/>
+                <set field="searchDistinct" value="true"/>
                 <service service-name="findParty" auto-field-map="true"/>
             </actions>
             <widgets>
@@ -53,10 +57,14 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="queryString" from-field="result.queryString"/>
                 <set field="partyRelationshipTypeId" value="ACCOUNT"/>
                 <set field="title" value="${uiLabelMap.SfaFindAccounts}"/>
                 <set field="partyTypeId" value="PARTY_GROUP"/>
                 <set field="currentUrl" value="LookupAccounts"/>
+                <set field="entityName" value="PartyRoleAndContactMechDetail"/>
+                <set field="searchFields" value="[partyId, firstName, lastName, middleName, groupName]"/>
+                <set field="searchDistinct" value="true"/>
                 <service service-name="findParty" auto-field-map="true"/>
             </actions>
             <widgets>
@@ -78,10 +86,14 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="queryString" from-field="result.queryString"/>
                 <set field="partyRelationshipTypeId" value="ACCOUNT"/>
                 <set field="title" value="${uiLabelMap.SfaFindAccountLeads}"/>
                 <set field="partyTypeId" value="PARTY_GROUP"/>
                 <set field="currentUrl" value="LookupAccountLeads"/>
+                <set field="entityName" value="PartyRoleAndContactMechDetail"/>
+                <set field="searchFields" value="[partyId, firstName, lastName, middleName, groupName]"/>
+                <set field="searchDistinct" value="true"/>
                 <service service-name="findParty" auto-field-map="true"/>
             </actions>
             <widgets>

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=1209341&r1=1209340&r2=1209341&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Fri Dec  2 02:56:42 2011
@@ -138,10 +138,10 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="accountPartyId" use-when="communicationEvent==null" title="${uiLabelMap.SfaInitialAccount}" ><lookup target-form-name="LookupAccounts" default-value="${accountPartyId}"/></field>
-        <field name="accountPartyId" use-when="communicationEvent!=null" title="${uiLabelMap.SfaInitialAccount}" ><lookup target-form-name="LookupAccounts" default-value="${accountPartyId}"/></field>
-        <field name="leadPartyId" use-when="communicationEvent==null" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupLeads" default-value="${leadPartyId}"/></field>
-        <field name="leadPartyId" use-when="communicationEvent!=null" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupLeads" default-value="${communicationEvent.partyIdFrom}"/></field>
+        <field name="accountPartyId" use-when="communicationEvent==null" title="${uiLabelMap.SfaInitialAccount}" ><lookup target-form-name="LookupPartyGroup" default-value="${accountPartyId}"/></field>
+        <field name="accountPartyId" use-when="communicationEvent!=null" title="${uiLabelMap.SfaInitialAccount}" ><lookup target-form-name="LookupPartyGroup" default-value="${accountPartyId}"/></field>
+        <field name="leadPartyId" use-when="communicationEvent==null" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupPerson" default-value="${leadPartyId}"/></field>
+        <field name="leadPartyId" use-when="communicationEvent!=null" title="${uiLabelMap.SfaLead}" widget-style="required"><lookup target-form-name="LookupPerson" default-value="${communicationEvent.partyIdFrom}"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" use-when="salesOpportunity==null"><submit button-type="button"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="salesOpportunity!=null"><submit button-type="button"/></field>
     </form>