From 0998ca2d30dcd94bc1ea5db8e689ff30e7658baa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Jul 2010 06:31:09 +0000
Subject: [PATCH] more resilliant cdrbatch upgrade

---
 FS/FS/cdr.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index bd0ed57e9..e8be08056 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -899,9 +899,14 @@ sub _upgrade_data {
 
   my %cdrbatchnum = ();
   while (my $row = $sth->fetchrow_arrayref) {
-    my $cdr_batch = new FS::cdr_batch { 'cdrbatch' => $row->[0] };
-    my $error = $cdr_batch->insert;
-    die $error if $error;
+
+    my $cdr_batch = qsearchs( 'cdr_batch', { 'cdrbatch' => $row->[0] } );
+    unless ( $cdr_batch ) {
+      $cdr_batch = new FS::cdr_batch { 'cdrbatch' => $row->[0] };
+      my $error = $cdr_batch->insert;
+      die $error if $error;
+    }
+
     $cdrbatchnum{$row->[0]} = $cdr_batch->cdrbatchnum;
   }
 
-- 
2.11.0