[freeside-commits] branch master updated. 965d64dbe634d499face4cea77c8b73188282a46

[Ivan]

The branch, master has been updated
       via  965d64dbe634d499face4cea77c8b73188282a46 (commit)
       via  544ca6128192e61a38a431cff8d732bd767ed09f (commit)
       via  502b3acb4b097d252377b99ddbbca1caae5af1a7 (commit)
      from  074ab75187e3575674941a72ea50205c2ec42595 (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 965d64dbe634d499face4cea77c8b73188282a46
Merge: 544ca61 074ab75
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 18 14:33:48 2014 -0800

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


commit 544ca6128192e61a38a431cff8d732bd767ed09f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 18 14:33:32 2014 -0800

    prohibit & in ACH bank name, RT#26634

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 0a93764..9e3c285 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2030,9 +2030,17 @@ sub check {
   ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
-    $self->payname =~ /^([\w \,\.\-\'\&]*)$/
-      or return gettext('illegal_name'). " payname: ". $self->payname;
-    $self->payname($1);
+
+    if ( $self->payby =~ /^(CHEK|DCHK)$/ ) {
+      $self->payname =~ /^([\w \,\.\-\']*)$/
+        or return gettext('illegal_name'). " payname: ". $self->payname;
+      $self->payname($1);
+    } else {
+      $self->payname =~ /^([\w \,\.\-\'\&]*)$/
+        or return gettext('illegal_name'). " payname: ". $self->payname;
+      $self->payname($1);
+    }
+
   }
 
   ### end of stuff moved to cust_payby

commit 502b3acb4b097d252377b99ddbbca1caae5af1a7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 18 14:29:01 2014 -0800

    prohibit & in ACH bank name, RT#26634

diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index d78c574..42bf64a 100644
--- a/FS/FS/cust_payby.pm
+++ b/FS/FS/cust_payby.pm
@@ -382,9 +382,17 @@ sub check {
   ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
-    $self->payname =~ /^([\w \,\.\-\'\&]+)$/
-      or return gettext('illegal_name'). " payname: ". $self->payname;
-    $self->payname($1);
+
+    if ( $self->payby =~ /^(CHEK|DCHK)$/ ) {
+      $self->payname =~ /^([\w \,\.\-\']*)$/
+        or return gettext('illegal_name'). " payname: ". $self->payname;
+      $self->payname($1);
+    } else {
+      $self->payname =~ /^([\w \,\.\-\'\&]*)$/
+        or return gettext('illegal_name'). " payname: ". $self->payname;
+      $self->payname($1);
+    }
+
   }
 
   ###

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

Summary of changes:
 FS/FS/cust_main.pm  |   14 +++++++++++---
 FS/FS/cust_payby.pm |   14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)