[freeside-commits] freeside/FS/FS part_svc.pm, 1.35, 1.35.4.1 cust_svc.pm, 1.84.2.2, 1.84.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv9758/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	part_svc.pm cust_svc.pm 
Log Message:
add no export option to bulk service changes, RT#13439

Index: part_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc.pm,v
retrieving revision 1.35
retrieving revision 1.35.4.1
diff -u -w -d -r1.35 -r1.35.4.1
--- part_svc.pm	21 Feb 2010 03:16:02 -0000	1.35
+++ part_svc.pm	28 Jun 2011 22:36:22 -0000	1.35.4.1
@@ -12,7 +12,7 @@
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -801,6 +801,9 @@
   my $param = thaw(decode_base64(shift));
   warn Dumper($param) if $DEBUG;
 
+  local($FS::svc_Common::noexport_hack) = 1
+    if $param->{'noexport'};
+
   my $old_part_svc =
     qsearchs('part_svc', { 'svcpart' => $param->{'old_svcpart'} } );
 

Index: cust_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_svc.pm,v
retrieving revision 1.84.2.2
retrieving revision 1.84.2.3
diff -u -w -d -r1.84.2.2 -r1.84.2.3
--- cust_svc.pm	16 Jan 2011 20:20:24 -0000	1.84.2.2
+++ cust_svc.pm	28 Jun 2011 22:36:22 -0000	1.84.2.3
@@ -301,7 +301,9 @@
     my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
     return "Unknown pkgnum" unless $cust_pkg;
     ($part_svc) = grep { $_->svcpart == $self->svcpart } $cust_pkg->part_svc;
-
+    return "No svcpart ". $self->svcpart.
+           " services in pkgpart ". $cust_pkg->pkgpart
+      unless $part_svc;
     return "Already ". $part_svc->get('num_cust_svc'). " ". $part_svc->svc.
            " services for pkgnum ". $self->pkgnum
       if $part_svc->get('num_avail') == 0 and !$ignore_quantity;