[freeside-commits] freeside/httemplate/misc bulk_change_pkg.cgi, 1.3, 1.4 cancel_pkg.html, 1.7, 1.8 cust_main-import.cgi, 1.13, 1.14 delay_susp_pkg.html, 1.2, 1.3 meta-import.cgi, 1.5, 1.6

[Jeff Finucane,420,,]

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

Modified Files:
	bulk_change_pkg.cgi cancel_pkg.html cust_main-import.cgi 
	delay_susp_pkg.html meta-import.cgi 
Log Message:
CUSTOM packages/actual flag for custom packages #3988

Index: delay_susp_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/delay_susp_pkg.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- delay_susp_pkg.html	29 Sep 2008 03:41:53 -0000	1.2
+++ delay_susp_pkg.html	21 Jun 2009 15:21:31 -0000	1.3
@@ -12,7 +12,7 @@
 <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>">
 
 <BR><BR>
-<% "Delay automatic suspension of $pkgnum: " .$part_pkg->pkg. ' - ' .$part_pkg->comment %>
+<% "Delay automatic suspension of " .$part_pkg->pkg_comment %>
 <% ntable("#cccccc", 2) %>
 
 <TR>

Index: cust_main-import.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/cust_main-import.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cust_main-import.cgi	9 Nov 2008 08:51:00 -0000	1.13
+++ cust_main-import.cgi	21 Jun 2009 15:21:31 -0000	1.14
@@ -56,7 +56,7 @@
     <SELECT NAME="pkgpart"><OPTION VALUE="">(none)</OPTION>
 % foreach my $part_pkg ( qsearch('part_pkg',{'disabled'=>'' }) ) { 
 
-       <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg. ' - '. $part_pkg->comment %></OPTION>
+       <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg_comment %></OPTION>
 % } 
 
     </SELECT>

Index: meta-import.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/meta-import.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- meta-import.cgi	13 Jan 2008 21:14:19 -0000	1.5
+++ meta-import.cgi	21 Jun 2009 15:21:31 -0000	1.6
@@ -46,7 +46,7 @@
     First package: <SELECT NAME="pkgpart"><OPTION VALUE="">(none)</OPTION>
 % foreach my $part_pkg ( qsearch('part_pkg',{'disabled'=>'' }) ) { 
 
-     <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg. ' - '. $part_pkg->comment %></OPTION>
+     <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg_comment %></OPTION>
 % } 
 
 </SELECT><BR><BR>

Index: bulk_change_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/bulk_change_pkg.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bulk_change_pkg.cgi	30 Jan 2008 16:15:03 -0000	1.3
+++ bulk_change_pkg.cgi	21 Jun 2009 15:21:31 -0000	1.4
@@ -28,10 +28,7 @@
                      'table'          => 'part_pkg',
                      'name_col'       => 'pkg',
                      'empty_label'    => 'Select package',
-                     'label_callback' => sub { $_[0]->pkgpart. ': '.
-                                               $_[0]->pkg.     ' - '.
-                                               $_[0]->comment;
-                                             },
+                     'label_callback' => sub { $_[0]->pkg_comment },
                      'element_name'   => 'new_pkgpart',
                      'curr_value'     => ( $cgi->param('error')
                                            ? scalar($cgi->param('new_pkgpart'))

Index: cancel_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/cancel_pkg.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cancel_pkg.html	1 Apr 2008 06:34:16 -0000	1.7
+++ cancel_pkg.html	21 Jun 2009 15:21:31 -0000	1.8
@@ -17,7 +17,7 @@
 
 
 <BR><BR>
-<% ucfirst($method) . " $pkgnum: " .$part_pkg->pkg. ' - ' .$part_pkg->comment %>
+<% ucfirst($method) . $part_pkg->pkg_comment %>
 <% ntable("#cccccc", 2) %>
 
 % if ($method eq 'expire' || $method eq 'adjourn') {