X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fquotation.html;h=5646fb973b1d3d1178c50793a471619bd000fb7a;hb=9aa198dfc90054de34cf1af8f3238d004416ebc9;hp=bd998bb915558c997ee6d067503dbc8a35681f4e;hpb=f92a083465019a7224d912cd78b6881f8aef1b52;p=freeside.git

diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index bd998bb91..5646fb973 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -11,20 +11,31 @@ function areyousure(href, message) {
 
 % unless ( $quotation->disabled eq 'Y' ) {
 
+%   my $inrow = 0;
 %   if ( $curuser->access_right('Order customer package') ) {
       <& /elements/order_pkg_link.html,
            'label'       => emt('Add package'),
            'actionlabel' => emt('Add package'),
            map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
       &>
+%     $inrow++;
 %   }
 
 %   if ( $curuser->access_right('One-time charge') ) {
-      | <& /elements/one_time_charge_link.html,
+      <% $inrow ? ' | ' : '' %>
+      <& /elements/one_time_charge_link.html,
              map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
         &>
+%     $inrow++;
+%   }
+
+%   if ( $can_generate_quotation ) {
+      <% $inrow ? ' | ' : '' %>
+      <A HREF="<%$p%>edit/quotation.html?quotationnum=<% $quotation->quotationnum %>">Edit quotation fields</A>
+%     $inrow++;
 %   }
-      <BR><BR>
+
+    <% $inrow ? '<BR><BR>' : '' %>
 
 %   if ( 1 ) { #if ( $curuser->access_right('Send quotations') )
 
@@ -72,6 +83,25 @@ function areyousure(href, message) {
   <BR><BR>
 % }
 
+% if ( $error ) {
+<DIV CLASS="error"><% emt('Error calculating quotation: [_1]', $error) %></DIV>
+% }
+
+% my $close_date = $quotation->close_date;
+% my $confidence = $quotation->confidence;
+% if ($close_date or length($confidence)) {
+<TABLE>
+%   if ($close_date) {
+<TR>
+  <TH STYLE="text-align: right;">Close Date:</TH>
+  <TD><% time2str($conf->config('date_format') || '%m/%d/%Y',$close_date) %></TD>
+</TR>
+%   }
+%   if (length($confidence)) {
+<TR><TH STYLE="text-align: right;">Confidence:</TH><TD><% $confidence %>%</TD></TR>
+%   }
+</TABLE>
+% }
 
 % if ( $conf->exists('quotation_html') ) { 
     <% join('', $quotation->print_html( preref_callback=>$preref_callback )) %>
@@ -88,6 +118,8 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 #die "access denied"
 #  unless $curuser->access_right('View quotations');
 
+my $can_generate_quotation = $curuser->access_right('Generate quotation');
+
 my $quotationnum;
 my($query) = $cgi->keywords;
 if ( $query =~ /^(\d+)$/ ) {
@@ -107,6 +139,8 @@ my $quotation = qsearchs({
 });
 die "Quotation #$quotationnum not found!" unless $quotation;
 
+my $error = $quotation->estimate;
+
 my $menubar = menubar( $quotation->cust_or_prospect_label_link($p) );
 
 my $link = "quotationnum=$quotationnum";
@@ -114,11 +148,23 @@ my $link = "quotationnum=$quotationnum";
 #$link .= ';notice_name='. $notice_name if $notice_name;
 
 my $preref_callback = sub {
-  areyousure_link("${p}misc/delete-quotation_pkg.html?". shift->quotationpkgnum,
+  my $quotation_pkg = shift;
+  $can_generate_quotation ?
+  areyousure_link("${p}misc/delete-quotation_pkg.html?". $quotation_pkg->quotationpkgnum,
                   emt('Are you sure you want to remove this package from the quotation?'),
                   emt('Remove this package'), #tooltip
                   qq(<img src="${p}images/cross.png">), #link
-                 );
+                 ) .
+  include('/elements/popup_link.html',
+    action      => "${p}edit/quotation_pkg_detail.html?pkgnum=" .
+                   $quotation_pkg->quotationpkgnum,
+    html_label  => qq(<IMG SRC="${p}images/Actions-document-edit-icon.png">),
+    title       => emt('Edit quotation details'),
+    actionlabel => emt('Edit quotation details'),
+    color       => '#333399',
+    width       => 763,
+  )
+  : '';
 };
 
 sub areyousure_link {