projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
conf
/
invoice_latex
diff --git
a/conf/invoice_latex
b/conf/invoice_latex
index
d56a7fb
..
b169b61
100644
(file)
--- a/
conf/invoice_latex
+++ b/
conf/invoice_latex
@@
-127,7
+127,11
@@
\ifthenelse{\equal{\thepage}{1}}
\r
{ % First page
\r
\begin{tabular}{ccc}
\r
\ifthenelse{\equal{\thepage}{1}}
\r
{ % First page
\r
\begin{tabular}{ccc}
\r
- [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\
\r
+ [@-- join(' & ', ( $no_date ? '' : emt('Invoice date') ),
\r
+ ( $no_number ? '' : emt('Invoice #') ),
\r
+ emt('Customer #')
\r
+ )
\r
+ --@]\\
\r
\vspace{0.2cm}
\r
\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline
\r
\rule{0pt}{5ex} &~~ \huge{\textsc{[@-- emt($notice_name) --@]}} & \\
\r
\vspace{0.2cm}
\r
\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline
\r
\rule{0pt}{5ex} &~~ \huge{\textsc{[@-- emt($notice_name) --@]}} & \\
\r
@@
-164,8
+168,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
+187,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