X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=9144c499501745e327c3c173118b8ec751e8765f;hp=be8b0f68f82c7ba03c3771e0174f0c57f1a0c74e;hb=74a3083375ccc3a0dc8b74f9b39392989d088656;hpb=e2cff16135741b166473d18f828ad54f57037dae

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index be8b0f68f..9144c4995 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -219,10 +219,6 @@
                             },
                             { 'field'      => 'bill_dst_pkgpart',
                               'type'       => 'select-part_pkg',
-                              'extra_sql'  => sub { $pkgpart
-                                                     ? "AND pkgpart != $pkgpart"
-                                                     : ''
-                                                  },
                               'm2_label'   => 'Include line item(s) from package',
                               'm2m_method' => 'bill_part_pkg_link',
                               'm2m_dstcol' => 'dst_pkgpart',
@@ -245,10 +241,6 @@
                             { 'field'      => 'svc_dst_pkgpart',
                               'label'      => 'Also include services from package: ',
                               'type'       => 'select-part_pkg',
-                              'extra_sql'  => sub { $pkgpart
-                                                     ? "AND pkgpart != $pkgpart"
-                                                     : ''
-                                                  },
                               'm2_label'   => 'Include services of package: ',
                               'm2m_method' => 'svc_part_pkg_link',
                               'm2m_dstcol' => 'dst_pkgpart',
@@ -325,8 +317,6 @@ my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) );
 my %options = ();
 my $recur_disabled = 1;
 
-my $pkgpart = '';
-
 my $error_callback = sub {
   my($cgi, $object, $fields, $opt ) = @_;
 
@@ -360,8 +350,6 @@ my $error_callback = sub {
   $object->set($_ => scalar($cgi->param($_)) )
     foreach (qw( setup_fee recur_fee ));
 
-  $pkgpart = $object->pkgpart;
-
 };
 
 my $new_hashref_callback = sub { { 'plan' => 'flat' }; };
@@ -411,22 +399,17 @@ my $edit_callback = sub {
   $object->set($_ => $object->option($_))
     foreach (qw( setup_fee recur_fee ));
 
-  $pkgpart = $object->pkgpart;
-
 };
 
 my $new_callback = sub {
   my( $cgi, $object, $fields ) = @_;
 
   my $conf = new FS::Conf; 
-
   if ( $conf->exists('agent_defaultpkg') ) {
     #my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
     @agent_type = map {$_->typenum} qsearch('agent_type',{});
   }
 
-  $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
-
 };
 
 my $clone_callback = sub {