merge

diff --combined FS/FS/Schema.pm
index 56cd065,b0e330d..2e9a10a
--- 1/FS/FS/Schema.pm
--- 2/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@@ -1036,7 -1036,6 +1036,7 @@@ sub tables_hashref 
        'columns' => [
          'custnum',  'serial',  '',     '', '', '', 
          'agentnum', 'int',  '',     '', '', '', 
 +        'salesnum', 'int',  'NULL', '', '', '', 
          'agent_custid', 'varchar', 'NULL', $char_d, '', '',
          'classnum', 'int', 'NULL', '', '', '',
          'custbatch', 'varchar', 'NULL', $char_d, '', '',
@@@ -1612,6 -1611,7 +1612,7 @@@
          'invnum',       'int',     'NULL',  '', '', '',
          'manual',       'char',    'NULL',   1, '', '',
          'discount_term','int',     'NULL',  '', '', '',
+         'failure_status','varchar','NULL',  16, '', '',
        ],
        'primary_key' => 'paypendingnum',
        'unique'      => [ [ 'payunique' ] ],
@@@ -1776,6 -1776,7 +1777,7 @@@
          'amount',      @money_type,                  '', '', 
          'currency',         'char', 'NULL',       3, '', '',
          'status',        'varchar', 'NULL', $char_d, '', '', 
+         'failure_status','varchar', 'NULL',      16, '', '',
          'error_message', 'varchar', 'NULL', $char_d, '', '',
        ],
        'primary_key' => 'paybatchnum',
@@@ -1803,7 -1804,6 +1805,7 @@@
          'locationnum',         'int', 'NULL', '', '', '',
          'otaker',          'varchar', 'NULL', 32, '', '', 
          'usernum',             'int', 'NULL', '', '', '',
 +        'salesnum',            'int', 'NULL', '', '', '', 
          'order_date',     @date_type,             '', '', 
          'start_date',     @date_type,             '', '', 
          'setup',          @date_type,             '', '', 
