Merge branch 'master' of git.freeside.biz:/home/git/freeside

2 files changed, 5 insertions, 1 deletions

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index dcc02c2b1..81c121259 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -721,6 +721,10 @@ if ( $curuser->access_right('Configuration') ) {
   $config_billing{'separator5'} = ''; #its a separator!
   $config_billing{'Refund reasons'}  = [ $fsurl.'browse/reason.html?class=F', 'Refund reasons explain why a refund was issued.' ];
   $config_billing{'Refund reason types'}  = [ $fsurl.'browse/reason_type.html?class=F', 'Refund reason types define groups of reasons.' ];
+
+  $config_billing{'separator6'} = ''; #its a separator!
+  $config_billing{'Void reasons'}  = [ $fsurl.'browse/reason.html?class=X', 'Void reasons explain why a void was issued.' ];
+  $config_billing{'Void reason types'}  = [ $fsurl.'browse/reason_type.html?class=X', 'Void reason types define groups of reasons.' ];
 }
 
 #XXX also to be unified
diff --git a/httemplate/elements/tr-select-reason.html b/httemplate/elements/tr-select-reason.html
index 125874694..37a34baba 100755
--- a/httemplate/elements/tr-select-reason.html
+++ b/httemplate/elements/tr-select-reason.html
@@ -199,7 +199,7 @@ if ($class eq 'C') {
 } elsif ($class eq 'F') {
   $add_access_right = 'Add on-the-fly refund reason';
 } elsif ($class eq 'X') {
-  $add_access_right = 'Add on-the-fly void credit reason';
+  $add_access_right = 'Add on-the-fly void reason';
 } else {
   die "illegal class: $class";
 }