diff options
| -rw-r--r-- | FS/FS/Schema.pm | 17 | ||||
| -rw-r--r-- | httemplate/edit/quotation.html | 26 | ||||
| -rw-r--r-- | httemplate/elements/quotations.html | 2 | ||||
| -rwxr-xr-x | httemplate/view/quotation.html | 6 |
4 files changed, 30 insertions, 21 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index d3619aa28..f3e7c4efb 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1918,14 +1918,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 70d661502..3cedef80b 100644 --- a/httemplate/edit/quotation.html +++ b/httemplate/edit/quotation.html @@ -4,21 +4,23 @@ 'menubar' => [], 'html_table_class' => 'fsinnerbox', #default? '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 0c4dcdc38..b89143623 100644 --- a/httemplate/elements/quotations.html +++ b/httemplate/elements/quotations.html @@ -14,6 +14,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> </THEAD> @@ -30,6 +31,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 cabf30a17..aba1f0ab3 100755 --- a/httemplate/view/quotation.html +++ b/httemplate/view/quotation.html @@ -1,6 +1,10 @@ % if ( $quotation->custnum ) { <& /elements/header-cust_main.html, view=>'quotations', custnum=>$quotation->custnum &> -<h2>Quotation #<% $quotationnum %></h2> +<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 &> |