[freeside-commits] freeside/FS/FS svc_acct.pm, 1.217.2.19, 1.217.2.20 svc_Common.pm, 1.39.2.6, 1.39.2.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	svc_acct.pm svc_Common.pm 
Log Message:
add name (svc_acct.finger) to bulk billing detail, RT#3519

Index: svc_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_Common.pm,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -u -d -r1.39.2.6 -r1.39.2.7
--- svc_Common.pm	14 Aug 2008 01:52:29 -0000	1.39.2.6
+++ svc_Common.pm	23 Mar 2009 17:02:34 -0000	1.39.2.7
@@ -150,6 +150,11 @@
   $self->svcnum;
 }
 
+sub label_long {
+  my $self = shift;
+  $self->label(@_);
+}
+
 =item check
 
 Checks the validity of fields in this record.

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.217.2.19
retrieving revision 1.217.2.20
diff -u -d -r1.217.2.19 -r1.217.2.20
--- svc_acct.pm	19 Aug 2008 18:42:44 -0000	1.217.2.19
+++ svc_acct.pm	23 Mar 2009 17:02:34 -0000	1.217.2.20
@@ -269,7 +269,7 @@
                          disable_inventory => 1,
                          disable_select => 1,
                        },
-        'finger'    => 'Real name (GECOS)',
+        'finger'    => 'Real name', # (GECOS)',
         'domsvc'    => {
                          label     => 'Domain',
                          #def_label => 'svcnum from svc_domain',
@@ -448,8 +448,23 @@
   $self->email(@_);
 }
 
+=item label_long [ END_TIMESTAMP [ START_TIMESTAMP ] ]
+
+Returns a longer string label for this acccount ("Real Name <username at domain>"
+if available, or "username at domain").
+
+END_TIMESTAMP and START_TIMESTAMP can optionally be passed when dealing with
+history records.
+
 =cut
 
+sub label_long {
+  my $self = shift;
+  ( $self->finger =~ /\S/ )
+    ? $self->finger. ' <'.$self->label(@_).'>'
+    : $self->label(@_);
+}
+
 =item insert [ , OPTION => VALUE ... ]
 
 Adds this account to the database.  If there is an error, returns the error,