From: ivan <ivan>
Date: Mon, 11 Apr 2011 05:00:02 +0000 (+0000)
Subject: taqua accountcodes, RT#12181
X-Git-Tag: freeside_2_1_3~323
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=24fd6ba22b04349af4606b997827b4dbab4cc1f3;p=freeside.git

taqua accountcodes, RT#12181
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d9ced6c7e..7530784d9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3948,11 +3948,18 @@ and customer address. Include units.',
 
   {
     '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',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 223ed32d5..51b4d6815 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2538,7 +2538,7 @@ sub tables_hashref {
         # 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,10 +2584,14 @@ sub tables_hashref {
         #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, '', '',
+        'cdrbatch',     'varchar',    'NULL',     255, '', '',
         #new
-        'cdrbatchnum', 'int', 'NULL', '', '', '',
+        'cdrbatchnum',      'int',    'NULL',      '', '', '',
 
       ],
       'primary_key' => 'acctid',
@@ -2595,6 +2599,7 @@ sub tables_hashref {
       'index' => [ [ 'calldate' ],
                    [ 'src' ], [ 'dst' ], [ 'dcontext' ], [ 'charged_party' ],
                    [ 'accountcode' ], [ 'carrierid' ], [ 'cdrid' ],
+                   [ 'sessionnum' ],
                    [ 'freesidestatus' ], [ 'freesiderewritestatus' ],
                    [ 'cdrbatch' ], [ 'cdrbatchnum' ],
                  ],