[freeside-commits] freeside/FS/FS cust_pkg.pm, 1.188, 1.189 cust_pkg_discount.pm, 1.6, 1.7

[Ivan,,,]

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

Modified Files:
	cust_pkg.pm cust_pkg_discount.pm 
Log Message:
fix otaker getting inserted and messing up discount reports; upgrade fixes db, RT#10876

Index: cust_pkg_discount.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg_discount.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- cust_pkg_discount.pm	29 Mar 2010 00:23:07 -0000	1.6
+++ cust_pkg_discount.pm	12 Jan 2011 06:26:42 -0000	1.7
@@ -165,10 +165,13 @@
     || $self->ut_float('months_used') #actually decimal, but this will do
     || $self->ut_numbern('end_date')
     || $self->ut_alphan('otaker')
+    || $self->ut_numbern('usernum')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
   ;
   return $error if $error;
 
+  $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
+
   $self->SUPER::check;
 }
 

Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -w -d -r1.188 -r1.189
--- cust_pkg.pm	28 Dec 2010 20:14:19 -0000	1.188
+++ cust_pkg.pm	12 Jan 2011 06:26:42 -0000	1.189
@@ -2506,7 +2506,6 @@
     'discountnum' => $self->discountnum,
     'months_used' => 0,
     'end_date'    => '', #XXX
-    'otaker'      => $self->otaker,
     #for the create a new discount case
     '_type'       => $self->discountnum__type,
     'amount'      => $self->discountnum_amount,