projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better menu entries for tax reports
[freeside.git]
/
httemplate
/
elements
/
tr-input-beginning_ending.html
diff --git
a/httemplate/elements/tr-input-beginning_ending.html
b/httemplate/elements/tr-input-beginning_ending.html
index
8a1dd62
..
2aa5974
100644
(file)
--- a/
httemplate/elements/tr-input-beginning_ending.html
+++ b/
httemplate/elements/tr-input-beginning_ending.html
@@
-11,7
+11,7
@@
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "<% $opt{prefix} %>beginning_text",
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "<% $opt{prefix} %>beginning_text",
- ifFormat: "
%m/%d/%Y<%
$time_format %>",
+ ifFormat: "
<% $date_format.
$time_format %>",
button: "<% $opt{prefix} %>beginning_button",
align: "BR"
<% $input_time %>
button: "<% $opt{prefix} %>beginning_button",
align: "BR"
<% $input_time %>
@@
-30,7
+30,7
@@
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "<% $opt{prefix} %>ending_text",
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "<% $opt{prefix} %>ending_text",
- ifFormat: "
%m/%d/%Y<%
$time_format %>",
+ ifFormat: "
<% $date_format.
$time_format %>",
button: "<% $opt{prefix} %>ending_button",
align: "BR"
<% $input_time %>
button: "<% $opt{prefix} %>ending_button",
align: "BR"
<% $input_time %>
@@
-54,6
+54,10
@@
my $previous_request_count = '';
my %opt = @_;
my %opt = @_;
+my $conf = new FS::Conf;
+
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
$opt{prefix} = '' unless defined $opt{prefix};
$opt{prefix} .= '_' if $opt{prefix};
$opt{prefix} = '' unless defined $opt{prefix};
$opt{prefix} .= '_' if $opt{prefix};