svn commit: r1859985 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/marketing/widget/sfa/forms/AccountForms.xml

Author: jleroux
Date: Sat May 25 14:32:23 2019
New Revision: 1859985

URL: http://svn.apache.org/viewvc?rev=1859985&view=rev
Log:
"Applied fix from trunk for revision: 1859981"
------------------------------------------------------------------------
r1859981 | jleroux | 2019-05-25 16:24:30 +0200 (sam. 25 mai 2019) | 14 lignes

Fixed: Runtime error exceptions at Leads page
(OFBIZ-11059)

Step to recreate issue -

    Login to https://demo-trunk.ofbiz.apache.org/ordermgr/control/main
    Application > SFA
    SFA > Lead Manager
    Leads > Click on All Leads button

Application throw Runtime error exception in My Leads section.

Thanks: Sanjay Yadav for report, Kumar Rahul for the fix and Pierre Smits
for help on Jira issue
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/widget/sfa/forms/AccountForms.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 25 14:32:23 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1859985&r1=1859984&r2=1859985&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/widget/sfa/forms/AccountForms.xml Sat May 25 14:32:23 2019
@@ -137,22 +137,22 @@ under the License.
             <set field="relatedCompanyPartyId" from-field="relatedCompanies[0].partyIdFrom" type="Object"/>
             <set field="existRelationship" from-field="existRelationships[0]"/>
         </row-actions>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;${roleTypeId=='ACCOUNT'}">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;roleTypeId=='ACCOUNT'">
             <hyperlink description="${partyName} [${partyId}]" target="ViewAccountProfile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;${roleTypeId=='CONTACT'}">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;roleTypeId=='CONTACT'">
             <hyperlink description="${partyName} [${partyId}]" target="ViewContactProfile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;${roleTypeId=='LEAD'}">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;roleTypeId=='LEAD'">
             <hyperlink description="${partyName} [${partyId}]" target="ViewLeadProfile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;${roleTypeId=='ACCOUNT_LEAD'}">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&amp;roleTypeId=='ACCOUNT_LEAD'">
             <hyperlink description="${partyName} [${partyId}]" target="ViewAccountLeadProfile">
                 <parameter param-name="partyId"/>
             </hyperlink>