[freeside-commits] freeside/FS/FS Conf.pm, 1.259, 1.260 Record.pm, 1.177, 1.178

[Ivan,,,]

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

Modified Files:
	Conf.pm Record.pm 
Log Message:
taqua config to rewrite DA calls, RT#4502

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- Conf.pm	10 Jan 2009 23:56:56 -0000	1.259
+++ Conf.pm	12 Jan 2009 23:51:33 -0000	1.260
@@ -2014,14 +2014,14 @@
   {
     'key'         => 'tax-ship_address',
     'section'     => 'billing',
-    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the shipping address instead.  Note: Tax reports can take a long time when enabled.',
+    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the shipping address instead.',
     'type'        => 'checkbox',
   }
 ,
   {
     'key'         => 'tax-pkg_address',
     'section'     => 'billing',
-    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).  Note: Tax reports can take a long time when enabled.',
+    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).',
     'type'        => 'checkbox',
   },
 
@@ -2624,6 +2624,12 @@
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cdr-taqua-da_rewrite',
+    'section'     => '',
+    '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',
+  },
 
 );
 

Index: Record.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Record.pm,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- Record.pm	3 Jan 2009 01:52:59 -0000	1.177
+++ Record.pm	12 Jan 2009 23:51:34 -0000	1.178
@@ -1365,14 +1365,16 @@
 format.
 
 Each listref value can be a column name or a code reference.  Coderefs are run
-with the row object and data as the two parameters.  For example, this coderef
-does the same thing as using the "columnname" string:
+with the row object, data and a FS::Conf object as the three parameters.
+For example, this coderef does the same thing as using the "columnname" string:
 
   sub {
-    my( $record, $data ) = @_;
+    my( $record, $data, $conf ) = @_;
     $record->columnname( $data );
   },
 
+Coderefs are run after all "column name" fields are assigned.
+
 =item format_types
 
 Optional format hashref of types.  Keys are field names, values are "csv",
@@ -1662,7 +1664,7 @@
     while ( scalar(@later) ) {
       my $sub = shift @later;
       my $data = shift @later;
-      &{$sub}($record, $data);  # $record->&{$sub}($data); 
+      &{$sub}($record, $data, $conf);  # $record->&{$sub}($data, $conf); 
     }
 
     my $error = $record->insert;