[freeside-commits] branch master updated. 3ebf876779b2a89e81a767d3cdd6690a88bdd3de

[Christopher Burger]

The branch, master has been updated
       via  3ebf876779b2a89e81a767d3cdd6690a88bdd3de (commit)
      from  b1d26754480ee77604521236d9cf9952df2d3e12 (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 3ebf876779b2a89e81a767d3cdd6690a88bdd3de
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Apr 4 10:59:48 2019 -0400

    RT# 75357 - Prospects can now be disabled

diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index c54c569c3..5d909a3ea 100644
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -462,7 +462,7 @@ sub search {
   # here is the agent virtualization
   push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
 
-  my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
+  my $extra_sql = scalar(@where) ? ' WHERE prospect_main.custnum IS NULL AND '. join(' AND ', @where) : '';
 
   my $count_query = "SELECT COUNT(*) FROM prospect_main $extra_sql";
   
diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index 6adb471f7..b812dc303 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -3,6 +3,7 @@
      'table'           => 'prospect_main',
      'html_table_class'=> 'fsinnerbox',
      'labels'          => { 'prospectnum' => 'Prospect',
+                            'disabled'    => 'Disabled',
                             'agentnum'    => 'Agent',
                             'refnum'      => 'Advertising source',
                             'company'     => 'Company',
@@ -16,6 +17,10 @@
          'options'  => [ 'Residential', 'Commercial', ],
          'onchange' => 'rescom_changed',
        },
+       { 'field'    => 'disabled',
+         'type'     => 'checkbox',
+         'value'    => 'Y',
+       },
        { 'field'       => 'agentnum',
          'type'        => 'select-agent',
          'empty_label' => 'Select agent',

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

Summary of changes:
 FS/FS/prospect_main.pm             | 2 +-
 httemplate/edit/prospect_main.html | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)