diff options
| author | jeff <jeff> | 2008-06-04 17:59:42 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2008-06-04 17:59:42 +0000 |
| commit | 988ec48fea05902eb7ea22e43a44e86a36eee06a (patch) | |
| tree | 4c7003eeac01755d2c10c36af69a637ed2696f0f /conf | |
| parent | 3b35ccbf226efe00c94f3a72dd1c7ed64d926a7c (diff) | |
voxline invoice formatting
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_html | 2 | ||||
| -rw-r--r-- | conf/invoice_latex | 30 |
2 files changed, 23 insertions, 9 deletions
diff --git a/conf/invoice_html b/conf/invoice_html index ae6910d..a3ab6c0 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -117,7 +117,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 d17ff8f..2acd710 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -157,16 +157,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]{
@@ -238,16 +240,26 @@ Terms: [@-- $terms --@]\\ $OUT .= '\hline';
$OUT .= '\rule{0pt}{2.5ex}';
$OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
- $OUT .= '\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & ';
- $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';
+ $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
+ $OUT .= '\makebox[2.0cm][l]{}& ';
+ $OUT .= '\makebox[2.0cm][l]{}& ';
+ $OUT .= '\makebox[2.0cm][l]{}& ';
+ $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
+ $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
+ $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
$OUT .= '\hline';
$OUT .= '\endfirsthead';
$OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
$OUT .= '\hline';
$OUT .= '\rule{0pt}{2.5ex}';
$OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
- $OUT .= '\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & ';
- $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';
+ $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
+ $OUT .= '\makebox[2.0cm][l]{}& ';
+ $OUT .= '\makebox[2.0cm][l]{}& ';
+ $OUT .= '\makebox[2.0cm][l]{}& ';
+ $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
+ $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
+ $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
$OUT .= '\hline';
$OUT .= '\endhead';
$OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
@@ -283,6 +295,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) {
|