[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 01dea7aafbd42417920e5e9f52339723a90e4f1f

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  01dea7aafbd42417920e5e9f52339723a90e4f1f (commit)
      from  e79c279bab580359933419928b4e579380d13c00 (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 01dea7aafbd42417920e5e9f52339723a90e4f1f
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Mar 27 15:59:41 2013 -0700

    alignment of unit price column, #18959

diff --git a/conf/invoice_html b/conf/invoice_html
index 567385b..cd34827 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -132,8 +132,8 @@
             $OUT .=  '<th align="center">' . emt('Ref') . '</th>'.
                      '<th align="left">' . emt('Description') . '</th>'.
                      ( $unitprices 
-                       ? '<th align="left">' . emt('Unit Price') . '</th>'.
-                         '<th align="left">' . emt('Quantity') . '</th>'
+                       ? '<th align="right">' . emt('Unit Price') . '</th>'.
+                         '<th align="right">' . emt('Quantity') . '</th>'
                         : '' ).
                      '<th align="right">' . emt('Amount') . '</th>';
           }
@@ -158,8 +158,8 @@
                        ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). '</td>'.
                        '<td align="left">'. $line->{'description'}. '</td>'.
                        ( $unitprices 
-                           ? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
-                             '<td align="left">'. $line->{'quantity'}. '</td>'
+                           ? '<td align="right">'. $line->{'unit_amount'}. '</td>'.
+                             '<td align="right">'. $line->{'quantity'}. '</td>'
                            : ''
                        ).
 
diff --git a/conf/invoice_latex b/conf/invoice_latex
index d56a7fb..533e834 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -164,8 +164,9 @@
 \newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }
 \newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }
 \newcommand{\FSunitcolumns}{ [@-- 
-  $unitprices 
-  ? '\makebox[2.5cm][l]{\textbf{~~'.emt('Unit Price').'}}&\makebox[1.4cm]{\textbf{~'.emt('Quantity').'}}&' 
+  $unitprices
+  ? '\makebox[2.5cm][r]{\textbf{~~' . emt('Unit Price') . '}} &' .
+    '\makebox[1.4cm]{\textbf{~' . emt('Quantity') . '}} & ' 
   : '' --@] }
 
 \newcommand{\FShead}{
@@ -182,7 +183,7 @@
 \newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
   \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
-[@-- $unitprices ? '  \multicolumn{1}{l}{\textbf{#3}} &'."\n".
+[@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{\dollar #3}} &'."\n".
                    '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"
                  : ''
 --@]

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

Summary of changes:
 conf/invoice_html  |    8 ++++----
 conf/invoice_latex |    7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)