[freeside-commits] branch master updated. 42e878b29ae26943d7dc3acfbb7f095a56ae0a2f

[Alex Brelsfoard]

The branch, master has been updated
       via  42e878b29ae26943d7dc3acfbb7f095a56ae0a2f (commit)
       via  063d9f211aa19a26755279ad7277648cfdae6313 (commit)
      from  764f8f4bb0185d7aa03676c795f84094b378b286 (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 42e878b29ae26943d7dc3acfbb7f095a56ae0a2f
Merge: 063d9f2 764f8f4
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Wed Jan 28 14:44:00 2015 -0500

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


764f8f4bb0185d7aa03676c795f84094b378b286
diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index f30508d..b160343 100644
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -405,6 +405,11 @@ sub search {
 
 }
 
+# stub this so that calling ->cust_bill doesn't return an empty string
+sub cust_bill {
+  return;
+}
+
 =back
 
 =head1 BUGS

commit 063d9f211aa19a26755279ad7277648cfdae6313
Author: Alex Brelsfoard <alex at freeside.biz>
Date:   Wed Jan 28 06:15:41 2015 -0500

    RT #25498 adding reason to voided payments and voided invoices on payment history

diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html
index f9ff307..ba51b3b 100644
--- a/httemplate/view/cust_main/payment_history/voided_invoice.html
+++ b/httemplate/view/cust_main/payment_history/voided_invoice.html
@@ -1,5 +1,5 @@
 <DEL><% $link %><% $invoice %><% $link ? '</A>' : '' %></DEL>
-<I><% mt("voided [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %> 
+<I><% mt("voided ([_1]) [_2]", $cust_bill_void->reason, time2str($date_format, $cust_bill_void->void_date) ) |h %> 
 % my $void_user = $cust_bill_void->void_access_user;
 % if ($void_user) {
     by <% $void_user->username %></I>
diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html
index a8194a7..207ab9c 100644
--- a/httemplate/view/cust_main/payment_history/voided_payment.html
+++ b/httemplate/view/cust_main/payment_history/voided_payment.html
@@ -1,5 +1,5 @@
 <DEL><% mt("Payment [_1] by [_2]", $info, $cust_pay_void->otaker ) |h %></DEL>
-<I><% mt("voided [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> 
+<I><% mt("voided ([_1]) [_2]", $cust_pay_void->reason, time2str($date_format, $cust_pay_void->void_date) ) |h %> 
 % my $void_user = $cust_pay_void->void_access_user;
 % if ($void_user) {
     by <% $void_user->username %></I>

764f8f4bb0185d7aa03676c795f84094b378b286
diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index f30508d..b160343 100644
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -405,6 +405,11 @@ sub search {
 
 }
 
+# stub this so that calling ->cust_bill doesn't return an empty string
+sub cust_bill {
+  return;
+}
+
 =back
 
 =head1 BUGS

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

Summary of changes:
 httemplate/view/cust_main/payment_history/voided_invoice.html |    2 +-
 httemplate/view/cust_main/payment_history/voided_payment.html |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)