Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/svc_Common.pm
index 748bcae,4fd2d0b..1dd9ffb
--- 1/FS/FS/svc_Common.pm
--- 2/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@@ -719,8 -719,6 +719,8 @@@ sub setx 
  sub part_svc {
    my $self = shift;
  
 +  cluck 'svc_X->part_svc called' if $DEBUG;
 +
    #get part_svc
    my $svcpart;
    if ( $self->get('svcpart') ) {
@@@ -1387,11 -1385,17 +1387,17 @@@ Parameters
  
  =item order_by
  
+ =item cancelled - if true, only returns svcs attached to cancelled pkgs;
+ if defined and false, only returns svcs not attached to cancelled packages
+ 
  =back
  
  =cut
  
- # svc_broadband::search should eventually use this instead
+ ### Don't call the 'cancelled' option 'Service Status'
+ ### There is no such thing
+ ### See cautionary note in httemplate/browse/part_svc.cgi
+ 
  sub search {
    my ($class, $params) = @_;
  
@@@ -1495,6 -1499,14 +1501,14 @@@
      push @where, "exportnum = $1";
    }
  
+   if ( defined($params->{'cancelled'}) ) {
+     if ($params->{'cancelled'}) {
+       push @where, "cust_pkg.cancel IS NOT NULL";
+     } else {
+       push @where, "cust_pkg.cancel IS NULL";
+     }
+   }
+ 
  #  # sector and tower
  #  my @where_sector = $class->tower_sector_sql($params);
  #  if ( @where_sector ) {