[freeside-commits] freeside/FS/FS Schema.pm, 1.239.2.26, 1.239.2.27 Conf.pm, 1.397.2.38, 1.397.2.39

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Schema.pm Conf.pm 
Log Message:
taqua accountcodes, RT#12181

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.239.2.26
retrieving revision 1.239.2.27
diff -u -w -d -r1.239.2.26 -r1.239.2.27
--- Schema.pm	9 Apr 2011 01:19:15 -0000	1.239.2.26
+++ Schema.pm	11 Apr 2011 05:00:02 -0000	1.239.2.27
@@ -2538,7 +2538,7 @@
         # fields for unitel/RSLCOM/convergent that don't map well to asterisk
         # defaults
         # though these are now used elsewhere:
-        # charged_party, upstream_price, rated_price, carrierid
+        # charged_party, upstream_price, rated_price, carrierid, cdrtypenum
         ###
 
         #cdr_type: Usage = 1, S&E = 7, OC&C = 8
@@ -2584,6 +2584,10 @@
         #an indexed place to put big numbers
         'cdrid',         'bigint',     'NULL',     '',  '', '', 
 
+        #for taqua accountcode rewriting, for starters
+        'sessionnum',       'int',    'NULL',      '', '', '',
+        'subscriber',   'varchar',    'NULL', $char_d, '', '',
+
         #old
         'cdrbatch', 'varchar', 'NULL', 255, '', '',
         #new
@@ -2595,6 +2599,7 @@
       'index' => [ [ 'calldate' ],
                    [ 'src' ], [ 'dst' ], [ 'dcontext' ], [ 'charged_party' ],
                    [ 'accountcode' ], [ 'carrierid' ], [ 'cdrid' ],
+                   [ 'sessionnum' ],
                    [ 'freesidestatus' ], [ 'freesiderewritestatus' ],
                    [ 'cdrbatch' ], [ 'cdrbatchnum' ],
                  ],

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.38
retrieving revision 1.397.2.39
diff -u -w -d -r1.397.2.38 -r1.397.2.39
--- Conf.pm	10 Apr 2011 22:22:36 -0000	1.397.2.38
+++ Conf.pm	11 Apr 2011 05:00:02 -0000	1.397.2.39
@@ -3948,12 +3948,19 @@
 
   {
     'key'         => 'cdr-taqua-da_rewrite',
-    'section'     => '',
+    'section'     => 'telephony',
     'description' => 'For the Taqua CDR format, a comma-separated list of directory assistance 800 numbers.  Any CDRs with these numbers as "BilledNumber" will be rewritten to the "CallingPartyNumber" (and CallType "12") on import.',
     'type'        => 'text',
   },
 
   {
+    'key'         => 'cdr-taqua-accountcode_rewrite',
+    'section'     => 'telephony',
+    'description' => 'For the Taqua CDR format, pull accountcodes from secondary CDRs with matching sessionNumber.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'cust_pkg-show_autosuspend',
     'section'     => 'UI',
     'description' => 'Show package auto-suspend dates.  Use with caution for now; can slow down customer view for large insallations.',