[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.68, 1.69 report_cust_pkg.html, 1.16, 1.17

[Mark Wells]

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

Modified Files:
	cust_pkg.cgi report_cust_pkg.html 
Log Message:
package contract end date field, RT#9918

Index: report_cust_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_pkg.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -d -r1.16 -r1.17
--- report_cust_pkg.html	20 May 2010 08:48:51 -0000	1.16
+++ report_cust_pkg.html	12 Oct 2010 01:15:17 -0000	1.17
@@ -89,7 +89,7 @@
 
 %   }
 
-%   foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
+%   foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end cancel )) {
 
       <TR>
         <TD ALIGN="right" VALIGN="center"><% $label{$field} %></TD>
@@ -181,6 +181,7 @@
   'adjourn'   => 'Adjourns',
   'susp'      => 'Suspended',
   'expire'    => 'Expires',
+  'contract_end' => 'Contract ends',
   'cancel'    => 'Cancelled',
 );
 

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -w -d -r1.68 -r1.69
--- cust_pkg.cgi	17 Sep 2010 18:07:08 -0000	1.68
+++ cust_pkg.cgi	12 Oct 2010 01:15:17 -0000	1.69
@@ -19,6 +19,7 @@
                                      'Adjourn',
                                      'Susp.',
                                      'Expire',
+                                     'Contract end',
                                      'Cancel',
                                      'Reason',
                                      FS::UI::Web::cust_header(
@@ -59,7 +60,7 @@
                     #sub { time2str('%b %d %Y', shift->expire); },
                     #sub { time2str('%b %d %Y', shift->get('cancel')); },
                     ( map { time_or_blank($_) }
-                          qw( setup last_bill bill adjourn susp expire cancel ) ),
+          qw( setup last_bill bill adjourn susp expire contract_end cancel ) ),
 
                     sub { my $self = shift;
                           my $return = '';
@@ -206,7 +207,7 @@
   ''                => {},
 );
 
-foreach my $field (qw( setup last_bill bill adjourn susp expire cancel active )) {
+foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end cancel active )) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);