projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FCKeditor 2.6.6
[freeside.git]
/
httemplate
/
elements
/
tr-input-date-field.html
diff --git
a/httemplate/elements/tr-input-date-field.html
b/httemplate/elements/tr-input-date-field.html
index
2a731e1
..
ff4996f
100644
(file)
--- a/
httemplate/elements/tr-input-date-field.html
+++ b/
httemplate/elements/tr-input-date-field.html
@@
-21,8
+21,8
@@
});
</SCRIPT>
});
</SCRIPT>
-
<%init>
<%init>
+
my($name, $value, $label, $format, $usedatetime);
if ( ref($_[0]) ) {
my $opt = shift;
my($name, $value, $label, $format, $usedatetime);
if ( ref($_[0]) ) {
my $opt = shift;
@@
-35,7
+35,10
@@
if ( ref($_[0]) ) {
($name, $value, $label, $format, $usedatetime) = @_;
}
($name, $value, $label, $format, $usedatetime) = @_;
}
-$format = "%m/%d/%Y" unless $format;
+my $conf = new FS::Conf;
+
+$format ||= $conf->config('date_format') || '%m/%d/%Y';
+
$label = $name unless $label;
if ( $value =~ /\S/ ) {
$label = $name unless $label;
if ( $value =~ /\S/ ) {