projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix time in payment and credit back-dating, RT#32320
[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
40162f0
..
ff98551
100644
(file)
--- a/
httemplate/elements/tr-input-date-field.html
+++ b/
httemplate/elements/tr-input-date-field.html
@@
-26,7
+26,7
@@
Example:
<TR>
<TD ALIGN="right"><% $label %></TD>
<TR>
<TD ALIGN="right"><% $label %></TD>
- <TD>
+ <TD
COLSPAN=<% $colspan %>
>
<INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name %>_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
</TD>
<INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name %>_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
</TD>
@@
-38,12
+38,17
@@
Example:
ifFormat: "<% $format %>",
button: "<% $name %>_button",
align: "BR"
ifFormat: "<% $format %>",
button: "<% $name %>_button",
align: "BR"
+% if ( $format =~ /\%r/ ) {
+ ,
+ showsTime: true,
+ timeFormat: 12
+% }
});
</SCRIPT>
<%init>
});
</SCRIPT>
<%init>
-my($name, $value, $label, $format, $usedatetime, $noinit);
+my($name, $value, $label, $format, $usedatetime, $noinit
, $colspan
);
if ( ref($_[0]) ) {
my $opt = shift;
$name = $opt->{'name'};
if ( ref($_[0]) ) {
my $opt = shift;
$name = $opt->{'name'};
@@
-52,8
+57,10
@@
if ( ref($_[0]) ) {
$format = $opt->{'format'};
$usedatetime = $opt->{'usedatetime'};
$noinit = $opt->{'noinit'};
$format = $opt->{'format'};
$usedatetime = $opt->{'usedatetime'};
$noinit = $opt->{'noinit'};
+ $colspan = $opt->{'colspan'} || 1;
} else {
($name, $value, $label, $format, $usedatetime) = @_;
} else {
($name, $value, $label, $format, $usedatetime) = @_;
+ $colspan = 1;
}
my $conf = new FS::Conf;
}
my $conf = new FS::Conf;