X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-part_pkg.html;h=439c4b53ed631ead17fbdef46554ce3f2aad9a8b;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=6b697abdf6e6a03d2b3ae3b7f47b56eb436e0291;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/httemplate/elements/select-part_pkg.html b/httemplate/elements/select-part_pkg.html
index 6b697abdf..439c4b53e 100644
--- a/httemplate/elements/select-part_pkg.html
+++ b/httemplate/elements/select-part_pkg.html
@@ -23,6 +23,7 @@ Example:
               'empty_label'    => 'Select package', #should this be the default?
               'label_callback' => sub { shift->pkg_comment },
               'hashref'        => \%hash,
+              'extra_option_attributes' => [ 'can_discount', 'can_start_date' ],
               %opt,
           )
 %>
@@ -33,7 +34,8 @@ my( %opt ) = @_;
 $opt{'records'} = delete $opt{'part_pkg'}
   if $opt{'part_pkg'};
 
-my %hash = ( 'disabled' => '' );
+my %hash = ();
+$hash{'disabled'} = '' unless $opt{'showdisabled'};
 
 if ( exists($opt{'classnum'}) && defined($opt{'classnum'}) ) {
   if ( $opt{'classnum'} > 0 ) {
@@ -43,6 +45,7 @@ if ( exists($opt{'classnum'}) && defined($opt{'classnum'}) ) {
   } #else -1 or not specified, all classes, so don't set classnum
 }
 
-$opt{'extra_sql'} .= ' AND '. FS::part_pkg->curuser_pkgs_sql;
+$opt{'extra_sql'} .= ( keys(%hash) ? ' AND ' : ' WHERE ' ).
+                     FS::part_pkg->curuser_pkgs_sql;
 
 </%init>