X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpkg_class.html;h=eb33c0fb0a31a7288d0b2a929b697cd3cc012b10;hp=75969dbe82422955ce09a8a1e75e3d58d76fa8aa;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hpb=f13afe5e228a220311557e1ca6dacbf847c26baf

diff --git a/httemplate/browse/pkg_class.html b/httemplate/browse/pkg_class.html
index 75969dbe8..eb33c0fb0 100644
--- a/httemplate/browse/pkg_class.html
+++ b/httemplate/browse/pkg_class.html
@@ -5,8 +5,9 @@
                  'disableable' => 1,
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'pkg_class',
+                                    'addl_from' => ' LEFT JOIN pkg_category USING (categorynum)',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY classnum',
+                                    'order_by' => 'ORDER BY classnum',
                                   },
                  'count_query' => $count_query,
                  'header'      => $header,
@@ -19,9 +20,11 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+my $conf = new FS::Conf;
+
 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';
@@ -40,7 +43,7 @@ $sth->execute
 if ($sth->fetchrow_arrayref->[0]) {
   push @$header, 'Category';
   push @$fields, 'categoryname';
-  push @$links,  $link;
+  push @$links,  [ $p.'edit/pkg_category.html?', 'categorynum' ]
 }
 
 </%init>