[freeside-commits] branch FREESIDE_3_BRANCH updated. 837e546a78f18c57a228f946215af7ee8a6a00eb

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  837e546a78f18c57a228f946215af7ee8a6a00eb (commit)
       via  648ed2c4df4a462269fc6c64a5b2d72b6c38fe99 (commit)
      from  099c4158fe39bda50e3b47fd423d3be05ac2afde (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 837e546a78f18c57a228f946215af7ee8a6a00eb
Merge: 648ed2c 099c415
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Jun 30 09:16:57 2017 -0400

    Merge branch 'FREESIDE_3_BRANCH' of freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
    fixing commit message


commit 648ed2c4df4a462269fc6c64a5b2d72b6c38fe99
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Jun 30 09:07:06 2017 -0400

    RT# 74666 - fixed header not displaying error

diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index b73ce0d..4769934 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -1,10 +1,3 @@
-% if ( $quotation->custnum ) {
-<h2>Quotation #<% $quotationnum %>
-% if ($quotation->quotation_description) {
-(<% $quotation->quotation_description %>)  
-% } 
-</h2>
-% } else { #eventually, header-prospect_main.html
 <& /elements/header.html, mt('Quotation View'), $menubar &>
 <& /elements/init_overlib.html &>
 
@@ -15,7 +8,13 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
-% }
+% if ( $quotation->custnum ) {
+  <h2>Quotation #<% $quotationnum %>
+%   if ($quotation->quotation_description) {
+      (<% $quotation->quotation_description %>)  
+%   } 
+  </h2>
+% } 
 
 % unless ( $quotation->disabled eq 'Y' ) {
 

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

Summary of changes: