Merge branch 'FREESIDE_4_BRANCH' of ssh://git.freeside.biz/home/git/freeside into...

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 1a8f43d..96fb85f 100644 (file)
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -666,7 +666,7 @@ sub _export_suspend {
   #warn "warning: _export_suspened unimplemented for". ref($self);
   my $svc_x = shift;
   my $new = $svc_x->clone_suspended;
-  $self->_export_replace( $new, $svc_x );
+  $self->export_replace( $new, $svc_x );
 }
 
 sub _export_unsuspend {
@@ -674,7 +674,7 @@ sub _export_unsuspend {
   #warn "warning: _export_unsuspend unimplemented for ". ref($self);
   my $svc_x = shift;
   my $old = $svc_x->clone_kludge_unsuspend;
-  $self->_export_replace( $svc_x, $old );
+  $self->export_replace( $svc_x, $old );
 }
 
 =item get_remoteid SVC

diff --git a/FS/FS/part_export/northern_911.pm b/FS/FS/part_export/northern_911.pm
index 679f5da..789d839 100644 (file)
--- a/FS/FS/part_export/northern_911.pm
+++ b/FS/FS/part_export/northern_911.pm
@@ -1,10 +1,11 @@
 package FS::part_export::northern_911;
+use base 'FS::part_export';
 
 use strict;
 use vars qw(@ISA %info);
 use Tie::IxHash;
 use FS::Record qw(qsearch dbh);
-use base 'FS::part_export';
+use WebService::Northern911;
 use Data::Dumper;
 
 tie my %options, 'Tie::IxHash',
@@ -22,9 +23,6 @@ tie my %options, 'Tie::IxHash',
   'options' => \%options,
   'no_machine' => 1,
   'notes'   => <<'END'
-Requires installation of
-<a href="http://search.cpan.org/dist/WebService-Northern911">WebService::Northern911</a>
-from CPAN.
 END
 );
 
@@ -32,9 +30,6 @@ sub client {
   my $self = shift;
 
   if (!$self->get('client')) {
-    local $@;
-    eval "use WebService::Northern911";
-    return "error loading WebService::Northern911 ($@)" if $@;
     $self->set('client',
       WebService::Northern911->new(
         vendor_code => $self->option('vendor_code'),

diff --git a/debian/control b/debian/control
index cf1c19d..0d61505 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
  libgeo-streetaddress-us-perl, libbusiness-onlinepayment-perl,
  libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl, libexpect-perl,
  libspreadsheet-parsexlsx-perl, libunicode-truncate-perl (>= 0.303-1),
- libspreadsheet-xlsx-perl, libpod-simple-perl
+ libspreadsheet-xlsx-perl, libpod-simple-perl, libwebservice-northern911-perl
 Conflicts: libparams-classify-perl (>= 0.013-6)
 Replaces: freeside (<<4)
 Breaks: freeside (<<4)

diff --git a/httemplate/misc/process/unhold_pkg.html b/httemplate/misc/process/unhold_pkg.html
index 7e54262..d3eab3f 100755 (executable)
--- a/httemplate/misc/process/unhold_pkg.html
+++ b/httemplate/misc/process/unhold_pkg.html
@@ -47,6 +47,6 @@ if ( $cust_pkg->setup or !$cust_pkg->susp ) {
 
 if ( $error ) {
   $cgi->param('error', $error);
-  print $cgi->redirect($fsurl.'misc/unhold_pkg.html?', $cgi->query_string);
+  print $cgi->redirect($fsurl.'misc/unhold_pkg.html?'. $cgi->query_string);
 }
 </%init>