diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_html | 2 | ||||
| -rw-r--r-- | conf/invoice_latex | 31 |
2 files changed, 24 insertions, 9 deletions
diff --git a/conf/invoice_html b/conf/invoice_html index ddede78ce..d619c0a61 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -87,7 +87,7 @@ '</tr>' ; if ( @{$line->{'ext_description'} } ) { - $OUT .= '<tr class="invoice_extdesc"><td></td><td><table>'; + $OUT .= '<tr class="invoice_extdesc"><td></td><td><table width="100%">'; foreach my $ext_desc ( @{$line->{'ext_description'} } ) { $OUT .= '<tr class="invoice_extdesc">'. diff --git a/conf/invoice_latex b/conf/invoice_latex index 19b351acc..4ea3fe643 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -155,16 +155,18 @@ % Commands for freeside description...
-\newcommand{\FSdesc}[3]{
+\newcommand{\FSdesc}[5]{
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
- \multicolumn{6}{l}{\textbf{#2}} &
- \multicolumn{1}{r}{\textbf{\dollar #3}}\\
+ \multicolumn{4}{l}{\textbf{#2}} &
+ \multicolumn{1}{l}{\textbf{#3}} &
+ \multicolumn{1}{r}{\textbf{#4}} &
+ \multicolumn{1}{r}{\textbf{\dollar #5}}\\
}
% ...extended description...
\newcommand{\FSextdesc}[1]{
\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
%% \multicolumn{2}{l}{\small{~-~#1}}\\
- ~-~#1\\
+ ~~~#1\\
}
% ...and total line items.
\newcommand{\FStotaldesc}[2]{
@@ -225,16 +227,27 @@ Terms: [@-- $terms --@]\\ \hline
\rule{0pt}{2.5ex}
\makebox[1.4cm]{\textbf{Ref}} &
-\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} &
-\makebox[2.5cm][r]{\textbf{Amount}} \\
+\makebox[2.0cm][l]{\textbf{Description}}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{\textbf{[@-- !$unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- !$unitprices ? '~Quantity' : '' --@]}}&
+\makebox[2.0cm][r]{\textbf{Amount}} \\
+%
\hline
\endfirsthead
\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
\hline
\rule{0pt}{2.5ex}
\makebox[1.4cm]{\textbf{Ref}} &
-\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} &
-\makebox[2.5cm][r]{\textbf{Amount}} \\
+\makebox[2.0cm][l]{\textbf{Description}}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{\textbf{[@-- !$unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- !$unitprices ? '~Quantity' : '' --@]}}&
+\makebox[2.0cm][r]{\textbf{Amount}} \\
\hline
\endhead
\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
@@ -260,6 +273,8 @@ Terms: [@-- $terms --@]\\ $OUT .= "\\hline\n";
$OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
+ '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
+ '{' . ( $unitprices ? $line->{'quantity'} : '' ) . '}' .
'{' . $line->{'amount'} . "}${rowbreak}\n";
foreach my $ext_desc (@$ext_description) {
|