svn commit: r660128 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: mor
Date: Mon May 26 01:49:55 2008 New Revision: 660128 URL: http://svn.apache.org/viewvc?rev=660128&view=rev Log: Improvement in find screen for Lead, Contact. Patch from Jyotsna Rathore. Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.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 Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=660128&r1=660127&r2=660128&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Mon May 26 01:49:55 2008 @@ -35,7 +35,10 @@ <service service-name="findParty" auto-field-map="true"/> </actions> <widgets> - <!--include-menu name="ContactTabBar" location="component://marketing/widget/sfa/SfaMenus.xml" /--> + <container style="button-bar button-style-2"> + <link target="CreateContact" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/> + <link target="CreateContactFromVCard" text="${uiLabelMap.SfaCreateContactFromVCard}" style="buttontext"/> + </container> <platform-specific> <html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html> </platform-specific> @@ -50,11 +53,6 @@ </condition> <widgets> <include-form name="ListContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> - <label text="&nbsp;<br/><br/>"/> - <container style="h3"> - <label text="${uiLabelMap.SfaMergeContacts}"/> - </container> - <include-form name="MergeContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> </widgets> <fail-widgets> <container style="h3"> @@ -110,6 +108,17 @@ <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.SfaMergeContacts}"/> + </container> + </container> + <container style="screenlet-body"> + <label><br/></label> + <include-form name="MergeContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> <container style="h3"><label text="${uiLabelMap.SfaMergeContacts}"/></container> </container> <container style="screenlet-body"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=660128&r1=660127&r2=660128&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Mon May 26 01:49:55 2008 @@ -33,6 +33,10 @@ <decorator-section name="body"> <section> <widgets> + <container style="button-bar button-style-2"> + <link target="CreateLead" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/> + <link target="CreateLeadFromVCard" text="${uiLabelMap.SfaImportLead}" style="buttontext"/> + </container> <section> <widgets> <platform-specific> Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=660128&r1=660127&r2=660128&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Mon May 26 01:49:55 2008 @@ -49,12 +49,6 @@ </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="CreateLeadFromVCard" title="${uiLabelMap.SfaImportLead}"> - <link target="CreateLeadFromVCard"/> - </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}"/> @@ -69,11 +63,8 @@ </menu> <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> - <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}"> - <link target="CreateContact"/> - </menu-item> - <menu-item name="createContactFromVCard" title="${uiLabelMap.SfaCreateContactFromVCard}"> - <link target="CreateContactFromVCard"/> + <menu-item name="MergeContacts" title="${uiLabelMap.SfaMergeContacts}"> + <link target="MergeContacts"/> </menu-item> </menu> </menus> 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=660128&r1=660127&r2=660128&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Mon May 26 01:49:55 2008 @@ -74,12 +74,18 @@ <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.AccountingFromParty}" position="1"> + <actions> + <set field="roleTypeId" value="CONTACT"/> + <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="contact.partyId" list-entry-name="contact" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${contact.partyId}", false)} [${contact.partyId}]"/> </drop-down> </field> - <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="2"> + <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="2"> <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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |