[freeside-commits] branch FREESIDE_3_BRANCH updated. 674f60dc84dd3eaefba0d7c582a92f5679cf2f66

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  674f60dc84dd3eaefba0d7c582a92f5679cf2f66 (commit)
      from  2e24da864a3a71ec242f8feb2c13042a1d61faeb (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 674f60dc84dd3eaefba0d7c582a92f5679cf2f66
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Mar 16 20:28:56 2017 -0400

    RT# 74666, Added quotation description to customer quotation list and quotation view

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index a158f39..c70861c 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1352,14 +1352,15 @@ sub tables_hashref {
     'quotation' => {
       'columns' => [
         #regular fields
-        'quotationnum',   'serial',     '', '', '', '', 
-        'prospectnum',       'int', 'NULL', '', '', '',
-        'custnum',           'int', 'NULL', '', '', '',
-        '_date',        @date_type,             '', '', 
-        'disabled',         'char', 'NULL',  1, '', '', 
-        'usernum',           'int', 'NULL', '', '', '',
-        'close_date',   @date_type,             '', '', 
-        'confidence',        'int', 'NULL', '', '', '',
+        'quotationnum',           'serial',     '', '',   '', '', 
+        'prospectnum',               'int', 'NULL', '',   '', '',
+        'custnum',                   'int', 'NULL', '',   '', '',
+        '_date',                @date_type,               '', '', 
+        'disabled',                 'char', 'NULL',  1,   '', '', 
+        'usernum',                   'int', 'NULL', '',   '', '',
+        'close_date',           @date_type,               '', '', 
+        'confidence',                'int', 'NULL', '',   '', '',
+        'quotation_description', 'varchar', 'NULL', '50', '', '',
         #'total',      @money_type,       '', '', 
         #'quotation_term', 'varchar', 'NULL', $char_d, '', '',
       ],
diff --git a/httemplate/edit/quotation.html b/httemplate/edit/quotation.html
index 43e815c..36a445d 100644
--- a/httemplate/edit/quotation.html
+++ b/httemplate/edit/quotation.html
@@ -3,21 +3,23 @@
                  'table'   => 'quotation',
                  'menubar' => [],
                  'labels'  => { 
-                                'quotationnum' => 'Quotation number',
-                                'prospectnum'  => 'Prospect',
-                                'custnum'      => 'Customer',
-                                '_date'        => 'Date',
-                                'close_date'   => 'Close Date',
-                                'confidence'   => 'Confidence',
+                                'quotationnum'          => 'Quotation number',
+                                'prospectnum'           => 'Prospect',
+                                'custnum'               => 'Customer',
+                                '_date'                 => 'Date',
+                                'close_date'            => 'Close Date',
+                                'confidence'            => 'Confidence',
+                                'quotation_description' => 'Description',
                                 ($can_disable ? ('disabled'     => 'Disabled') : ()),
                               },
                  'fields'  => [
-                   { field=>'prospectnum', type=>'fixed-prospect_main' },
-                   { field=>'custnum',     type=>'fixed-cust_main' },
-                   { field=>'_date',       type=>'fixed-date' },
-                   { field=>'close_date',  type=>'input-date-field' },
-                   { field=>'confidence',  type=>'text', size=>3, postfix=>'%' },
-                   ($can_disable ? { field=>'disabled',    type=>'checkbox', value=>'Y'} : ()),
+                   { field=>'prospectnum',           type=>'fixed-prospect_main' },
+                   { field=>'custnum',               type=>'fixed-cust_main' },
+                   { field=>'_date',                 type=>'fixed-date' },
+                   { field=>'close_date',            type=>'input-date-field' },
+                   { field=>'confidence',            type=>'text', size=>3, postfix=>'%' },
+                   { field=>'quotation_description', type=>'text', size=>50 },
+                   ($can_disable ? { field=>'disabled', type=>'checkbox', value=>'Y'} : ()),
                               ],
                  #XXX some way to disable the "view all"
                  'new_callback' => sub { my( $cgi, $quotation) = @_;
diff --git a/httemplate/elements/quotations.html b/httemplate/elements/quotations.html
index 1d80a48..a6dd373 100644
--- a/httemplate/elements/quotations.html
+++ b/httemplate/elements/quotations.html
@@ -13,6 +13,7 @@
         <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
         <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Setup') |h %></TH>
         <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Recurring') |h %></TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
         <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
       </TR>
 %     foreach my $quotation (@quotations) {
@@ -28,6 +29,7 @@
           <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% time2str($date_format, $quotation->_date) |h %></A></TD>
           <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->total_setup |h %></A></TD>
           <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->total_recur |h %></A></TD>
+          <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $a %><% $quotation->quotation_description |h %></A></TD>
           <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>"><% $opt{convert_label} || 'Convert to customer' %></A></TD>
         </TR>
 %     }
diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index 6687361..41a5a87 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -1,3 +1,12 @@
+% 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 &>

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

Summary of changes:
 FS/FS/Schema.pm                     |   17 +++++++++--------
 httemplate/edit/quotation.html      |   26 ++++++++++++++------------
 httemplate/elements/quotations.html |    2 ++
 httemplate/view/quotation.html      |    9 +++++++++
 4 files changed, 34 insertions(+), 20 deletions(-)