[freeside-commits] freeside/httemplate/edit/process cust_main_note.cgi, 1.6, 1.7 cust_main_attach.cgi, 1.3, 1.4

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process
In directory wavetail.420.am:/tmp/cvs-serv14480/httemplate/edit/process

Modified Files:
	cust_main_note.cgi cust_main_attach.cgi 
Log Message:
fix customer notes and attachments wrt s/otaker/usernum/ changes; still need to look at the migration, RT#7935

Index: cust_main_note.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/cust_main_note.cgi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- cust_main_note.cgi	14 Jul 2008 23:08:36 -0000	1.6
+++ cust_main_note.cgi	31 Mar 2010 07:35:46 -0000	1.7
@@ -18,16 +18,12 @@
   or die "Illegal notenum: ". $cgi->param('notenum');
 my $notenum = $1;
 
-my $otaker = $FS::CurrentUser::CurrentUser->name;
-$otaker = $FS::CurrentUser::CurrentUser->username
-  if ($otaker eq "User, Legacy");
-
 my $new = new FS::cust_main_note ( {
   notenum  => $notenum,
   custnum  => $custnum,
   _date    => time,
-  otaker   => $otaker,
-  comments =>  $cgi->param('comment'),
+  usernum  => $FS::CurrentUser::CurrentUser->usernum,
+  comments => scalar($cgi->param('comment')),
 } );
 
 my $error;

Index: cust_main_attach.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/cust_main_attach.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- cust_main_attach.cgi	17 Nov 2009 00:06:24 -0000	1.3
+++ cust_main_attach.cgi	31 Mar 2010 07:35:46 -0000	1.4
@@ -25,8 +25,6 @@
 my $attachnum = $1;
 
 my $curuser = $FS::CurrentUser::CurrentUser;
-my $otaker = $curuser->name;
-$otaker = $curuser->username if ($otaker eq "User, Legacy");
 
 my $delete = $cgi->param('delete');
 my $undelete = $cgi->param('undelete');
@@ -36,7 +34,7 @@
   attachnum => $attachnum,
   custnum   => $custnum,
   _date     => time,
-  otaker    => $otaker,
+  usernum   => $curuser->usernum,
   disabled  => '',
 });
 my $old;