From: ivan Date: Sat, 28 Feb 2004 22:48:36 +0000 (+0000) Subject: minor fixes X-Git-Tag: NET_WHOIS_RAW_0_31~114 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=0ef43f5dc2f3ccce6f4a4b236e87f23ba413c8a8 minor fixes --- diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 5700b654e..c2182118f 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -1,7 +1,7 @@ package FS::cust_pkg; use strict; -use vars qw(@ISA $disable_agentcheck); +use vars qw(@ISA $disable_agentcheck $DEBUG); use FS::UID qw( getotaker dbh ); use FS::Record qw( qsearch qsearchs ); use FS::Misc qw( send_email ); @@ -25,6 +25,8 @@ use FS::Conf; @ISA = qw( FS::Record ); +$DEBUG = 0; + $disable_agentcheck = 0; sub _cache { @@ -614,7 +616,7 @@ sub attribute_since_sqlradacct { Transfers as many services as possible from this package to another package. The destination package must already exist. Services are moved only if -the destination allows services with the correct I (not svcdb). +the destination allows services with the correct I (not svcdb). Any services that can't be moved remain in the original package. Returns an error, if there is one; otherwise, returns the number of services @@ -726,13 +728,16 @@ newly-created cust_pkg objects. =cut sub order { - - # Rewritten to make use of the transfer() method, and in general - # to not suck so badly. - my ($custnum, $pkgparts, $remove_pkgnum, $return_cust_pkg) = @_; # Transactionize this whole mess + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + my $oldAutoCommit = $FS::UID::AutoCommit; local $FS::UID::AutoCommit = 0; my $dbh = dbh;