diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-07-11 16:52:02 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-07-11 17:34:04 -0400 |
| commit | 14e9d4f4927bb71ab3ca6f368fb11f0e40cf1bf9 (patch) | |
| tree | 503cafa89a03b1d6c8eab3ff73c9297919e06a4d /httemplate/elements | |
| parent | ecac079f31f3b96160b4ea480fbb735e34f8ce28 (diff) | |
RT# 74666 - updated some UI and description field location.
Conflicts:
httemplate/search/quotation.html
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/quotations.html | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/httemplate/elements/quotations.html b/httemplate/elements/quotations.html index a6dd373a7..1c737afa7 100644 --- a/httemplate/elements/quotations.html +++ b/httemplate/elements/quotations.html @@ -10,10 +10,12 @@ % my $bgcolor = ''; <TR> <TH CLASS="grid" BGCOLOR="#cccccc">#</TH> - <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH> <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Setup') |h %></TH> <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Recurring') |h %></TH> + <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH> <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH> + <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Close date') |h %></TH> + <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Confidence') |h %></TH> <TH CLASS="grid" BGCOLOR="#cccccc"></TH> </TR> % foreach my $quotation (@quotations) { @@ -26,10 +28,12 @@ % $quotation->quotationnum. '">'; <TR> <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->quotationnum %></A></TD> - <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% time2str($date_format, $quotation->_date) |h %></A></TD> - <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->total_setup |h %></A></TD> - <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->total_recur |h %></A></TD> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN=right><% $a %><% $money_char.$quotation->total_setup |h %></A></TD> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN=right><% $a %><% $money_char.$quotation->total_recur |h %></A></TD> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% time2str('%b %d %Y', $quotation->_date) |h %></A></TD> <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->quotation_description |h %></A></TD> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->close_date ? time2str('%b %d %Y', $quotation->close_date) : '' |h %></A></TD> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN=right><% $a %><% length($quotation->confidence) ? $quotation->confidence . '%' : '' |h %></A></TD> <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>"><% $opt{convert_label} || 'Convert to customer' %></A></TD> </TR> % } @@ -47,6 +51,8 @@ my $curuser = $FS::CurrentUser::CurrentUser; my $conf = new FS::Conf; +my $money_char = $conf->config('money_char') || '$'; + my $date_format = $conf->config('date_format') || '%m/%d/%Y'; my %opt = @_; |