[freeside-commits] branch master updated. 53b9ba47322ee112b3f259006ce1eeb8410904b9

[Ivan]

The branch, master has been updated
       via  53b9ba47322ee112b3f259006ce1eeb8410904b9 (commit)
       via  7a618d4493ab7a87f6eabfd1ce3630a6b3436c2f (commit)
       via  170085d3536733f303e242503f0e034c65016b73 (commit)
      from  949114e0f65232b405e084bcfcff37b1fd9a2926 (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 53b9ba47322ee112b3f259006ce1eeb8410904b9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 5 15:48:47 2013 -0800

    3.0

diff --git a/FS/FS.pm b/FS/FS.pm
index 2d963b5..2517c1f 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -3,7 +3,7 @@ package FS;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '3.0git';
+$VERSION = '3.0';
 
 #find missing entries in this file with:
 # for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
diff --git a/httemplate/docs/about.html b/httemplate/docs/about.html
index 33b21a3..c2ba4e4 100644
--- a/httemplate/docs/about.html
+++ b/httemplate/docs/about.html
@@ -28,7 +28,7 @@
 % } else {
   <FONT SIZE="-1">
 % }
-© 2012 Freeside Internet Services, Inc.<BR>
+© 2013 Freeside Internet Services, Inc.<BR>
 All rights reserved.<BR>
 Licensed under the terms of the<BR>
 GNU <b>Affero</b> General Public License.<BR>
@@ -56,7 +56,7 @@ GNU <b>Affero</b> General Public License.<BR>
 
 % unless ( $agentnum ) {
   <CENTER>
-<!--  <FONT SIZE="-3">"" -R. Hunter</FONT> -->
+  <FONT SIZE="-3">"I can't figure out ... if it's an end or the beginning" - R. Hunter</FONT>
   </CENTER>
 % }
 
diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index c1d0d87..218698f 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -26,9 +26,9 @@
 <CENTER>
 <IMG SRC="<%$fsurl%>images/small-logo.png" BORDER="0"><BR>
 <H3>version <% $FS::VERSION %></H3>
-</CENTER>
 
-<CENTER>
+<BR>
+<BR>
 
 <H3>Core Team</H3>
 Jeremy Davis<BR>
@@ -36,6 +36,9 @@ Ivan Kohler<BR>
 Mark Wells<BR>
 <BR>
 
+<BR>
+<BR>
+
 <H3>Core Emeritus</H3>
 Peter Bowen<BR>
 Jeff Finucane<BR>
@@ -76,6 +79,8 @@ Sean Hanson<BR>
 Dale Hege<BR>
 Kelly Hickel<BR>
 Mark James<BR>
+Gary Jones<BR>
+Fernando M. Kiernan<BR>
 Frederico Caldeira Knabben<BR>
 Greg Kuhnert<BR>
 Randall Lucas<BR>
@@ -162,7 +167,7 @@ function myHeight() {
 
 document.body.style.overflow = 'hidden';
 
-var startingPosition = 340;
+var startingPosition = 303;
 
 //huh, adjust for firefox
 var ua = navigator.userAgent;

commit 7a618d4493ab7a87f6eabfd1ce3630a6b3436c2f
Merge: 170085d 949114e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 5 14:49:44 2013 -0800

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


commit 170085d3536733f303e242503f0e034c65016b73
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jan 5 14:49:38 2013 -0800

    cleanup noop cruft

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 11a5095..817238d 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -189,7 +189,7 @@ my $money_char = $conf->config('money_char') || '$';
 
 my @select = ( 'cust_bill_pkg.*', 'cust_bill._date' );
 my @total = ( 'COUNT(*)', 'SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)');
-my @total_desc = ( '%d line items', $money_char.'%.2f total' ); # sprintf strings
+my @total_desc = ( $money_char.'%.2f total' ); # sprintf strings
 
 my @peritem = ( 'setup', 'recur' );
 my @peritem_desc = ( 'Setup charge', 'Recurring charge' );
@@ -443,7 +443,7 @@ if ( $cgi->param('nottax') ) {
     push @select, "($recur_no_usage) AS recur_no_usage";
     $peritem[1] = 'recur_no_usage';
     $total[1] = "SUM(cust_bill_pkg.setup + $recur_no_usage)";
-    $total_desc[1] .= ' (excluding usage)';
+    $total_desc[0] .= ' (excluding usage)';
 
   } elsif ( $cgi->param('usage') eq 'usage' ) {
 
@@ -453,7 +453,7 @@ if ( $cgi->param('nottax') ) {
     $peritem[1] = '_usage';
     $peritem_desc[1] = 'Usage charge';
     $total[1] = "SUM($usage)";
-    $total_desc[1] .= ' usage charges';
+    $total_desc[0] .= ' usage charges';
   }
 
 } elsif ( $cgi->param('istax') ) {
@@ -650,8 +650,6 @@ my $count_query =
   " FROM cust_bill_pkg $join_cust $join_pkg
   $where";
 
-shift @total_desc; #the first one is implicit
-
 @peritem_desc = map {emt($_)} @peritem_desc;
 my @peritem_sub = map {
   my $field = $_;

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

Summary of changes:
 FS/FS.pm                            |    2 +-
 httemplate/docs/about.html          |    4 ++--
 httemplate/docs/credits.html        |   11 ++++++++---
 httemplate/search/cust_bill_pkg.cgi |    8 +++-----
 4 files changed, 14 insertions(+), 11 deletions(-)