quotations + tax refactor, part 2

2 files changed, 6 insertions, 1 deletions

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 34f5d12bd..f1d8c2696 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -159,7 +159,7 @@ if ( $quotationnum ) {
   $quotation_pkg->prospectnum($prospect_main->prospectnum) if $prospect_main;
 
   #XXX handle new location
-  $error = $quotation_pkg->insert || $quotation_pkg->estimate;
+  $error = $quotation_pkg->insert;
 
 } else {
 
diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index bd998bb91..4abef9f78 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -72,6 +72,9 @@ function areyousure(href, message) {
   <BR><BR>
 % }
 
+% if ( $error ) {
+<& /elements/error.html, $error &>
+% }
 
 % if ( $conf->exists('quotation_html') ) { 
     <% join('', $quotation->print_html( preref_callback=>$preref_callback )) %>
@@ -107,6 +110,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";