X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=5d9c2355b847a4d1e6ef963722b7eab4cd3a07b0;hp=fd7b175678783d355f4b24d8455930681ba3a209;hb=d6dbf288fd8ea42ebd5171d80817356248cf22ce;hpb=3c7c890883896cb8796b742880a1af637fbd46c8

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index fd7b17567..5d9c2355b 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,6 +1,7 @@
 %
 %
 %my $dbh = dbh;
+%my $conf = new FS::Conf;
 %
 %my $pkgpart = $cgi->param('pkgpart');
 %
@@ -42,6 +43,9 @@
 %  } fields('part_pkg')
 %} );
 %
+%my $oldAutoCommit = $FS::UID::AutoCommit;
+%local $FS::UID::AutoCommit = 0;
+%
 %my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
 %              map { $_->svcpart }
 %              qsearch('part_svc', {} );
@@ -71,7 +75,7 @@
 %  $pkgpart = $new->pkgpart;
 %}
 %
-%unless ($error) {
+%unless ( $error || $conf->exists('agent_defaultpkg') ) {
 %  my $error = $new->process_m2m(
 %    'link_table'   => 'type_pkgs',
 %    'target_table' => 'agent_type',
@@ -79,11 +83,14 @@
 %  );
 %}
 %if ( $error ) {
+%  $dbh->rollback if $oldAutoCommit;
 %  $cgi->param('error', $error );
 %  print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
 %} elsif ( $custnum )  {
+%  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 %  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 %} else {
+%  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 %  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
 %}
 %