[freeside-commits] freeside/FS/FS AccessRight.pm, 1.57, 1.58 Conf.pm, 1.401, 1.402 geocode_Mixin.pm, 1.3, 1.4 qual.pm, 1.5, 1.6

[Erik Levinson]

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

Modified Files:
	AccessRight.pm Conf.pm geocode_Mixin.pm qual.pm 
Log Message:
-small svc_dsl UI and flow changes, RT7111
-finish basic qualifications, except prospect support, RT7111


Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -w -d -r1.401 -r1.402
--- Conf.pm	23 Nov 2010 01:39:01 -0000	1.401
+++ Conf.pm	7 Dec 2010 19:04:42 -0000	1.402
@@ -4068,6 +4068,13 @@
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'qual-alt-address-format',
+    'section'     => 'UI',
+    'description' => 'Enable the alternate address format (location type, number, and kind) on qualifications',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },

Index: qual.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/qual.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- qual.pm	6 Dec 2010 06:36:01 -0000	1.5
+++ qual.pm	7 Dec 2010 19:04:42 -0000	1.6
@@ -127,6 +127,15 @@
   $self->SUPER::check;
 }
 
+sub export {
+    my $self = shift;
+    if ( $self->exportnum ) {
+	return qsearchs('part_export', { exportnum => $self->exportnum } )
+		or die 'invalid exportnum';
+    }
+    '';
+}
+
 sub location {
     my $self = shift;
     if ( $self->locationnum ) {

Index: geocode_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/geocode_Mixin.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- geocode_Mixin.pm	1 Dec 2010 05:56:09 -0000	1.3
+++ geocode_Mixin.pm	7 Dec 2010 19:04:42 -0000	1.4
@@ -88,7 +88,7 @@
   my $prefix = $self->has_ship_address ? 'ship_' : '';
 
   my $notfirst = 0;
-  foreach (qw ( address1 address2 ) ) {
+  foreach (qw ( address1 address2 location_type location_number ) ) {
     my $method = "$prefix$_";
     $line .= ($notfirst ? $separator : ''). &$escape($self->$method)
       if $self->$method;

Index: AccessRight.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/AccessRight.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -w -d -r1.57 -r1.58
--- AccessRight.pm	8 Nov 2010 19:58:39 -0000	1.57
+++ AccessRight.pm	7 Dec 2010 19:04:42 -0000	1.58
@@ -143,6 +143,7 @@
     'Add on-the-fly suspend reason', #NEW
     'Edit customer package invoice details', #NEW
     'Edit customer package comments', #NEW
+    'Qualify service', #NEW
   ],
   
   ###