diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2017-12-08 00:07:26 +0000 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2017-12-08 00:07:26 +0000 |
| commit | 59066550d19fb8797f20bd989f9c5af06b42f0f6 (patch) | |
| tree | 0dcd311a0d62fb23414adc90889d962f146dc0d2 | |
| parent | 5827bcb469ef14c527356e785e981abf4254789d (diff) | |
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
| -rw-r--r-- | FS/FS/AccessRight.pm | 3 | ||||
| -rw-r--r-- | FS/FS/access_right.pm | 3 | ||||
| -rwxr-xr-x | httemplate/search/cust_credit.html | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index ce4fe9f..db4ff1a 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 3031815..87337d5 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 1ffa302..1edcd35 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 |