[freeside-commits] freeside/FS/FS Schema.pm, 1.236, 1.237 cust_pkg.pm, 1.171, 1.172

[Mark Wells]

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

Modified Files:
	Schema.pm cust_pkg.pm 
Log Message:
package contract end date field, RT#9918

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -w -d -r1.236 -r1.237
--- Schema.pm	25 Sep 2010 00:56:31 -0000	1.236
+++ Schema.pm	12 Oct 2010 01:15:16 -0000	1.237
@@ -1303,6 +1303,7 @@
         'adjourn',        @date_type,             '', '', 
         'cancel',         @date_type,             '', '', 
         'expire',         @date_type,             '', '', 
+        'contract_end',   @date_type,             '', '',
         'change_date',    @date_type,             '', '',
         'change_pkgnum',       'int', 'NULL', '', '', '',
         'change_pkgpart',      'int', 'NULL', '', '', '',

Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -w -d -r1.171 -r1.172
--- cust_pkg.pm	22 Sep 2010 19:16:17 -0000	1.171
+++ cust_pkg.pm	12 Oct 2010 01:15:17 -0000	1.172
@@ -153,6 +153,10 @@
 
 date
 
+=item contract_end
+
+date
+
 =item cancel
 
 date
@@ -259,7 +263,7 @@
     $self->start_date( timelocal_nocheck(0,0,0,1,$mon,$year) );
   }
 
-  foreach my $action ( qw(expire adjourn) ) {
+  foreach my $action ( qw(expire adjourn contract_end) ) {
     my $months = $self->part_pkg->option("${action}_months",1);
     if($months and !$self->$action) {
       my $start = $self->start_date || $self->setup || time;
@@ -2806,7 +2810,7 @@
       "NOT (".FS::cust_pkg->onetime_sql . ")";
   }
   else {
-    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 )) {
 
       next unless exists($params->{$field});