X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=b6d1f9551c2bc894105d2bc46a6bacc746d48435;hb=8302c1388bb2232dccdc006e7250cbe6eea8cba3;hp=e3599bc06730661091317bafa54f21f5a18080b5;hpb=dba9cc11f7ad2337506e40ed2aa6bc9e890cc977;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index e3599bc06..b6d1f9551 100644
--- 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',
       )