[freeside-commits] branch master updated. dee2a3280f4649d82f35a39bb4e548b27c20b673

[Ivan]

The branch, master has been updated
       via  dee2a3280f4649d82f35a39bb4e548b27c20b673 (commit)
       via  e9d8e2a5f22ac1144bb3516c122f7406789d7d5d (commit)
      from  9dceb6f7ec4da76a1526f5257193eb62e69b34bc (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 dee2a3280f4649d82f35a39bb4e548b27c20b673
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 29 21:53:40 2014 -0800

    sales person report w/package breakdown, RT#22090

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 99f5e11..b423fa9 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -345,6 +345,7 @@ tie my %report_sales, 'Tie::IxHash',
   'Sales with Advertising Source' => [ $fsurl.'search/report_cust_bill_pkg_referral.html' ],
   'Agent Commissions' => [ $fsurl.'search/report_agent_commission.html' ],
   'Sales Person Commissions' => [ $fsurl.'search/report_sales_commission.html' ],
+  'Sales Person Commission per package' => [ $fsurl.'search/report_sales_commission_pkg.html' ],
 ;
 
 tie my %report_financial, 'Tie::IxHash';

commit e9d8e2a5f22ac1144bb3516c122f7406789d7d5d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 29 21:51:33 2014 -0800

    fix fallout from NG auth changes, RT#21563

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 0a441c4..41fcd1e 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -2,7 +2,7 @@ package FS::access_user;
 use base qw( FS::m2m_Common FS::option_Common ); 
 
 use strict;
-use vars qw( $DEBUG $me $conf );
+use vars qw( $DEBUG $me );
 use FS::UID;
 use FS::Auth;
 use FS::Conf;
@@ -456,7 +456,7 @@ sub default_customer_view {
   my $self = shift;
 
   $self->option('default_customer_view')
-    || $conf->config('cust_main-default_view')
+    || FS::Conf->new->config('cust_main-default_view')
     || 'basics'; #s/jumbo/basics/ starting with 3.0
 
 }
@@ -491,7 +491,7 @@ sub spreadsheet_format {
 
   my $f =  $override
         || $self->option('spreadsheet_format') 
-        || $conf->config('spreadsheet_format')
+        || FS::Conf->new->config('spreadsheet_format')
         || 'XLS';
 
   $formats{$f};

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

Summary of changes:
 FS/FS/access_user.pm          |    6 +++---
 httemplate/elements/menu.html |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)