[freeside-commits] branch FREESIDE_4_BRANCH updated. b679a1c4513a48f097629c0c639431d9d0212ef8

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  b679a1c4513a48f097629c0c639431d9d0212ef8 (commit)
      from  c68d2a72e190e704bf1174f54ef2ec10e7517e64 (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 b679a1c4513a48f097629c0c639431d9d0212ef8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Nov 8 01:13:40 2016 -0800

    quotations look like they belong to customers

diff --git a/httemplate/elements/header-cust_main.html b/httemplate/elements/header-cust_main.html
index ca0b522..91d90c2 100644
--- a/httemplate/elements/header-cust_main.html
+++ b/httemplate/elements/header-cust_main.html
@@ -3,7 +3,7 @@
 Examples:
 
   <& /elements/header-cust_main.html,
-       view      => 'Basics', #required
+       view      => 'basics', #required
        cust_main => $cust_main, # cust_main or custnum is required
        custnum   => $custnum,   #
   &>
@@ -33,7 +33,6 @@ Examples:
 %   }
 </TABLE>
 % }
-
 <& /view/cust_main/menu.html, cust_main => $cust_main, show => $opt{'view'} &>
 <BR>
 
@@ -56,7 +55,6 @@ function areyousure_popup(message, action, actionlabel) {
 }
 </SCRIPT>
 
-<br>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index 58d398c..cabf30a 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -1,5 +1,8 @@
+% if ( $quotation->custnum ) {
+<& /elements/header-cust_main.html, view=>'quotations', custnum=>$quotation->custnum &>
+<h2>Quotation #<% $quotationnum %></h2>
+% } else { #eventually, header-prospect_main.html
 <& /elements/header.html, mt('Quotation View'), $menubar &>
-
 <& /elements/init_overlib.html &>
 
 <SCRIPT TYPE="text/javascript">
@@ -9,6 +12,8 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
+% }
+
 % unless ( $quotation->disabled eq 'Y' ) {
 
 %   my $inrow = 0;
@@ -116,7 +121,11 @@ function areyousure(href, message) {
 % }
 % #plaintext quotations? <PRE><% join('', $quotation->print_text() ) %></PRE>
 
-<& /elements/footer.html &>
+% if ( $quotation->custnum ) {
+  <& /elements/footer-cust_main.html &>
+% } else {
+  <& /elements/footer.html &>
+% }
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;

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

Summary of changes:
 httemplate/elements/header-cust_main.html |    4 +---
 httemplate/view/quotation.html            |   13 +++++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)