[freeside-commits] branch master updated. ee2d87613c1720cdf4f97e2ee0dcc1f8dfa781ff

[Mark Wells]

The branch, master has been updated
       via  ee2d87613c1720cdf4f97e2ee0dcc1f8dfa781ff (commit)
       via  7cd918b8463886744316e2f5b6fb75feefd184e7 (commit)
       via  e1f3623d238aa5c2717c082ef7427cd460c34e02 (commit)
       via  7d6d866a4f94abac0ddaf5daf44234db1cef628e (commit)
      from  09ea69ac0a83cc40b02a722bc5a2baf7bd31a164 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee2d87613c1720cdf4f97e2ee0dcc1f8dfa781ff
Merge: 7cd918b 09ea69a
Author: Mark Wells <mark at freeside.biz>
Date:   Thu May 28 16:58:47 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 7cd918b8463886744316e2f5b6fb75feefd184e7
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 26 12:51:29 2015 -0700

    limit length of customer name in RBC batch format; patch from Peter Loeppky, #35102

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 45e888d..1310640 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw(@ISA %import_info %export_info $name);
 use Date::Format 'time2str';
 use FS::Conf;
+use Encode 'encode';
 
 my $conf;
 my ($client_num, $shortname, $longname, $trans_code, $testmode, $i, $declined, $totaloffset);
@@ -174,8 +175,8 @@ $name = 'RBC';
     sprintf("%010.0f",$cust_pay_batch->amount*100).
     '      '.
     time2str("%Y%j", $pay_batch->download).
-    sprintf("%-30s", $cust_pay_batch->cust_main->first . ' ' .
-                     $cust_pay_batch->cust_main->last).
+    sprintf("%-30.30s", encode('utf8', $cust_pay_batch->cust_main->first . ' ' .
+                     $cust_pay_batch->cust_main->last)).
     'E'. # English
     ' '.
     sprintf("%-15s", $shortname).

commit e1f3623d238aa5c2717c082ef7427cd460c34e02
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 26 12:36:32 2015 -0700

    fix check batches

diff --git a/FS/FS/cust_main/Billing_Batch.pm b/FS/FS/cust_main/Billing_Batch.pm
index 67208e6..c2416ab 100644
--- a/FS/FS/cust_main/Billing_Batch.pm
+++ b/FS/FS/cust_main/Billing_Batch.pm
@@ -5,6 +5,7 @@ use vars qw( $conf );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::pay_batch;
 use FS::cust_pay_batch;
+use FS::cust_bill_pay_batch;
 
 install_callback FS::UID sub { 
   $conf = new FS::Conf;
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index a48aa01..4860aed 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -122,7 +122,7 @@
       <TD ALIGN="right"><% mt('Account number') |h %></TD>
       <TD><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="<%$account%>"></TD>
       <TD ALIGN="right"><% mt('Type') |h %></TD>
-      <TD><SELECT NAME="paytype"><% join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes) %></SELECT></TD>
+      <TD><SELECT NAME="paytype"><% join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } FS::cust_payby->paytypes) %></SELECT></TD>
     </TR>
     <TR>
       <TD ALIGN="right"><% mt($routing_label) |h %></TD>

commit 7d6d866a4f94abac0ddaf5daf44234db1cef628e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 26 12:23:51 2015 -0700

    remove cust_pay_batch.invnum FK

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 93220ad..5ebab78 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2661,9 +2661,9 @@ sub tables_hashref {
                           { columns    => [ 'batchnum' ],
                             table      => 'pay_batch',
                           },
-                          { columns    => [ 'invnum' ],
-                            table      => 'cust_bill',
-                          },
+                          #{ columns    => [ 'invnum' ],
+                          #  table      => 'cust_bill',
+                          #},
                           { columns    => [ 'custnum' ],
                             table      => 'cust_main',
                           },

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Schema.pm                  |    6 +++---
 FS/FS/cust_main/Billing_Batch.pm |    1 +
 FS/FS/pay_batch/RBC.pm           |    5 +++--
 httemplate/misc/payment.cgi      |    2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)