[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.3, 1.168.2.4 Upgrade.pm, 1.31, 1.31.2.1 Mason.pm, 1.19, 1.19.2.1

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm Upgrade.pm Mason.pm 
Log Message:
proper cdr_batch table, RT#6386

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.3
retrieving revision 1.168.2.4
diff -u -d -r1.168.2.3 -r1.168.2.4
--- Schema.pm	12 Nov 2009 16:57:56 -0000	1.168.2.3
+++ Schema.pm	19 Nov 2009 09:43:10 -0000	1.168.2.4
@@ -2196,9 +2196,10 @@
         #an indexed place to put big numbers
         'cdrid',         'bigint',     'NULL',     '',  '', '', 
 
-        #i should become a table
+        #old
         'cdrbatch', 'varchar', 'NULL', 255, '', '',
-        #'cdrbatchnum', 'int', 'NULL', '', '', '',
+        #new
+        'cdrbatchnum', 'int', 'NULL', '', '', '',
 
       ],
       'primary_key' => 'acctid',
@@ -2211,16 +2212,16 @@
                  ],
     },
 
-    #'cdr_batch' => {
-    #  'columns' => [
-    #    'cdrbatchnum',   'serial',    '',   '', '', '', 
-    #    'cdrbatch', 'varchar', 'NULL', 255, '', '',
-    #    '_date',     @date_type, '', '', 
-    #  ],
-    #  'primary_key' => 'cdrbatchnum',
-    #  'unique' => [ [ 'cdrbatch' ] ],
-    #  'index' => [],
-    #},
+    'cdr_batch' => {
+      'columns' => [
+        'cdrbatchnum',   'serial',    '',   '', '', '', 
+        'cdrbatch', 'varchar', 'NULL', 255, '', '',
+        '_date',     @date_type, '', '', 
+      ],
+      'primary_key' => 'cdrbatchnum',
+      'unique' => [ [ 'cdrbatch' ] ],
+      'index' => [],
+    },
 
     'cdr_termination' => {
       'columns' => [

Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- Mason.pm	22 Sep 2009 03:08:19 -0000	1.19
+++ Mason.pm	19 Nov 2009 09:43:10 -0000	1.19.2.1
@@ -183,6 +183,7 @@
   use FS::XMLRPC;
   use FS::payby;
   use FS::cdr;
+  use FS::cdr_batch;
   use FS::inventory_class;
   use FS::inventory_item;
   use FS::pkg_category;

Index: Upgrade.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Upgrade.pm,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- Upgrade.pm	5 Oct 2009 00:49:33 -0000	1.31
+++ Upgrade.pm	19 Nov 2009 09:43:10 -0000	1.31.2.1
@@ -138,6 +138,9 @@
     #add weights to pkg_category
     'pkg_category' => [],
 
+    #cdrbatch fixes
+    'cdr' => [],
+
   ;
 
   \%hash;