[freeside-commits] branch master updated. 7ca9326e9367cc930df0fb15283cab480b24f279

[Ivan]

The branch, master has been updated
       via  7ca9326e9367cc930df0fb15283cab480b24f279 (commit)
       via  d37dd5ecb8fb35bbd79a29cc78a1d680a3f7d6c8 (commit)
      from  cd278c142b76d30adf9e51ae4c47d01d754cdd59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ca9326e9367cc930df0fb15283cab480b24f279
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 21 00:27:31 2014 -0700

    doc

diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index a97472e..39a7772 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -34,7 +34,7 @@ CDR importing
 
 =head1 CLASS METHODS
 
-=item do_cli_import
+=item dbi_import
 
 =cut
 

commit d37dd5ecb8fb35bbd79a29cc78a1d680a3f7d6c8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 21 00:27:19 2014 -0700

    cleanup

diff --git a/FS/FS/Log/Output.pm b/FS/FS/Log/Output.pm
index 18d7f1b..29f31a5 100644
--- a/FS/FS/Log/Output.pm
+++ b/FS/FS/Log/Output.pm
@@ -1,7 +1,7 @@
 package FS::Log::Output;
+use base qw( Log::Dispatch::Output );
 
-use base Log::Dispatch::Output;
-use FS::Record qw( dbdef );
+use FS::log;
 
 sub new { # exactly by the book
   my $proto = shift;
@@ -24,7 +24,7 @@ sub log_message {
   my ($tablename, $tablenum) = @m{'tablename', 'tablenum'};
   if ( $object and $object->isa('FS::Record') ) {
     $tablename = $object->table;
-    $tablenum = $object->get( dbdef->table($tablename)->primary_key );
+    $tablenum = $object->get( $object->primary_key );
 
     # get the agentnum from the object if it has one
     $m{'agentnum'} ||= $object->get('agentnum');

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Log/Output.pm |    6 +++---
 FS/FS/cdr/Import.pm |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)