[freeside-commits] freeside/FS/FS Schema.pm, 1.175, 1.176 Upgrade.pm, 1.31, 1.32 Mason.pm, 1.21, 1.22

[Ivan,,,]

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

Modified Files:
	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.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- Schema.pm	12 Nov 2009 16:56:57 -0000	1.175
+++ Schema.pm	19 Nov 2009 09:43:09 -0000	1.176
@@ -2235,9 +2235,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',
@@ -2250,16 +2251,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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Mason.pm	5 Nov 2009 00:29:17 -0000	1.21
+++ Mason.pm	19 Nov 2009 09:43:09 -0000	1.22
@@ -185,6 +185,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.32
diff -u -d -r1.31 -r1.32
--- Upgrade.pm	5 Oct 2009 00:49:33 -0000	1.31
+++ Upgrade.pm	19 Nov 2009 09:43:09 -0000	1.32
@@ -138,6 +138,9 @@
     #add weights to pkg_category
     'pkg_category' => [],
 
+    #cdrbatch fixes
+    'cdr' => [],
+
   ;
 
   \%hash;