Tag for release 12.04.04
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/tags/REL-12.04.04@1616797 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar b/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
index 325207b..2f8dda2 100644
--- a/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
+++ b/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
Binary files differ
diff --git a/framework/widget/templates/htmlFormMacroLibrary.ftl b/framework/widget/templates/htmlFormMacroLibrary.ftl
index e24aa78..ceda2d8 100644
--- a/framework/widget/templates/htmlFormMacroLibrary.ftl
+++ b/framework/widget/templates/htmlFormMacroLibrary.ftl
@@ -171,7 +171,7 @@
jQuery("#${id}").datetimepicker({
showSecond: true,
<#-- showMillisec: true, -->
- timeFormat: 'hh:mm:ss',
+ timeFormat: 'HH:mm:ss',
stepHour: 1,
stepMinute: 1,
stepSecond: 1,
@@ -471,7 +471,7 @@
jQuery("#${name?html}_fld0_value").datetimepicker({
showSecond: true,
<#-- showMillisec: true, -->
- timeFormat: 'hh:mm:ss',
+ timeFormat: 'HH:mm:ss',
stepHour: 1,
stepMinute: 5,
stepSecond: 10,
@@ -507,7 +507,7 @@
jQuery("#${name?html}_fld1_value").datetimepicker({
showSecond: true,
<#-- showMillisec: true, -->
- timeFormat: 'hh:mm:ss',
+ timeFormat: 'HH:mm:ss',
stepHour: 1,
stepMinute: 5,
stepSecond: 10,
