[freeside-commits] branch master updated. 89f9957267f05520fc676c378694383d16eedeb1

[Ivan]

The branch, master has been updated
       via  89f9957267f05520fc676c378694383d16eedeb1 (commit)
       via  dc89d3d583bff237f56dac6dcda57412ba0584a8 (commit)
      from  4e68cf76788b220cc15f2a080df5e7a1ea4962b8 (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 89f9957267f05520fc676c378694383d16eedeb1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jan 18 13:10:18 2015 -0800

    invoice and quotation borders

diff --git a/conf/invoice_html b/conf/invoice_html
index bd99899..ae17da3 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -14,7 +14,7 @@
 .allcaps { text-transform:uppercase; font-size: 12pt }
 </STYLE>
 
-<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
+<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8 STYLE="border:1px solid #000000"><tr><td>
 
   <table class="invoice_header" width="100%">
     <tr>
diff --git a/conf/quotation_html b/conf/quotation_html
index 5458774..7d69205 100644
--- a/conf/quotation_html
+++ b/conf/quotation_html
@@ -14,7 +14,7 @@
 .allcaps { text-transform:uppercase }
 </STYLE>
 
-<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
+<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8 STYLE="border:1px solid #000000"><tr><td>
 
   <table class="invoice_header" width="100%">
     <tr>

commit dc89d3d583bff237f56dac6dcda57412ba0584a8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jan 18 12:25:50 2015 -0800

    fix compile bug in jayce's commit adding cust_bill->cancel method, RT#23357

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 0b8cb02..07c3320 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -678,21 +678,22 @@ sub cancel {
        join(', ', map { "$_: $opt{$_}" } keys %opt ). "\n"
     if $DEBUG;
 
-  return ( 'access denied' )
+  return ( 'Access denied' )
     unless $FS::CurrentUser::CurrentUser->access_right('Cancel customer');
 
   my @pkgs = $self->cust_pkg;
 
-  if ( !$opt{nobill} && $conf->exists('bill_usage_on_cancel') ) {
+  if ( !$opt{nobill} && $self->conf->exists('bill_usage_on_cancel') ) {
     $opt{nobill} = 1;
     my $error = $self->cust_main->bill( pkg_list => [ @pkgs ], cancel => 1 );
     warn "Error billing during cancel, custnum ". $self->custnum. ": $error"
       if $error;
   }
 
-  grep { $_ } map { $_->cancel(%opt) }
-  grep {! $_->getfield('cancel') } 
-  @pkgs;
+  grep { $_ }
+    map { $_->cancel(%opt) }
+      grep { ! $_->getfield('cancel') } 
+        @pkgs;
 }
 
 =item cust_bill_pay

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

Summary of changes:
 FS/FS/cust_bill.pm  |   11 ++++++-----
 conf/invoice_html   |    2 +-
 conf/quotation_html |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)