From e91ac7e6e069df321b815b08bf0e35d5fd3bd8f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 May 2009 01:45:09 +0000
Subject: [PATCH] add ability to delete invoice_latexreturnaddress and
 invoice_htmlreturnaddress too, RT#5218

---
 httemplate/config/config-view.cgi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 9b5b13251..c5ac1a685 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -100,7 +100,8 @@ Click on a configuration value to change it.
 %         my $confnum =
 %           _config_agentonly($conf, $i->key, $agent->agentnum)->confnum;
           (<A HREF="javascript:areyousure('delete this agent override', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view_showagent')">delete agent override</A>)
-%       } elsif ( $i->base_key ) {
+%       } elsif ( $i->base_key
+%                 || ( $deleteable{$i->key} && $conf->exists($i->key) ) ) {
 %         my $confnum =
 %           $agent
 %             ? _config_agentonly($conf, $i->key, $agent->agentnum)->confnum
@@ -319,6 +320,9 @@ my $conf = new FS::Conf;
 my @config_items = grep { $page_agent ? $_->per_agent : 1 }
                         $conf->config_items; 
 
+my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress );
+my %deleteable = map { $_ => 1 } @deleteable;
+
 my @sections = qw(required billing username password UI session shell BIND );
 push @sections, '', 'deprecated';
 
-- 
2.11.0