[freeside-commits] freeside/httemplate/browse pkg_class.html, 1.6, 1.7 pkg_category.html, 1.2, 1.3 cust_class.html, NONE, 1.1 cust_category.html, NONE, 1.1 part_pkg_report_option.html, 1.1, 1.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail.420.am:/tmp/cvs-serv30787/httemplate/browse

Modified Files:
	pkg_class.html pkg_category.html part_pkg_report_option.html 
Added Files:
	cust_class.html cust_category.html 
Log Message:
customer classification, RT#6376

--- NEW FILE: cust_category.html ---
<% include( 'elements/browse.html',
                 'title'       => 'Customer categories',
                 'html_init'   => $html_init,
                 'name'        => 'customer categories',
                 'disableable' => 1,
                 'disabled_statuspos' => 2,
                 'query'       => { 'table'     => 'cust_category',
                                    'hashref'   => {},
                                    'extra_sql' => 'ORDER BY categorynum',
                                  },
                 'count_query' => $count_query,
                 'header'      => [ '#', 'Category' ],
                 'fields'      => [ 'categorynum', 'categoryname' ],
                 'links'       => [ $link, $link ],
             )
%>

<%init>

die "access denied"
  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');

my $html_init = 
  qq!<A HREF="${p}browse/cust_class.html">Customer classes</A><BR><BR>!.
  'Customer categories define groups of customer classes.<BR><BR>'.
  qq!<A HREF="${p}edit/cust_category.html"><I>Add a customer category</I></A><BR><BR>!;

my $count_query = 'SELECT COUNT(*) FROM cust_category';

my $link = [ $p.'edit/cust_category.html?', 'categorynum' ];

</%init>

Index: part_pkg_report_option.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_pkg_report_option.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- part_pkg_report_option.html	29 Jun 2009 13:53:24 -0000	1.1
+++ part_pkg_report_option.html	29 Oct 2009 01:08:33 -0000	1.2
@@ -20,7 +20,7 @@
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $html_init = 
-  'Package optional report classes define groups of packages, for reporting purposes.'.
+  'Package optional report classes define optional groups of packages for reporting only.'.
   qq!<BR><BR><A HREF="${p}edit/part_pkg_report_option.html"><I>Add a class</I></A><BR><BR>!;
 
 my $link = [ $p.'edit/part_pkg_report_option.html?', 'num' ];

Index: pkg_class.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/pkg_class.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pkg_class.html	19 Jun 2008 03:18:18 -0000	1.6
+++ pkg_class.html	29 Oct 2009 01:08:33 -0000	1.7
@@ -20,8 +20,8 @@
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $html_init = 
-  'Package classes define groups of packages, for reporting and '.
-  'convenience purposes.<BR><BR>'.
+  'Package classes define groups of packages, for taxation, ordering '.
+  'convenience and reporting.<BR><BR>'.
   qq!<A HREF="${p}edit/pkg_class.html"><I>Add a package class</I></A><BR><BR>!;
 
 my $count_query = 'SELECT COUNT(*) FROM pkg_class';

--- NEW FILE: cust_class.html ---
<% include( 'elements/browse.html',
                 'title'       => 'Customer classes',
                 'html_init'   => $html_init,
                 'name'        => 'customer classes',
                 'disableable' => 1,
                 'disabled_statuspos' => 2,
                 'query'       => { 'table'     => 'cust_class',
                                    'hashref'   => {},
                                    'extra_sql' => 'ORDER BY classnum',
                                  },
                 'count_query' => $count_query,
                 'header'      => $header,
                 'fields'      => $fields,
                 'links'       => $links,
             )
%>
<%init>

die "access denied"
  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');

my $html_init = 
  'Customer classes define groups of customer for reporting.<BR><BR>'.
  qq!<A HREF="${p}edit/cust_class.html"><I>Add a customer class</I></A><BR><BR>!;

my $count_query = 'SELECT COUNT(*) FROM cust_class';

my $link = [ $p.'edit/cust_class.html?', 'classnum' ];

my $header = [ '#', 'Class' ];
my $fields = [ 'classnum', 'classname' ];
my $links  = [ $link, $link ];

my $cat_query = 'SELECT COUNT(*) FROM cust_class where categorynum IS NOT NULL';
my $sth = dbh->prepare($cat_query)
  or die "Error preparing $cat_query: ". dbh->errstr;
$sth->execute
  or die "Error executing $cat_query: ". $sth->errstr;
if ($sth->fetchrow_arrayref->[0]) {
  push @$header, 'Category';
  push @$fields, 'categoryname';
  push @$links,  $link;
}

</%init>

Index: pkg_category.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/pkg_category.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pkg_category.html	5 Oct 2009 00:49:34 -0000	1.2
+++ pkg_category.html	29 Oct 2009 01:08:33 -0000	1.3
@@ -22,8 +22,7 @@
 
 my $html_init = 
   qq!<A HREF="${p}browse/pkg_class.html">Package classes</A><BR><BR>!.
-  'Package categories define groups of package classes, for reporting and '.
-  'convenience purposes.<BR><BR>'.
+  'Package categories define groups of package classes.<BR><BR>'.
   qq!<A HREF="${p}edit/pkg_category.html"><I>Add a package category</I></A><BR><BR>!;
 
 my $count_query = 'SELECT COUNT(*) FROM pkg_category';