@@@ -3774,6 -3774,17 +3776,6 @@@
        'index'  => [ [ 'groupnum' ] ],
      },
  
 -    'access_groupsales' => {
 -      'columns' => [
 -        'groupsalesnum', 'serial', '', '', '', '',
 -        'groupnum',         'int', '', '', '', '',
 -        'salesnum',         'int', '', '', '', '',
 -      ],
 -      'primary_key' => 'groupsalesnum',
 -      'unique' => [ [ 'groupnum', 'salesnum' ] ],
 -      'index'  => [ [ 'groupnum' ] ],
 -    },
 -
      'access_right' => {
        'columns' => [
          'rightnum',   'serial', '',      '', '', '',

diff --combined FS/FS/cust_main/Billing_Realtime.pm
index 6e89f71,0fd86b1..e5e5291
--- 1/FS/FS/cust_main/Billing_Realtime.pm
--- 2/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@@ -507,13 -507,8 +507,13 @@@ sub realtime_bop 
          (exists($options{'paytype'}) && $options{'paytype'})
            ? uc($options{'paytype'})
            : uc($self->getfield('paytype')) || 'PERSONAL CHECKING';
 -      $content{account_name} = $self->getfield('first'). ' '.
 -                               $self->getfield('last');
 +
 +      if ( $content{account_type} =~ /BUSINESS/i && $self->company ) {
 +        $content{account_name} = $self->company;
 +      } else {
 +        $content{account_name} = $self->getfield('first'). ' '.
 +                                 $self->getfield('last');
 +      }
  
        $content{customer_org} = $self->company ? 'B' : 'I';
        $content{state_id}       = exists($options{'stateid'})
@@@ -1010,8 -1005,9 +1010,9 @@@ sub _realtime_bop_result 
  
    } else {
  
-     my $perror = $payment_gateway->gateway_module. " error: ".
-       $transaction->error_message;
+     my $perror = $transaction->error_message;
+     #$payment_gateway->gateway_module. " error: ".
+     # removed for conciseness
  
      my $jobnum = $cust_pay_pending->jobnum;
      if ( $jobnum ) {
@@@ -1109,7 -1105,11 +1110,11 @@@
      }
  
      $cust_pay_pending->status('done');
-     $cust_pay_pending->statustext("declined: $perror");
+     $cust_pay_pending->statustext($perror);
+     #'declined:': no, that's failure_status
+     if ( $transaction->can('failure_status') ) {
+       $cust_pay_pending->failure_status( $transaction->failure_status );
+     }
      my $cpp_done_err = $cust_pay_pending->replace;
      if ( $cpp_done_err ) {
        my $e = "WARNING: $options{method} declined but pending payment not ".

diff --combined bin/part_pkg-bulk_change
index 21a6c5a,cf65c39..cb29b18
--- 1/bin/part_pkg-bulk_change
--- 2/bin/part_pkg-bulk_change
+++ b/bin/part_pkg-bulk_change
@@@ -1,56 -1,46 +1,59 @@@
  #!/usr/bin/perl
  
  use strict;
- use vars qw( $opt_r $opt_o $opt_v $opt_t );
 -use vars qw( $opt_r $opt_p $opt_o $opt_v );
++use vars qw( $opt_r $opt_p $opt_o $opt_v $opt_t );
  use Getopt::Std;
  use FS::UID qw(adminsuidsetup);
  use FS::Record qw(qsearch qsearchs);
  use FS::part_pkg;
  use FS::part_pkg_option;
  
- getopts('ro:v:t:');
 -getopts('rp:o:v:');
++getopts('rp:o:v:t:');
  
  my $user = shift or &usage;
  adminsuidsetup $user;
  
- foreach my $part_pkg ( qsearch('part_pkg', {}) ) {
+ my %plan;
+ %plan = ( 'plan' => $opt_p ) if $opt_p;
+ 
+ foreach my $part_pkg ( qsearch('part_pkg',\%plan) ) {
    next if ! $part_pkg->freq && $opt_r;
  
 -  my %hash = (
 -    'pkgpart'    => $part_pkg->pkgpart,
 -    'optionname' => $opt_o,
 -  );
 -
 -  my $part_pkg_option = qsearchs('part_pkg_option', \%hash);
 -
 -  if ( $part_pkg_option ) {
 -    next if $part_pkg_option->optionvalue eq $opt_v;
 -    $part_pkg_option->optionvalue($opt_v);
 -    my $error = $part_pkg_option->replace;
 -    die $error if $error;
 -  } else {
 -    $part_pkg_option = new FS::part_pkg_option { %hash, 'optionvalue'=>$opt_v };
 -    my $error = $part_pkg_option->insert;
 -    die $error if $error;
 +  if ( $opt_o ) {
 +
 +    my %hash = (
 +      'pkgpart'    => $part_pkg->pkgpart,
 +      'optionname' => $opt_o,
 +    );
 +
 +    my $part_pkg_option = qsearchs('part_pkg_option', \%hash);
 +
 +    if ( $part_pkg_option ) {
 +      next if $part_pkg_option->optionvalue eq $opt_v;
 +      $part_pkg_option->optionvalue($opt_v);
 +      my $error = $part_pkg_option->replace;
 +      die $error if $error;
 +    } else {
 +      $part_pkg_option = new FS::part_pkg_option { %hash,
 +                                                   'optionvalue'=>$opt_v,
 +                                                 };
 +      my $error = $part_pkg_option->insert;
 +      die $error if $error;
 +    }
 +
 +  }
 +
 +  if ( $opt_t ) {
 +
 +    $part_pkg->taxclass($opt_t);
 +    my $error = $part_pkg->replace;
 +
    }
  
  }
  
  sub usage {
 -  die "usage: part_pkg-bulk_change [ -r ] -o option_name -v option_value employee_username\n";
 +  die "usage: part_pkg-bulk_change [ -r ] [ -o option_name -v option_value ] [ -t new_taxclass ] employee_username\n";
  }
  
  =head1 NAME
@@@ -59,24 -49,18 +62,24 @@@ cust_main-bulk_chang
  
  =head1 SYNOPSIS
  
 -  part_pkg-bulk_change [ -r ] -o option_name -v option_value employee_username
 +  part_pkg-bulk_change [ -r ] [ -o option_name -v option_value ] [ -t new_taxclass ] employee_username
  
  =head1 DESCRIPTION
  
  Command-line tool to change a set of package definitions.
  
 +Search options:
 +
  -r: recurring package definitions only
  
 +Change options:
 +
  -o: part_pkg_option optionname
  
  -v: part_pkg_option optionvalue
  
 +-t: new taxclass
 +
  employee_username
  
  =head1 BUGS