X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_dsl.pm;h=89827e8d75476e2a515516ab703bc567b7f9cda3;hb=51fa32c6d1d22d4b78afd4bf12e307fbdacc6062;hp=93d357042e663e481b37434b07f39e5c5ed7e1ad;hpb=4e1e6d1a69d6c1f08c24859f7ed70b4489b691bf;p=freeside.git

diff --git a/FS/FS/svc_dsl.pm b/FS/FS/svc_dsl.pm
index 93d357042..89827e8d7 100644
--- a/FS/FS/svc_dsl.pm
+++ b/FS/FS/svc_dsl.pm
@@ -81,6 +81,10 @@ Vendor/telco DSL order status (e.g. (N)ew, (A)ssigned, (R)ejected, (M)revised,
 
 =item circuitnum - Circuit #
 
+=item vpi
+
+=item vci
+
 =item rate_band - Rate Band
 
 =item isp_chg
@@ -156,6 +160,8 @@ sub table_info {
 	    'rate_band' => {	label => 'Rate Band',
 				    disable_inventory => 1,
 			},
+	    'vpi' => { label => 'VPI', disable_inventory => 1 },
+	    'vci' => { label => 'VCI', disable_inventory => 1 },
 	    'isp_chg' => {	label => 'ISP Changing?', 
 				type => 'checkbox', %dis2 },
 	    'isp_prev' => {	label => 'Current or Previous ISP',
@@ -236,7 +242,7 @@ sub check {
   my $error = 
     $self->ut_numbern('svcnum')
     || $self->ut_numbern('pushed')
-    || $self->ut_number('desired_due_date')
+    || $self->ut_numbern('desired_due_date')
     || $self->ut_numbern('due_date')
     || $self->ut_textn('vendor_order_id')
     || $self->ut_textn('vendor_qual_id')
@@ -250,6 +256,8 @@ sub check {
     || $self->ut_textn('local_voice_provider')
     || $self->ut_textn('circuitnum')
     || $self->ut_textn('rate_band')
+    || $self->ut_numbern('vpi')
+    || $self->ut_numbern('vci')
     || $self->ut_alphan('isp_chg')
     || $self->ut_textn('isp_prev')
     || $self->ut_textn('username')
@@ -263,6 +271,27 @@ sub check {
   $self->SUPER::check;
 }
 
+sub predelete_hook_first {
+    my $self = shift;
+    my @exports = $self->part_svc->part_export_dsl_pull;
+    return 'More than one DSL-pulling export attached' if scalar(@exports) > 1;
+    if ( scalar(@exports) == 1 ) {
+	my $export = $exports[0];
+	return $export->dsl_pull($self);
+    }
+    '';
+}
+
+sub predelete_hook {
+    my $self = shift;
+    my @notes = $self->notes;
+    foreach my $note ( @notes ) {
+	my $error = $note->delete;
+	return $error if $error;
+    }
+    '';
+}
+
 =back
 
 =head1 SEE ALSO