svn commit: r653683 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: apatel
Date: Mon May 5 23:06:54 2008 New Revision: 653683 URL: http://svn.apache.org/viewvc?rev=653683&view=rev Log: Fixing the problems in CreateLead form. Moving towards creating Lead that works for company and has some title. Still Incomplete improvements, does not break anything else. Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml ofbiz/trunk/applications/marketing/servicedef/services.xml ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.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=653683&r1=653682&r2=653683&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Mon May 5 23:06:54 2008 @@ -406,8 +406,8 @@ <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸§</value> <value xml:lang="zh">æ¥æèå´</value> </property> - <property key="MarketingEmployees"> - <value xml:lang="en">Employees</value> + <property key="MarketingNoOfEmployees"> + <value xml:lang="en">No of Employees</value> </property> <property key="MarketingFindAccounts"> <value xml:lang="en">Find SFA Accounts</value> @@ -1176,11 +1176,8 @@ <property key="SfaInitialStage"> <value xml:lang="en">Initial Stage</value> </property> - <property key="SfaLeadGroup"> - <value xml:lang="en">Lead Group</value> - </property> - <property key="SfaLeadPerson"> - <value xml:lang="en">Lead Person</value> + <property key="SfaLead"> + <value xml:lang="en">Lead</value> </property> <property key="SfaLeads"> <value xml:lang="en">Leads</value> 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=653683&r1=653682&r2=653683&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 5 23:06:54 2008 @@ -37,8 +37,8 @@ <set field="partyRelationshipContext.partyIdFrom" from-field="parameters.partyIdFrom"/> <set field="partyRelationshipContext.partyIdTo" from-field="partyId"/> <set field="partyRelationshipContext.roleTypeIdFrom" value="LEAD"/> - <set field="partyRelationshipContext.roleTypeIdTo" value="LEAD"/> - <set field="partyRelationshipContext.partyRelationshipTypeId" value="GROUP_ROLLUP"/> + <set field="partyRelationshipContext.roleTypeIdTo" value="OWNER"/> + <set field="partyRelationshipContext.partyRelationshipTypeId" value="LEAD_OWNER"/> <call-service service-name="createPartyRelationship" in-map-name="partyRelationshipContext"/> </if-not-empty> </if-compare> Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=653683&r1=653682&r2=653683&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/servicedef/services.xml (original) +++ ofbiz/trunk/applications/marketing/servicedef/services.xml Mon May 5 23:06:54 2008 @@ -392,9 +392,6 @@ <auto-attributes entity-name="Person" mode="IN" optional="true"> <exclude field-name="partyId"/> </auto-attributes> - <auto-attributes entity-name="PartyGroup" mode="IN" optional="true"> - <exclude field-name="partyId"/> - </auto-attributes> <auto-attributes entity-name="PostalAddress" mode="IN" optional="true"> <exclude field-name="contactMechId"/> </auto-attributes> @@ -403,8 +400,10 @@ </auto-attributes> <attribute name="partyId" type="String" mode="OUT" /> <attribute name="emailAddress" type="String" mode="IN" optional="true"/> + <attribute name="companyName" type="String" mode="IN" optional="true"/> + <attribute name="title" type="String" mode="IN" optional="true"/> + <attribute name="numEmployees" type="String" mode="IN" optional="true"/> <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/> - <attribute name="leadType" type="String" mode="IN" optional="false"/><!-- can be PERSON OR GROUP --> <attribute name="leadSource" type="String" mode="IN" optional="true"/> </service> <service name="createContact" engine="simple" Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=653683&r1=653682&r2=653683&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Mon May 5 23:06:54 2008 @@ -35,7 +35,7 @@ <set field="tabButtonItem" value=""/> </actions> <widgets> - <container><link target="CreateLead?leadType=PERSON" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadPerson}" style="buttontext"/><link target="CreateLead?leadType=GROUP" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadGroup}" style="buttontext"/></container> + <container><link target="CreateLead" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}" style="buttontext"/></container> <section> <widgets> <platform-specific> @@ -88,15 +88,9 @@ <container style="screenlet-title-bar"> <container style="h3"> <section> - <condition> - <if-compare value="PERSON" field-name="leadType" operator="equals"/> - </condition> <widgets> - <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadPerson}"/> + <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}"/> </widgets> - <fail-widgets> - <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadGroup}"/> - </fail-widgets> </section> </container> </container> 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=653683&r1=653682&r2=653683&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Mon May 5 23:06:54 2008 @@ -42,13 +42,13 @@ </form> <form name="createLead" type="single" target="createLead" header-row-style="header-row" default-table-style="basic-table"> - <field name="leadType"><hidden value="${leadType}"/></field> - <field name="firstName" use-when="leadType.equals("PERSON")" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> - <field name="lastName" use-when="leadType.equals("PERSON")" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> - <field name="suffix" use-when="leadType.equals("PERSON")"><text/></field> - <field name="groupName" use-when="leadType.equals("GROUP")" title="${uiLabelMap.PartyGroupName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> - <field name="numEmployees" use-when="leadType.equals("GROUP")" title="${uiLabelMap.MarketingEmployees}"><text size="30"/></field> - <field name="siteName" use-when="leadType.equals("GROUP")" title="${uiLabelMap.FormFieldTitle_officeSiteName}"><text size="30" maxlength="60"/></field> + <field name="firstName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> + <field name="lastName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> + <field name="suffix"><text/></field> + <field name="companyName"><text/></field> + <field name="title"><text/></field> + <field name="numEmployees" title="${uiLabelMap.MarketingNoOfEmployees}"><text size="30"/></field> + <field name="siteName" title="${uiLabelMap.FormFieldTitle_officeSiteName}"><text size="30" maxlength="60"/></field> <field name="postalAddressTitle" title="${uiLabelMap.PartyGeneralCorrespondenceAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="address1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="50" maxlength="60"/></field> <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="50" maxlength="60"/></field> @@ -79,15 +79,6 @@ <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="50" maxlength="60"/></field> <field name="leadSourceTitle" title="${uiLabelMap.SfaLeadSource}" title-area-style="group-label"><display/></field> <field name="leadSource" title="${uiLabelMap.SfaLeadSource}"><text size="50" maxlength="60"/></field> - <field name="leadGroupTitle" title="${uiLabelMap.SfaLeadGroup}" use-when="leadType.equals("PERSON")" title-area-style="group-label"><display/></field> - <field name="partyIdFrom" title="Lead Group" use-when="leadType.equals("PERSON")"> - <drop-down allow-empty="true"> - <entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} [${partyId}]" key-field-name="partyId"> - <entity-constraint name="roleTypeId" operator="equals" value="LEAD"/> - <entity-constraint name="partyTypeId" operator="equals" value="PARTY_GROUP"/> - </entity-options> - </drop-down> - </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |