From: Mitch Jackson <mitch@freeside.biz>
Date: Fri, 8 Dec 2017 00:07:26 +0000 (+0000)
Subject: RT# 73200 Show voided credits on Credit Report - backport fixes
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=59066550d19fb8797f20bd989f9c5af06b42f0f6;p=freeside.git

RT# 73200 Show voided credits on Credit Report - backport fixes

 - Fixed access rights mismatch that broke voiding credits
 - Update report pulling non-existant column commission_invnum
---

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index ce4fe9fc6..db4ff1a85 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -237,7 +237,7 @@ tie my %rights, 'Tie::IxHash',
     'Refund Echeck payment',
     'Delete refund', #NEW
     'Add on-the-fly credit reason', #NEW
-    'Add on-the-fly void credit reason',
+    'Add on-the-fly void reason',
     'Add on-the-fly refund reason', #NEW
   ],
   
@@ -509,4 +509,3 @@ L<FS::access_right>, L<FS::access_group>, L<FS::access_user>
 =cut
 
 1;
-
diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 3031815f8..87337d5d7 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -253,7 +253,7 @@ sub _upgrade_data { # class method
     'Generate quotation' => 'Disable quotation',
     'Void credit' => 'Void credit',
     'Unvoid credit' => 'Unvoid credit',
-    'Add on-the-fly void credit reason' => 'Add on-the-fly void credit reason',
+    'Add on-the-fly void credit reason' => 'Add on-the-fly void reason',
     '_ALL' => 'Employee preference telephony integration',
     '_ALL' => 'RT activity notification',
     'Edit customer package dates' => [ 'Change package start date', #4.x
@@ -361,4 +361,3 @@ L<FS::Record>, schema.html from the base documentation.
 =cut
 
 1;
-
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 1ffa302c8..1edcd35eb 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -265,7 +265,6 @@ my @select = (
      cust_credit.commission_agentnum
      cust_credit.commission_salesnum
      cust_credit.commission_pkgnum
-     cust_credit.commission_invnum
      cust_credit.credbatch
      ),
   'Null as void_date',
@@ -295,7 +294,6 @@ my @select_void = (
      cust_credit_void.commission_agentnum
      cust_credit_void.commission_salesnum
      cust_credit_void.commission_pkgnum
-     cust_credit_void.commission_invnum
      ),
   'Null as credbatch',
   qw(cust_credit_void.void_date