[freeside-commits] branch master updated. 6a8cfb9dfdc9a48b840623fdf878cd4001482a57

[Jonathan Prykop]

The branch, master has been updated
       via  6a8cfb9dfdc9a48b840623fdf878cd4001482a57 (commit)
      from  b1b3d6b3c0db38909b6f569e08877d2678587d22 (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 6a8cfb9dfdc9a48b840623fdf878cd4001482a57
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Feb 23 09:04:46 2016 -0600

    RT#39586 Manual check refunds cannot be unapplied [nbsp]

diff --git a/httemplate/view/cust_main/payment_history/credit.html b/httemplate/view/cust_main/payment_history/credit.html
index da8ca2e..1e7a7df 100644
--- a/httemplate/view/cust_main/payment_history/credit.html
+++ b/httemplate/view/cust_main/payment_history/credit.html
@@ -45,7 +45,7 @@ if (    scalar(@cust_credit_bill)   == 0
     if ( $opt{total_unapplied_refunds} > 0 ) {
       $apply.= ' ('.
                include( '/elements/popup_link.html',
-                          'label'    => emt('apply refund'),
+                          'label'    => emt('apply').' '.emt('refund'),
                           'action'   => "${p}edit/cust_credit_refund.cgi?".
                                         $cust_credit->crednum,
                           'actionlabel' => emt('Apply credit to refund'),
@@ -100,7 +100,7 @@ if (    scalar(@cust_credit_bill)   == 0
       if ( $opt{total_unapplied_refunds} > 0 ) {
         $apply.= ' ('.
                  include( '/elements/popup_link.html',
-                            'label'       => emt('apply refund'),
+                            'label'       => emt('apply').' '.emt('refund'),
                             'action'      => "${p}edit/cust_credit_refund.cgi?".
                                              $cust_credit->crednum,
                             'actionlabel' => emt('Apply credit to refund'),
@@ -150,7 +150,7 @@ if ($opt{'Unapply credit'} && !$cust_credit->closed) {
   $unapply .= areyousure_link("${p}misc/unapply-cust_credit_refund.cgi?".$cust_credit->crednum,
                                emt('Are you sure you want to unapply this credit from refunds?'),
                                emt('Keep this credit, but dissociate it from the refunds it is currently applied to'),
-                               emt('unapply refunds')
+                               emt('unapply').' '.emt('refunds')
                              )
     if $cust_credit->refund_to_unapply;
 }
diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 8faed3c..f65c903 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -103,7 +103,7 @@ if ($unapplied > 0) {
     if ( $opt{total_unapplied_refunds} > 0 ) {
       $apply.= ' ('.
                include( '/elements/popup_link.html',
-                          'label'       => emt('apply refund'),
+                          'label'       => emt('apply').' '.emt('refund'),
                           'action'      => "${p}edit/cust_pay_refund.cgi?".
                                            $cust_pay->paynum,
                           'actionlabel' => emt('Apply payment to refund'),
@@ -207,7 +207,7 @@ if ($opt{'Unapply payment'} && !$cust_pay->closed) {
   $unapply .= areyousure_link("${p}misc/unapply-cust_pay_refund.cgi?".$cust_pay->paynum,
                                emt('Are you sure you want to unapply this payment from refunds?'),
                                emt('Keep this payment, but dissociate it from the refunds it is currently applied to'),
-                               emt('unapply refunds')
+                               emt('unapply').' '.emt('refunds')
                              )
     if $cust_pay->refund_to_unapply;
 }

-----------------------------------------------------------------------

Summary of changes:
 httemplate/view/cust_main/payment_history/credit.html  |    6 +++---
 httemplate/view/cust_main/payment_history/payment.html |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)