From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 Apr 2012 22:41:23 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=3de7385d0a6ad25fa300f50929473f33998ea858;hp=583e90e3de4d707996084dc82b794f26063b7fea

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index b164948f2..d2417f069 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -257,6 +257,7 @@ tie my %rights, 'Tie::IxHash',
     'List zip codes', #NEW
     'List invoices',
     'List packages',
+    'Summarize packages',
     'List services',
     'List service passwords',
   
@@ -364,6 +365,7 @@ sub default_superuser_rights {
     'Delete payment',
     'Delete credit', #?
     'Delete refund', #?
+    'Edit customer package dates',
     'Time queue',
     'Redownload resolved batches',
     'Raw SQL',
diff --git a/httemplate/docs/about.html b/httemplate/docs/about.html
index f0994e506..76a477c05 100644
--- a/httemplate/docs/about.html
+++ b/httemplate/docs/about.html
@@ -8,7 +8,7 @@
 </CENTER>
 
 <CENTER>
-<FONT SIZE="-1">&copy; 2011 Freeside Internet Services, Inc.<BR>
+<FONT SIZE="-1">&copy; 2012 Freeside Internet Services, Inc.<BR>
 All rights reserved.<BR>
 Licensed under the terms of the<BR>
 GNU <b>Affero</b> General Public License.<BR>
@@ -29,7 +29,7 @@ GNU <b>Affero</b> General Public License.<BR>
 <BR>
 
 <CENTER>
-<FONT SIZE="-3">"The sky was yellow and the sun was blue" -R. Hunter</FONT>
+<FONT SIZE="-3">"A selfish heart is trouble, but a foolish heart is worse" -R. Hunter</FONT>
 </CENTER>
 
 <SCRIPT TYPE="text/javascript">
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index a2b0ff39b..eeb9485ee 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -238,9 +238,11 @@ if ( $curuser->access_right('Financial reports') ) {
   $report_packages{'separator2'} =  '';
 }
 $report_packages{'All customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ];
-$report_packages{'Package summary'} = [ $fsurl.'search/cust_pkg_summary.html', 'Show package sales summary', ];
+$report_packages{'Package summary'} = [ $fsurl.'search/cust_pkg_summary.html', 'Show package sales summary', ]
+  if $curuser->access_right('Summarize packages');
 $report_packages{'Suspended customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ];
-$report_packages{'Suspension summary'} = [ $fsurl.'search/cust_pkg_susp.html', 'Show suspension activity', ];
+$report_packages{'Suspension summary'} = [ $fsurl.'search/cust_pkg_susp.html', 'Show suspension activity', ]
+  if $curuser->access_right('Summarize packages');
 $report_packages{'Customer packages with unconfigured services'} =  [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
 $report_packages{'FCC Form 477 packages'} =  [ $fsurl.'search/report_477.html', 'Summarize packages by census tract for particular types' ]
   if $conf->exists('cust_main-require_censustract');
diff --git a/httemplate/search/cust_pkg_summary.cgi b/httemplate/search/cust_pkg_summary.cgi
index cea4cdcd2..fbeeb92ce 100644
--- a/httemplate/search/cust_pkg_summary.cgi
+++ b/httemplate/search/cust_pkg_summary.cgi
@@ -25,7 +25,7 @@
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 die "access denied"
-  unless $curuser->access_right('List packages');
+  unless $curuser->access_right('Summarize packages');
 
 my $title = 'Package Summary Report';
 my ($begin, $end) = FS::UI::Web::parse_beginning_ending($cgi);
diff --git a/httemplate/search/cust_pkg_summary.html b/httemplate/search/cust_pkg_summary.html
index a0ef47210..f9adf044e 100644
--- a/httemplate/search/cust_pkg_summary.html
+++ b/httemplate/search/cust_pkg_summary.html
@@ -21,4 +21,8 @@
 
 <% include('/elements/footer.html') %>
 <%init>
+
+die "access denied"
+  unless $curuser->access_right('Summarize packages');
+
 </%init>
diff --git a/httemplate/search/cust_pkg_susp.cgi b/httemplate/search/cust_pkg_susp.cgi
index 9ab5992d9..d6bbc43d6 100644
--- a/httemplate/search/cust_pkg_susp.cgi
+++ b/httemplate/search/cust_pkg_susp.cgi
@@ -25,7 +25,7 @@
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 die "access denied"
-  unless $curuser->access_right('List packages');
+  unless $curuser->access_right('Summarize packages');
 
 my $money_char = FS::Conf->new()->config('money_char') || '$';
 
diff --git a/httemplate/search/cust_pkg_susp.html b/httemplate/search/cust_pkg_susp.html
index c59e6c158..2ac643260 100644
--- a/httemplate/search/cust_pkg_susp.html
+++ b/httemplate/search/cust_pkg_susp.html
@@ -21,4 +21,8 @@
 
 <% include('/elements/footer.html') %>
 <%init>
+
+die "access denied"
+  unless $curuser->access_right('Summarize packages');
+
 </%init>