[freeside-commits] freeside/FS/FS cust_main.pm,1.520,1.521

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv15975

Modified Files:
	cust_main.pm 
Log Message:
should fix cancellations in rare circumstances where cached _num_cust_svc becomes inaccurate, RT#8994

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -w -d -r1.520 -r1.521
--- cust_main.pm	2 Jul 2010 18:56:28 -0000	1.520
+++ cust_main.pm	3 Jul 2010 01:26:53 -0000	1.521
@@ -2181,6 +2181,9 @@
     return 1  if !$a_num_cust_svc &&  $b_num_cust_svc;
     my @a_cust_svc = $a->cust_svc;
     my @b_cust_svc = $b->cust_svc;
+    return 0  if !scalar(@a_cust_svc) && !scalar(@b_cust_svc);
+    return -1 if  scalar(@a_cust_svc) && !scalar(@b_cust_svc);
+    return 1  if !scalar(@a_cust_svc) &&  scalar(@b_cust_svc);
     $a_cust_svc[0]->svc_x->label cmp $b_cust_svc[0]->svc_x->label;
   }