[freeside-commits] branch FREESIDE_3_BRANCH updated. ab0e2bb4316412fa1a46614f6ec5103c5ea8383b

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  ab0e2bb4316412fa1a46614f6ec5103c5ea8383b (commit)
      from  3ce79089dc0cba6ccf5b88174a340811e886e0a1 (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 ab0e2bb4316412fa1a46614f6ec5103c5ea8383b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 11 23:25:31 2014 -0800

    add ;plaintext=1 to view a plaintext invoice for debugging

diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index 82eb9b5..3933e9d 100644
--- a/httemplate/elements/freeside.css
+++ b/httemplate/elements/freeside.css
@@ -3,6 +3,10 @@
   /* font-family: Verdana, Arial, Helvetica, sans-serif; */
 }
 
+pre {
+  font-family: monospace;
+}
+
 A:link IMG, A:visited { border-style: none }
 /* A:focus {text-decoration: underline } */
 
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4822ab7..3440304 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -135,10 +135,10 @@ function change_invoice_mode(obj) {
 
 <% $br ? '<BR><BR>' : '' %>
 
-% if ( $conf->exists('invoice_html') ) { 
+% if ( $conf->exists('invoice_html') && ! $cgi->param('plaintext') ) { 
   <% join('', $cust_bill->print_html(\%opt) ) %>
 % } else { 
-  <PRE><% join('', $cust_bill->print_text(\%opt) ) %></PRE>
+  <PRE><% join('', $cust_bill->print_text(\%opt) ) |h %></PRE>
 % } 
 
 <& /elements/footer.html &>

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

Summary of changes:
 httemplate/elements/freeside.css |    4 ++++
 httemplate/view/cust_bill.cgi    |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)