[ofbiz-framework] branch trunk updated: Fixed: Issue in rendering Comparitive balance sheet pdf (OFBIZ-12151), and Exporting the PDF for Cash Flow Statement displays the macro code for the date fields (OFBIZ-12155)

[James Yong-2]

This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new d7d424f  Fixed: Issue in rendering Comparitive balance sheet pdf (OFBIZ-12151), and Exporting the PDF for Cash Flow Statement displays the macro code for the date fields (OFBIZ-12155)
d7d424f is described below

commit d7d424fafd5900a9e20debbe2580a8b042e45da8
Author: James Yong <[hidden email]>
AuthorDate: Sun Jan 24 10:27:42 2021 +0800

    Fixed: Issue in rendering Comparitive balance sheet pdf (OFBIZ-12151), and Exporting the PDF for Cash Flow Statement displays the macro code for the date fields (OFBIZ-12155)
   
    Bug introduced when fixing OFBIZ-12097
   
    Thanks: Lalit for reporting OFBIZ-12151; Ankit, OFBIZ-12155. Jacques for linking the issues.
---
 themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index 22f1584..0759433 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -55,7 +55,7 @@ under the License.
 
 <#macro renderTextareaField name className alert cols rows maxlength id readonly value visualEditorEnable language buttons tabindex language="" disabled=""><@makeBlock className value /></#macro>
 
-<#macro renderDateTimeField name className alert title value size maxlength step timeValues id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues="" tabindex="" disabled=""><@makeBlock className value /></#macro>
+<#macro renderDateTimeField name className alert title value size maxlength step timeValues id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues="" tabindex="" disabled="" isXMLHttpRequest=""><@makeBlock className value /></#macro>
 
 <#macro renderDropDownField name className alert id multiple formName otherFieldName event action size explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex firstInList="" currentValue="" disabled="">
 <#if currentValue?has_content && firstInList?has_content>