[freeside-commits] branch FREESIDE_4_BRANCH updated. 65e850185422f0ccb703b25849c7ee18d9f6c0b6
Ivan
ivan at 420.am
Tue Sep 29 11:46:02 PDT 2015
The branch, FREESIDE_4_BRANCH has been updated
via 65e850185422f0ccb703b25849c7ee18d9f6c0b6 (commit)
via e542a712f667dbf34065c6d93088263d5dda3480 (commit)
via 591dbb3c028e14541f1933bfc2f5073a6508c8fd (commit)
via 8302c1388bb2232dccdc006e7250cbe6eea8cba3 (commit)
from a7cff4d97acd6e76604e4198cfa923f1e52b80a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65e850185422f0ccb703b25849c7ee18d9f6c0b6
Merge: e542a71 a7cff4d
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Sep 29 11:45:55 2015 -0700
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_4_BRANCH
commit e542a712f667dbf34065c6d93088263d5dda3480
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Sep 29 11:33:38 2015 -0700
remove payment deletion, RT#37908
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index a428d43..95cf29a 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -184,7 +184,6 @@ tie my %rights, 'Tie::IxHash',
'Resend invoices', #NEWNEW
'Void invoices',
'Unvoid invoices',
- 'Delete invoices',
'View customer tax exemptions', #yow
'Edit customer tax exemptions', #NEWNEW
'Add customer tax adjustment', #new, but no need to phase in
commit 591dbb3c028e14541f1933bfc2f5073a6508c8fd
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Sep 28 20:24:46 2015 -0700
remove payment deletion, RT#37908
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index b6d1f95..d81fe99 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -230,13 +230,8 @@ my %opt = (
'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
'Post refund', 'Post check refund', 'Post cash refund ', 'Refund payment',
'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
-<<<<<<< HEAD
- 'Delete payment', 'Unapply payment',
- 'Apply credit', 'Delete credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
-=======
'Unapply payment',
'Apply credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
->>>>>>> 727d620... remove payment deletion, RT#37908
'Delete refund',
'Billing event reports', 'View customer billing events',
)
commit 8302c1388bb2232dccdc006e7250cbe6eea8cba3
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Sep 28 20:21:12 2015 -0700
remove payment deletion, RT#37908
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index c26cc2c..a428d43 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -210,7 +210,6 @@ tie my %rights, 'Tie::IxHash',
{ rightname=>'Process payment', desc=>'Process credit card or e-check payments' },
'Process credit card payment',
'Process Echeck payment',
- { rightname=>'Delete payment', desc=>'Enable deletion of unclosed payments. Be very careful! Only delete payments that were data-entry errors, not adjustments.' }, #aka. deletepayments Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.
],
###
@@ -224,7 +223,6 @@ tie my %rights, 'Tie::IxHash',
'Void credit', #NEWER than things marked NEWNEWNEW
'Unvoid credit', #NEWER than things marked NEWNEWNEW
{ rightname=>'Unapply credit', desc=>'Enable "unapplication" of unclosed credits.' }, #aka unapplycredits
- { rightname=>'Delete credit', desc=>'Enable deletion of unclosed credits. Be very careful! Only delete credits that were data-entry errors, not adjustments.' }, #aka. deletecredits Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.
'View refunds',
{ rightname=>'Post refund', desc=>'Enable posting of check and cash refunds.' },
'Post check refund',
@@ -442,9 +440,6 @@ Most (but not all) right names.
sub default_superuser_rights {
my $class = shift;
my %omit = map { $_=>1 } (
- 'Delete invoices',
- 'Delete payment',
- 'Delete credit', #?
'Delete refund', #?
'Edit customer package dates',
'Time queue',
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 1525e93..b6d1f95 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -230,8 +230,13 @@ my %opt = (
'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
'Post refund', 'Post check refund', 'Post cash refund ', 'Refund payment',
'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
+<<<<<<< HEAD
'Delete payment', 'Unapply payment',
'Apply credit', 'Delete credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
+=======
+ 'Unapply payment',
+ 'Apply credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
+>>>>>>> 727d620... remove payment deletion, RT#37908
'Delete refund',
'Billing event reports', 'View customer billing events',
)
diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 0ed2f80..fd336b8 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -1,5 +1,5 @@
<% $payment. ' '. $info. $desc.
- $view. $change_pkg. $apply. $refund. $void. $delete. $unapply
+ $view. $change_pkg. $apply. $refund. $void. $unapply
%>
<%init>
@@ -185,16 +185,6 @@ $void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum,
|| ( $cust_pay->payby !~ /^(CARD|CHEK)$/ && $opt{'Void payments'} )
);
-my $delete = '';
-$delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum,
- emt('Are you sure you want to delete this payment?'),
- emt('Delete this payment from the database completely - not recommended'),
- emt('delete')
- )
- if $cust_pay->closed !~ /^Y/i
- && $opt{'deletepayments'}
- && $opt{'Delete payment'};
-
my $unapply = '';
$unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum,
emt('Are you sure you want to unapply this payment?'),
-----------------------------------------------------------------------
Summary of changes:
FS/FS/AccessRight.pm | 6 ------
httemplate/view/cust_main/payment_history.html | 4 ++--
httemplate/view/cust_main/payment_history/payment.html | 12 +-----------
3 files changed, 3 insertions(+), 19 deletions(-)
More information about the freeside-commits
mailing list