[freeside-commits] branch master updated. 47c250d15d752e6210b9c044a4a64e2e8992c64e

[Ivan]

The branch, master has been updated
       via  47c250d15d752e6210b9c044a4a64e2e8992c64e (commit)
      from  54db570dc261f7cde343fa78ef92855f6d576570 (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 47c250d15d752e6210b9c044a4a64e2e8992c64e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 10 23:13:09 2013 -0700

    add customer status to advanced package report, RT#24631

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 0cb1b50..066b987 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -4179,6 +4179,14 @@ sub search {
   }
 
   ##
+  # parse cust_status
+  ##
+
+  if ( $params->{'cust_status'} =~ /^([a-z]+)$/ ) {
+    push @where, FS::cust_main->cust_status_sql . " = '$1' ";
+  }
+
+  ##
   # parse customer sales person
   ##
 
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 32b5a69..995779a 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -156,8 +156,8 @@ my %search_hash = ();
 $search_hash{'query'} = $cgi->keywords;
 
 #scalars
-for (qw( agentnum cust_main_salesnum salesnum custnum magic status custom
-         cust_fields pkgbatch
+for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
+         custom cust_fields pkgbatch
     )) 
 {
   $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index 0a17344..b8c32c6 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -13,12 +13,17 @@
     </TR>
 
 % unless ( $custnum ) {
-    <% include( '/elements/tr-select-agent.html',
+
+    <& /elements/tr-select-agent.html,
                    'curr_value'    => scalar( $cgi->param('agentnum') ),
                    'disable_empty' => 0,
                    'onchange'      => 'agent_changed(this)',
-               )
-    %>
+    &>
+
+    <& /elements/tr-select-cust_main-status.html,
+         'label' => 'Customer status',
+         'field' => 'cust_status',
+    &>
 
     <SCRIPT TYPE="text/javascript">
 
@@ -55,6 +60,7 @@
     &>
 
     <% include( '/elements/tr-select-cust_pkg-status.html',
+                  'label'    => 'Package status',
                   'onchange' => 'status_changed(this);',
               )
     %>

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

Summary of changes:
 FS/FS/cust_pkg.pm                      |    8 ++++++++
 httemplate/search/cust_pkg.cgi         |    4 ++--
 httemplate/search/report_cust_pkg.html |   12 +++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)