Author: jleroux Date: Sat Jan 31 14:36:37 2015 New Revision: 1656199 URL: http://svn.apache.org/r1656199 Log: "Applied fix from trunk for revision: 1656198" ------------------------------------------------------------------------ r1656198 | jleroux | 2015-01-31 15:35:32 +0100 (sam. 31 janv. 2015) | 2 lignes
Fixes a trivial bug introduced by Nicolas at r1649965 for OFBIZ-5905 Reported by Eduardo Arellano at https://issues.apache.org/jira/browse/OFBIZ-6049 "Error on Convert Lead" ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/LeadForms.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 31 14:36:37 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1655046,1655668,1655979,1656185 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1655046,1655668,1655979,1656185,1656198 Modified: ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1656199&r1=1656198&r2=1656199&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Jan 31 14:36:37 2015 @@ -85,7 +85,7 @@ under the License. </field> <field name="partyGroupId" title="${uiLabelMap.SfaAccountName}" tooltip="${uiLabelMap.SfaSelectExistingAccountOrLeaveBlankToCreateNew}" use-when="parameters.get("partyGroupId")=="""> <drop-down allow-empty="true" current-description=""> - <entity-options entity-name="PartyRole" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${partyId}", false)} : [${partyId}]" key-field-name="partyId"> + <entity-options entity-name="PartyRole" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false)} : [partyId]" key-field-name="partyId"> <entity-constraint name="roleTypeId" operator="equals" value="ACCOUNT"/> </entity-options> </drop-down>
