X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fquotation.html;h=d4d79d72cf1a6dc5904e96416a9cfed028224bba;hb=368ed08e24400e9d1faf401a1e4e23ea54d2c969;hp=5646fb973b1d3d1178c50793a471619bd000fb7a;hpb=2ffdb485e5534df3d89bcc12d4d02d485e9b28f5;p=freeside.git

diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index 5646fb973..d4d79d72c 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -1,5 +1,12 @@
+% if ( $quotation->custnum ) {
+<& /elements/header-cust_main.html, view=>'quotations', custnum=>$quotation->custnum &>
+<h2>Quotation #<% $quotationnum %>
+% if ($quotation->quotation_description) {
+(<% $quotation->quotation_description |h %>)  
+% } 
+</h2>
+% } else { #eventually, header-prospect_main.html
 <& /elements/header.html, mt('Quotation View'), $menubar &>
-
 <& /elements/init_overlib.html &>
 
 <SCRIPT TYPE="text/javascript">
@@ -9,6 +16,8 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
+% }
+
 % unless ( $quotation->disabled eq 'Y' ) {
 
 %   my $inrow = 0;
@@ -23,9 +32,13 @@ function areyousure(href, message) {
 
 %   if ( $curuser->access_right('One-time charge') ) {
       <% $inrow ? ' | ' : '' %>
-      <& /elements/one_time_charge_link.html,
-             map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
-        &>
+%     my $query = 'quotationnum=' . $quotation->get('quotationnum');
+%     if ($quotation->custnum) {
+%       $query .= ';custnum=' . $quotation->custnum;
+%     } else {
+%       $query .= ';prospectnum=' . $quotation->prospectnum;
+%     }
+      <A HREF="<% $fsurl . 'edit/quick-charge.html?' . $query %>"><% emt('One-time charge') %></A>
 %     $inrow++;
 %   }
 
@@ -63,7 +76,9 @@ function areyousure(href, message) {
     <BR><BR>
 
 %   if ( $curuser->access_right('New customer') && $quotation->quotation_pkg ) {
+%     # if we end up with more than one option, combine these links and add an interstitial screen
       <A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>">Place order</A>
+      | <A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>&onhold=1">Order on hold</A>
       <BR><BR>
 %   }
 
@@ -110,7 +125,11 @@ function areyousure(href, message) {
 % }
 % #plaintext quotations? <PRE><% join('', $quotation->print_text() ) %></PRE>
 
-<& /elements/footer.html &>
+% if ( $quotation->custnum ) {
+  <& /elements/footer-cust_main.html &>
+% } else {
+  <& /elements/footer.html &>
+% }
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;