diff options
| author | jeff <jeff> | 2008-06-04 18:41:38 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2008-06-04 18:41:38 +0000 |
| commit | e342397f8a0380982bc05673d5a22f5da2cb47f7 (patch) | |
| tree | 9b647361d2456711421ba359df1dc00dad705a08 | |
| parent | eabcf4dfa43e6b51a433b1bc9ffdb3b393d102cf (diff) | |
more voxline invoice formatting
| -rw-r--r-- | conf/invoice_html | 18 | ||||
| -rw-r--r-- | conf/invoice_latex | 8 |
2 files changed, 20 insertions, 6 deletions
diff --git a/conf/invoice_html b/conf/invoice_html index d619c0a61..f71f99809 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -74,6 +74,12 @@ <tr> <th align="center">Ref</th> <th align="left">Description</th> + <%= ( $unitprices + ? '<th align="left">Unit Price</th>'. + '<th align="left">Quantity</th>' + : '' + ) + %> <th align="right">Amount</th> </tr> <%= @@ -83,11 +89,18 @@ '<tr class="invoice_desc">'. '<td align="center">'. $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->{'amount'}. '</td>'. '</tr>' ; if ( @{$line->{'ext_description'} } ) { - $OUT .= '<tr class="invoice_extdesc"><td></td><td><table width="100%">'; + $OUT .= '<tr class="invoice_extdesc"><td></td><td'; + $OUT .= $unitprices ? ' colspan=3>' : '>'; + $OUT .= '<table width="100%">'; foreach my $ext_desc ( @{$line->{'ext_description'} } ) { $OUT .= '<tr class="invoice_extdesc">'. @@ -109,7 +122,8 @@ $OUT .= '<tr class="invoice_totaldesc">'. qq(<td style="$style"> </td>). - qq(<td align="left" style="$style">). + qq(<td align="left" style="$style"). + ( $unitprices ? ' colspan=3>' : '>' ). $line->{'total_item'}. '</td>'. qq(<td align="right" style="$style">). $line->{'total_amount'}. '</td>'. diff --git a/conf/invoice_latex b/conf/invoice_latex index 4ea3fe643..2a8c4bdd5 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -231,8 +231,8 @@ Terms: [@-- $terms --@]\\ \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][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&
\makebox[2.0cm][r]{\textbf{Amount}} \\
%
\hline
@@ -245,8 +245,8 @@ Terms: [@-- $terms --@]\\ \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][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&
\makebox[2.0cm][r]{\textbf{Amount}} \\
\hline
\endhead
|