[freeside-commits] branch master updated. 1a2b4deb55de4659f25a607fa1918d162b0be7d1

[Mark Wells]

The branch, master has been updated
       via  1a2b4deb55de4659f25a607fa1918d162b0be7d1 (commit)
       via  e955f682e4a756ff90c3463efd82377896631047 (commit)
      from  1820be6ab6ebe7efa911b4dc80810b07c233980f (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 1a2b4deb55de4659f25a607fa1918d162b0be7d1
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Apr 14 15:37:30 2016 -0700

    set invoice defaults to support online printing, #33849

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 87fd252..419a7e3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1389,7 +1389,7 @@ and customer address. Include units.',
   {
     'key'         => 'invoice_latexextracouponspace',
     'section'     => 'invoicing',
-    'description' => 'Optional LaTeX invoice textheight space to reserve for a tear off coupon.  Include units.  Default is 3.6cm',
+    'description' => 'Optional LaTeX invoice textheight space to reserve for a tear off coupon.  Include units.  Default is 2.7 inches.',
     'type'        => 'text',
     'per_agent'   => 1,
     'validate'    => sub { shift =~
@@ -1401,7 +1401,7 @@ and customer address. Include units.',
   {
     'key'         => 'invoice_latexcouponfootsep',
     'section'     => 'invoicing',
-    'description' => 'Optional LaTeX invoice separation between tear off coupon and footer. Include units.',
+    'description' => 'Optional LaTeX invoice separation between bottom of coupon address and footer. Include units. Default is 0.2 inches.',
     'type'        => 'text',
     'per_agent'   => 1,
     'validate'    => sub { shift =~
@@ -1413,7 +1413,7 @@ and customer address. Include units.',
   {
     'key'         => 'invoice_latexcouponamountenclosedsep',
     'section'     => 'invoicing',
-    'description' => 'Optional LaTeX invoice separation between total due and amount enclosed line. Include units.',
+    'description' => 'Optional LaTeX invoice separation between total due and amount enclosed line. Include units. Default is 2.25 em.',
     'type'        => 'text',
     'per_agent'   => 1,
     'validate'    => sub { shift =~
@@ -1424,7 +1424,7 @@ and customer address. Include units.',
   {
     'key'         => 'invoice_latexcoupontoaddresssep',
     'section'     => 'invoicing',
-    'description' => 'Optional LaTeX invoice separation between invoice data and the to address (usually invoice_latexreturnaddress).  Include units.',
+    'description' => 'Optional LaTeX invoice separation between invoice data and the address (usually invoice_latexreturnaddress).  Include units. Default is 1 inch.',
     'type'        => 'text',
     'per_agent'   => 1,
     'validate'    => sub { shift =~
diff --git a/conf/invoice_latex b/conf/invoice_latex
index a1b9d9b..2a0f882 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -66,7 +66,7 @@
   }
 }
 
-\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '3.6cm' --@]}
+\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '2.7in' --@]}
 
 % Adjust the inset of the mailing address
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}
@@ -95,7 +95,9 @@
     $OUT .= '\vspace{-\extracouponspace}';
     $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';
     $OUT .= $coupon;
-    $OUT .= '\vspace{'. $couponfootsep. '}' if defined($couponfootsep);
+    $OUT .= '\vspace{'.
+      (defined($couponfootsep) ? $couponfootsep : '0.2in') .
+      '}';
   }
   '';
 --@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]
diff --git a/conf/invoice_latexcoupon b/conf/invoice_latexcoupon
index a0338bd..2380226 100644
--- a/conf/invoice_latexcoupon
+++ b/conf/invoice_latexcoupon
@@ -24,7 +24,7 @@ Customer\#& \textbf{[@-- $custnum --@]} & \\
 Total Due & \textbf{[@-- $balance --@]} & \\
 \rule{0pt}{[@-- defined($amountenclosedsep) ? $amountenclosedsep : '2.25em' --@]}Amount Enclosed & \rule{2cm}{1pt}& \\
 \end{tabular}\\
-\rule{0pt}{[@-- defined($coupontoaddresssep) ? $coupontoaddresssep : '1cm' --@]} &\\
+\rule{0pt}{[@-- defined($coupontoaddresssep) ? $coupontoaddresssep : '1in' --@]} &\\
 \end{tabular}\\
 \begin{tabular}{ll}
 \addressinset \rule{0.5cm}{0cm} &

commit e955f682e4a756ff90c3463efd82377896631047
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Apr 14 15:15:43 2016 -0700

    fix typo

diff --git a/conf/invoice_latex b/conf/invoice_latex
index b64cc69..a1b9d9b 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -209,7 +209,7 @@
   \hline
 }
 
-}% ...description...
+% ...description...
 \newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
   \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &

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

Summary of changes:
 FS/FS/Conf.pm            |    8 ++++----
 conf/invoice_latex       |    8 +++++---
 conf/invoice_latexcoupon |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)