X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fquotations.html;h=b517a5cde0f1472ff78aae51cbcaeeef4104077c;hb=50cc2b95894b151599b458462dcd83edb68980ce;hp=b891436234e3d18cd8078f23218dd4098aee1b3e;hpb=512a0bda605fad4de680649f5b9d6d61fcc42148;p=freeside.git

diff --git a/httemplate/elements/quotations.html b/httemplate/elements/quotations.html
index b89143623..b517a5cde 100644
--- a/httemplate/elements/quotations.html
+++ b/httemplate/elements/quotations.html
@@ -11,10 +11,12 @@
       <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>
@@ -28,10 +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>
 %     }
@@ -49,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 = @_;