summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2015-09-28 20:24:46 -0700
committerIvan Kohler <ivan@freeside.biz>2015-09-28 20:24:46 -0700
commit591dbb3c028e14541f1933bfc2f5073a6508c8fd (patch)
tree7a13af15b90cc67bf2ff8c95ab506cdb83fb1271
parent8302c1388bb2232dccdc006e7250cbe6eea8cba3 (diff)
remove payment deletion, RT#37908
-rw-r--r--httemplate/view/cust_main/payment_history.html5
1 files changed, 0 insertions, 5 deletions
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index b6d1f9551..d81fe9935 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',
)