Author: akashjain Date: Sat Nov 25 08:46:52 2017 New Revision: 1816270 URL: http://svn.apache.org/viewvc?rev=1816270&view=rev Log: Improved: Fiscal Gl type is reflecting twice in drop-down of Cost Centers, applied patch from jira issue (OFBIZ-9759)
Thanks, Tejas Khanna for reporting the issue and Ritesh Kumar for providing the patch. Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1816270&r1=1816269&r2=1816270&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl Sat Nov 25 08:46:52 2017 @@ -221,7 +221,7 @@ under the License. <#list options as item> <#if multiple?has_content> <option<#if currentValue?has_content && item.selected?has_content> selected="${item.selected}" <#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected" </#if> value="${item.key}">${item.description?replace("\'","'")}</option><#rt/> <#-- replace("\'","'") related to OFBIZ-6504 --> - <#else> + <#elseif item.key?has_content && !(item.key == currentValue)> <option<#if currentValue?has_content && currentValue == item.key && dDFCurrent?has_content && "selected" == dDFCurrent> selected="selected"<#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected"</#if> value="${item.key}">${item.description?replace("\'","'")}</option><#rt/> <#-- replace("\'","'") related to OFBIZ-6504 --> </#if> </#list>