RT# 82137 - default payment amount now has processing fee in total if processing...

[freeside.git] / httemplate / elements / quotations.html

diff --git a/httemplate/elements/quotations.html b/httemplate/elements/quotations.html
index 1d80a48..b517a5c 100644 (file)
--- a/httemplate/elements/quotations.html
+++ b/httemplate/elements/quotations.html
@@ -1,20 +1,25 @@
 % if ( $curuser->access_right('Generate quotation') ) { 
 
   <FONT CLASS="fsinnerbox-title"><% mt( 'Quotations' ) |h %></FONT>
-  <A HREF="<%$p%>edit/quotation.html?<% $new_query %>">New quotation</A>
+  <A HREF="<%$p%>edit/quotation.html?<% $new_query %>">Create new quotation</A>
 
 % if ( @quotations ) {
     <& /elements/table-grid.html &>
 %     my $bgcolor1 = '#eeeeee';
 %     my $bgcolor2 = '#ffffff';
 %     my $bgcolor = '';
+      <THEAD>
       <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>
+      </THEAD>
 %     foreach my $quotation (@quotations) {
 %       if ( $bgcolor eq $bgcolor1 ) {
 %         $bgcolor = $bgcolor2;
@@ -25,9 +30,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>
 %     }
@@ -45,6 +53,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 = @_;