mark@pc-intouch.com: exporttype2svcdb removal

2 files changed, 15 insertions, 23 deletions

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 52c8213a0..9af00174d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -494,25 +494,19 @@ sub export_info {
   my $r = { map { %{$exports{$_}} } keys %exports };
 }
 
-=item exporttype2svcdb EXPORTTYPE
-
-Returns the applicable I<svcdb> for an I<exporttype>.
-
-=cut
-
-# This subroutine should be modified or removed.  In its present form, it
-# imposes the arbitrary restriction that no export type can be associated 
-# with more than one svcdb.  The only place it's used is in edit/part_svc.cgi
-# to generate the list of allowed exports, which can be done more cleanly by 
-# export_info anyway.
-
-sub exporttype2svcdb {
-  my $exporttype = $_[0];
-  foreach my $svcdb ( keys %exports ) {
-    return $svcdb if grep { $exporttype eq $_ } keys %{$exports{$svcdb}};
-  }
-  '';
-}
+#=item exporttype2svcdb EXPORTTYPE
+#
+#Returns the applicable I<svcdb> for an I<exporttype>.
+#
+#=cut
+#
+#sub exporttype2svcdb {
+#  my $exporttype = $_[0];
+#  foreach my $svcdb ( keys %exports ) {
+#    return $svcdb if grep { $exporttype eq $_ } keys %{$exports{$svcdb}};
+#  }
+#  '';
+#}
 
 tie my %sysvshell_options, 'Tie::IxHash',
   'crypt' => { label=>'Password encryption',
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 36f764140..4ccb770fb 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -144,10 +144,8 @@ my %defs = (
       my $columns = 3;
       my $count = 0;
       my @part_export =
-#        grep { $layer eq FS::part_export::exporttype2svcdb($_->exporttype) }
-#          qsearch( 'part_export', {} );
-         map { qsearch( 'part_export', {exporttype => $_ } ) }
-           keys(%{FS::part_export::export_info($layer)});
+        map { qsearch( 'part_export', {exporttype => $_ } ) }
+          keys %{FS::part_export::export_info($layer)};
      $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {