From ffc6bb4416bc6e0c29d0e38a389a948d38c5534c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Feb 2002 11:53:25 +0000
Subject: [PATCH] okay, finally fix all the weirdness with shipping adresses. 
 whew.

---
 FS/FS/cust_main.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cf5bd3314..b6d3075e8 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -586,8 +586,9 @@ sub check {
   );
 
   if ( defined $self->dbdef_table->column('ship_last') ) {
-    if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } @addfields
-         && grep { $self->getfield("ship_$_") ne '' } @addfields
+    if ( scalar ( grep { $self->getfield($_) ne $self->getfield("ship_$_") }
+                       @addfields )
+         && scalar ( grep { $self->getfield("ship_$_") ne '' } @addfields )
        )
     {
       my $error =
-- 
2.11.0