Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH

5 files changed, 19 insertions, 7 deletions

diff --git a/httemplate/edit/process/bulk-svc_phone.html b/httemplate/edit/process/bulk-svc_phone.html
index 5a1fbc647..db486de76 100644
--- a/httemplate/edit/process/bulk-svc_phone.html
+++ b/httemplate/edit/process/bulk-svc_phone.html
@@ -25,7 +25,7 @@ my $num_avail = $1;
 errorpage("There are only $num_avail available")
   if $end - $start + 1 > $num_avail;
 
-foreach my $phonenum ( $start .. $end ) {
+foreach my $phonenum ( "$start" .. "$end" ) {
 
   my $svc_phone = new FS::svc_phone {
     'phonenum' => $phonenum,
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 38d5c4486..67cdb87e8 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -144,7 +144,7 @@ if ( $quotationnum ) {
   $quotation_pkg->prospectnum($prospect_main->prospectnum) if $prospect_main;
 
   #XXX handle new location
-  $error = $quotation_pkg->insert;
+  $error = $quotation_pkg->insert || $quotation_pkg->estimate;
 
 } else {
 
diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 4d85c72e4..05a375ac7 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -106,7 +106,7 @@ function bill_now_changed (what) {
 
 <TABLE ID="QuickChargeTable" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 STYLE="background-color: #cccccc">
 
-% if ( $cust_pkg ) {
+% if ( $cust_pkg ) { #modify one-time charge
 
 <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $cust_pkg->pkgnum %>">
 % my $field = '/elements/tr-input-text.html';
diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html
index f9ff3079a..a64501fc0 100644
--- a/httemplate/view/cust_main/payment_history/voided_invoice.html
+++ b/httemplate/view/cust_main/payment_history/voided_invoice.html
@@ -1,9 +1,15 @@
 <DEL><% $link %><% $invoice %><% $link ? '</A>' : '' %></DEL>
-<I><% mt("voided [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %> 
+<I>voided
 % my $void_user = $cust_bill_void->void_access_user;
 % if ($void_user) {
-    by <% $void_user->username %></I>
+    by <% $void_user->username %>
 % }
+% my $reason = $cust_bill_void->reason;
+% if ($reason) {
+     (<% $reason %>)
+% }
+<% mt("on [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %>
+</I>
 <% "$unvoid$delete$under" %>
 <%init>
 
diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html
index a8194a75f..63cfb309f 100644
--- a/httemplate/view/cust_main/payment_history/voided_payment.html
+++ b/httemplate/view/cust_main/payment_history/voided_payment.html
@@ -1,9 +1,15 @@
 <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>voided
 % my $void_user = $cust_pay_void->void_access_user;
 % if ($void_user) {
-    by <% $void_user->username %></I>
+    by <% $void_user->username %>
 % }
+% my $reason = $cust_pay_void->reason;
+% if ($reason) {
+     (<% $reason %>)
+% }
+<% mt("on [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %>
+</I>
 <% $unvoid %>
 <%init>