X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=b8042026a93c0842d90fe984c6103ca0669a37a7;hb=776b6c8e2c064b42b89e22e2d5d01afb65dd8bb3;hp=0343cc0fb65ff3edd783d3e1f90150bfad1eb2c2;hpb=7516e3da0f17eeecba27219ef96a8b5f46af2083;p=freeside.git

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 0343cc0fb..b8042026a 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -97,8 +97,7 @@ my $args_callback = sub {
         @options;
 
   foreach my $class ( '', split(',', $cgi->param('taxproductnums') ) ) {
-    my $param = 'taxproductnum';
-    $param .= "_$class" if length($class); # gah, "_$class"?
+    my $param = "taxproductnum_$class";
     my $value = $cgi->param($param);
 
     if ( $value == -1 ) {
@@ -117,7 +116,7 @@ my $args_callback = sub {
     $error ||= "Illegal $param: $value"
       unless ( $value =~ /^\d*$/  );
     if (length($class)) {
-      $options{"usage_taxproductnum_$_"} = $value;
+      $options{"usage_taxproductnum_$class"} = $value;
     } else {
       $new->set('taxproductnum', $value);
     }
@@ -161,6 +160,7 @@ my $args_callback = sub {
   my @svcparts = map { $_->svcpart } qsearch('part_svc', {});
   my %pkg_svc    = map { $_ => scalar($cgi->param("pkg_svc$_"  )) } @svcparts;
   my %hidden_svc = map { $_ => scalar($cgi->param("hidden$_"   )) } @svcparts;
+  my %provision_hold = map { $_ => scalar($cgi->param("provision_hold$_"   )) } @svcparts;
   my %bulk_skip  = map { $_ => ( $cgi->param("no_bulk_skip$_") eq 'Y'
                                    ? '' : 'Y'
                                )
@@ -168,6 +168,7 @@ my $args_callback = sub {
 
   push @args, 'pkg_svc'    => \%pkg_svc,
               'hidden_svc' => \%hidden_svc,
+              'provision_hold' => \%provision_hold,
               'bulk_skip'  => \%bulk_skip;
 
   ###
@@ -188,6 +189,9 @@ my $args_callback = sub {
     push @args, 'part_pkg_vendor' => \%part_pkg_vendor;
   }
 
+  push @args, 'part_pkg_restrict_soft_override' => 1
+    if $cgi->param('part_pkg_restrict_soft_override');
+
   #warn "args: ".join('/', @args). "\n";
 
   @args;