projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-18' of https://github.com/gjones2/Freeside
[freeside.git]
/
conf
/
invoice_latex
diff --git
a/conf/invoice_latex
b/conf/invoice_latex
index
772c2eb
..
533e834
100644
(file)
--- a/
conf/invoice_latex
+++ b/
conf/invoice_latex
@@
-19,7
+19,7
@@
\r
\documentclass[letterpaper]{article}
\r
\r
\r
\documentclass[letterpaper]{article}
\r
\r
-\usepackage{fancyhdr,lastpage,ifthen,array,
fs
longtable,afterpage,caption,multirow,bigstrut}
\r
+\usepackage{fancyhdr,lastpage,ifthen,array,longtable,afterpage,caption,multirow,bigstrut}
\r
\usepackage{graphicx} % required for logo graphic
\r
\usepackage[utf8]{inputenc} % multilanguage support
\r
\usepackage[T1]{fontenc}
\r
\usepackage{graphicx} % required for logo graphic
\r
\usepackage[utf8]{inputenc} % multilanguage support
\r
\usepackage[T1]{fontenc}
\r
@@
-164,8
+164,9
@@
\newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }
\r
\newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }
\r
\newcommand{\FSunitcolumns}{ [@--
\r
\newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }
\r
\newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }
\r
\newcommand{\FSunitcolumns}{ [@--
\r
- $unitprices
\r
- ? '\makebox[2.5cm][l]{\textbf{~~'.emt('Unit Price').'}}&\makebox[1.4cm]{\textbf{~'.emt('Quantity').'}}&'
\r
+ $unitprices
\r
+ ? '\makebox[2.5cm][r]{\textbf{~~' . emt('Unit Price') . '}} &' .
\r
+ '\makebox[1.4cm]{\textbf{~' . emt('Quantity') . '}} & '
\r
: '' --@] }
\r
\r
\newcommand{\FShead}{
\r
: '' --@] }
\r
\r
\newcommand{\FShead}{
\r
@@
-182,7
+183,7
@@
\newcommand{\FSdesc}[5]{
\r
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
\r
\multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
\r
\newcommand{\FSdesc}[5]{
\r
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
\r
\multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
\r
-[@-- $unitprices ? ' \multicolumn{1}{
l}{\textbf{
#3}} &'."\n".
\r
+[@-- $unitprices ? ' \multicolumn{1}{
r}{\textbf{\dollar
#3}} &'."\n".
\r
' \multicolumn{1}{r}{\textbf{#4}} &'."\n"
\r
: ''
\r
--@]
\r
' \multicolumn{1}{r}{\textbf{#4}} &'."\n"
\r
: ''
\r
--@]
\r