X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fquotation.html;h=cad28a121f02278d0b54250d52ac442d8cdbb9f7;hb=8807939a466d20893efc5655e61ac38f891d6d05;hp=6badb13b7994e21471326f29737c2b726aa6efa2;hpb=85c78d955fbc2fd6c3991156b387d37c185b9f64;p=freeside.git

diff --git a/httemplate/search/quotation.html b/httemplate/search/quotation.html
index 6badb13b7..cad28a121 100755
--- a/httemplate/search/quotation.html
+++ b/httemplate/search/quotation.html
@@ -13,6 +13,9 @@
                                            emt('Setup'),
                                            emt('Recurring'),
                                            emt('Date'),
+                                           emt('Description'),
+                                           emt('Close date'),
+                                           emt('Confidence'),
                                            emt('Prospect'),
                                            emt('Customer'),
                                          ],
@@ -21,11 +24,18 @@
                    sub { $money_char. shift->total_setup },
                    sub { $money_char. shift->total_recur },
                    sub { time2str('%b %d %Y', shift->_date ) },
+                   'quotation_description',
+                   sub { my $quotation = shift;
+                         $quotation->close_date ? time2str('%b %d %Y', $quotation->close_date) : '';
+                       },
+                   sub { my $quotation = shift;
+                         length($quotation->confidence) ? $quotation->confidence . '%' : '';
+                       },
                    sub { my $prospect_main = shift->prospect_main;
                          $prospect_main ? $prospect_main->name : '';
                        },
                    sub { my $cust_main = shift->cust_main;
-                         $cust_main ? $cust_main->name : '';
+                         $cust_main ? encode_entities($cust_main->name) : '';
                        },
                    #\&FS::UI::Web::cust_fields,
                  ],
@@ -34,15 +44,21 @@
                    '', #FS::quotation->total_setup_sql,
                    '', #FS::quotation->total_recur_sql,
                    '_date',
+                   'quotation_description',
+                   'close_date',
+                   'confidence',
                    '',
                    '',
                  ],
-                 'align' => 'rrrrll', #.FS::UI::Web::cust_aligns(),
+                 'align' => 'rrrrlrrll', #.FS::UI::Web::cust_aligns(),
                  'links' => [
                    $link,
                    $link,
                    $link,
                    $link,
+                   $link,
+                   $link,
+                   $link,
                    $prospect_link,
                    $cust_link,
                    #( map { $_ ne 'Cust. Status' ? $cust_link : '' }
@@ -73,6 +89,8 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 die "access denied"
   unless $curuser->access_right('List quotations');
 
+local($FS::Record::qsearch_qualify_columns) = 1;
+
 my $join_prospect_main = 'LEFT JOIN prospect_main USING ( prospectnum )';
 my $join_cust_main = FS::UI::Web::join_cust_main('quotation');