[freeside-commits] branch FREESIDE_3_BRANCH updated. 632056ed03288da5090725d801c54f81ddadca0d

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  632056ed03288da5090725d801c54f81ddadca0d (commit)
      from  4875cef23628acfcb280ee2d525aec5cd7bdbe9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 632056ed03288da5090725d801c54f81ddadca0d
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue May 30 14:25:18 2017 -0400

    RT# 74666 - fixed display error on v3.

diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index 41a5a87..b73ce0d 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');

-----------------------------------------------------------------------

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