Author: akashjain
Date: Fri Sep 29 14:15:48 2017
New Revision: 1810103
URL: http://svn.apache.org/viewvc?rev=1810103&view=rev
Log:
Applied fix from trunk for revision: 1810102
===
Fixed: 'Find Opportunities' field name is reflecting in place of 'Opportunity
Id' on FindSalesOpportunity screen, applied patch from jira issue with some
improvements (OFBIZ-9753)
Added opportunityName in search field list as it is showing in the search
result.
Thanks, Parakh Maheshwari and Sonal Patwari for your contribution.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 29 14:15:48 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified:
ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1810103&r1=1810102&r2=1810103&view=diff
==============================================================================
---
ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml
(original)
+++
ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml
Fri Sep 29 14:15:48 2017
@@ -23,8 +23,8 @@ under the License.
<form name="FindSalesOpportunity" type="single"
target="FindSalesOpportunity"
header-row-style="header-row" default-table-style="basic-table">
- <field name="salesOpportunityId"><hidden/></field>
- <field name="opportunityName"
title="${uiLabelMap.SfaFindOpportunities}"><text-find
size="25"></text-find></field>
+ <field name="salesOpportunityId"
title="${uiLabelMap.SfaOpportunityId}"><text-find size="25"></text-find></field>
+ <field name="opportunityName"
title="${uiLabelMap.SfaOpportunityName}"><text-find
size="25"></text-find></field>
<field name="partyId" title="${uiLabelMap.SfaLead}"><lookup
target-form-name="LookupLead"/></field>
<field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}">
<drop-down allow-empty="true">
@@ -51,7 +51,7 @@ under the License.
<set field="opportunityStageId"
from-field="parameters.opportunityStageId"/>
<set field="parameters.opportunityStageId"
value="${groovy:opportunityStageId==null?'SOSTG_CLOSED':opportunityStageId}"/>
<set field="parameters.opportunityStageId_op"
value="${groovy:opportunityStageId==null?'notEqual':'equals'}"/>
- <set field="fieldList"
value="${groovy:['partyId','salesOpportunityId','opportunityStageId','typeEnumId',
'roleTypeId']}" type="List"/>
+ <set field="fieldList"
value="${groovy:['partyId','salesOpportunityId','opportunityStageId','typeEnumId',
'roleTypeId', 'opportunityName']}" type="List"/>
<set field="sortField" from-field="parameters.sortField"
default-value="salesOpportunityId"/>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
