[freeside-commits] freeside/FS/FS rate.pm, 1.5, 1.6 part_svc.pm, 1.25, 1.26 export_svc.pm, 1.7, 1.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv5435

Modified Files:
	rate.pm part_svc.pm export_svc.pm 
Log Message:
when editing exports and there's a duplicate error, show all conflicting accounts not just the ones for different customers

Index: part_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- part_svc.pm	17 Nov 2005 12:56:07 -0000	1.25
+++ part_svc.pm	21 Nov 2005 15:24:39 -0000	1.26
@@ -562,7 +562,7 @@
     $param->{'svcpart'} = $new->getfield('svcpart');
   }
 
-  die $error if $error;
+  die "$error\n" if $error;
 }
 
 =item process_bulk_cust_svc

Index: export_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/export_svc.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- export_svc.pm	11 May 2005 14:07:12 -0000	1.7
+++ export_svc.pm	21 Nov 2005 15:24:39 -0000	1.8
@@ -198,8 +198,8 @@
                  ' on '. $self->part_export->machine.
                ' : '. scalar(@dup_svc). " duplicate $label".
                ' ('. scalar(@diff_customer_svc). " from different customers)".
-               #": ". join(', ', sort $sortby map { $_->$method() } @dup_svc )
-               ": ". join(', ', sort $sortby map { $_->$method() } @diff_customer_svc )
+               ": ". join(', ', sort $sortby map { $_->$method() } @dup_svc )
+               #": ". join(', ', sort $sortby map { $_->$method() } @diff_customer_svc )
                ;
       }
   

Index: rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/rate.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rate.pm	24 Feb 2005 14:22:02 -0000	1.5
+++ rate.pm	21 Nov 2005 15:24:39 -0000	1.6
@@ -363,7 +363,7 @@
     #$ratenum = $rate->getfield('ratenum');
   }
 
-  die $error if $error;
+  die "$error\n" if $error;
 
 }