[freeside-commits] branch master updated. 7af9fc1ac91f9e8673f12849153d7ac2a5f900f2

[Mark Wells]

The branch, master has been updated
       via  7af9fc1ac91f9e8673f12849153d7ac2a5f900f2 (commit)
       via  37cd5b0c642742a783a4a7dfb829b2440184820e (commit)
      from  483c59350c99e30bd7f9e93d5c9f4e117204d1b4 (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 7af9fc1ac91f9e8673f12849153d7ac2a5f900f2
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Mar 12 13:21:02 2013 -0700

    make apply_usage work right with null classnum, from #5738

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 92aa43f..87acf0e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -3337,6 +3337,12 @@ sub apply_usage {
   my $dbh = dbh;
   my $order = FS::Conf->new->config('cdr-minutes_priority');
 
+  my $is_classnum;
+  if ( $classnum ) {
+    $is_classnum = ' part_pkg_usage_class.classnum = '.$classnum;
+  } else {
+    $is_classnum = ' part_pkg_usage_class.classnum IS NULL';
+  }
   my @usage_recs = qsearch({
       'table'     => 'cust_pkg_usage',
       'addl_from' => ' JOIN part_pkg_usage       USING (pkgusagepart)'.
@@ -3346,7 +3352,7 @@ sub apply_usage {
       'extra_sql' => " WHERE ( cust_pkg.pkgnum = $pkgnum OR ".
                      " ( cust_pkg.custnum = $custnum AND ".
                      " part_pkg_usage.shared IS NOT NULL ) ) AND ".
-                     " part_pkg_usage_class.classnum = $classnum AND ".
+                     $is_classnum . ' AND '.
                      " cust_pkg_usage.minutes > 0",
       'order_by'  => " ORDER BY priority ASC",
   });

commit 37cd5b0c642742a783a4a7dfb829b2440184820e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Mar 12 12:35:56 2013 -0700

    fix cust_svc smart search, from #940

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index b608b23..bbf4eed 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -13,6 +13,7 @@ use FS::pkg_svc;
 use FS::domain_record;
 use FS::part_export;
 use FS::cdr;
+use FS::UI::Web;
 
 #most FS::svc_ classes are autoloaded in svc_x emthod
 use FS::svc_acct;  #this one is used in the cache stuff
@@ -883,7 +884,7 @@ sub smart_search_param {
   my $extra_sql = ' WHERE '.join(' AND ', @extra_sql);
   #for agentnum
   my $addl_from = ' LEFT JOIN cust_pkg  USING ( pkgnum  )'.
-                  ' LEFT JOIN cust_main USING ( custnum )'.
+                  FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg').
                   ' LEFT JOIN part_svc  USING ( svcpart )';
 
   (

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

Summary of changes:
 FS/FS/cust_pkg.pm |    8 +++++++-
 FS/FS/cust_svc.pm |    3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)