[freeside-commits] freeside/httemplate/edit part_svc.cgi, 1.57.2.3, 1.57.2.4

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	part_svc.cgi 
Log Message:
more DTRT with usage on service transfer between packages and recharges  RT #2884, #5040

Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.57.2.3
retrieving revision 1.57.2.4
diff -u -d -r1.57.2.3 -r1.57.2.4
--- part_svc.cgi	16 Mar 2008 05:13:55 -0000	1.57.2.3
+++ part_svc.cgi	24 Mar 2009 04:36:16 -0000	1.57.2.4
@@ -131,7 +131,14 @@
 %
 %      #yucky kludge
 %      my @fields = defined( dbdef->table($layer) )
-%                      ? grep { $_ ne 'svcnum' } fields($layer)
+%                      ? grep {
+%                               $_ ne 'svcnum' &&
+%                               ( !FS::part_svc->svc_table_fields($layer)
+%                                     ->{$_}->{disable_part_svc_column}   ||
+%                                 $part_svc->part_svc_column($_)->columnflag
+%                               )
+%                             }
+%                             fields($layer)
 %                      : ();
 %      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
 %      $part_svc->svcpart($clone) if $clone; #haha, undone below