remove payment deletion, RT#37908

[freeside.git] / httemplate / view / cust_main / payment_history.html

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index e3599bc..b6d1f95 100644 (file)
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -228,9 +228,15 @@ my %opt = (
       (
         'View invoices', 'Void invoices', 'Unvoid invoices',
         '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',
       )