From 632056ed03288da5090725d801c54f81ddadca0d Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Tue, 30 May 2017 14:25:18 -0400
Subject: [PATCH] RT# 74666 - fixed display error on v3.

---
 httemplate/view/quotation.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index 41a5a87c5..b73ce0d74 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -1,14 +1,11 @@
 % if ( $quotation->custnum ) {
-<& /elements/header-cust_main.html, view=>'quotations', custnum=>$quotation->custnum &>
 <h2>Quotation #<% $quotationnum %>
 % if ($quotation->quotation_description) {
 (<% $quotation->quotation_description %>)  
 % } 
 </h2>
 % } else { #eventually, header-prospect_main.html
->>>>>>> 512a0bd... RT# 74666, Added quotation description to customer quotation list and quotation view
 <& /elements/header.html, mt('Quotation View'), $menubar &>
-
 <& /elements/init_overlib.html &>
 
 <SCRIPT TYPE="text/javascript">
@@ -18,6 +15,8 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
+% }
+
 % unless ( $quotation->disabled eq 'Y' ) {
 
 %   my $inrow = 0;
@@ -123,7 +122,7 @@ function areyousure(href, message) {
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
-#die "access denied"
+#die "access denied";
 #  unless $curuser->access_right('View quotations');
 
 my $can_generate_quotation = $curuser->access_right('Generate quotation');
-- 
2.11.0