diff options
| author | jeff <jeff> | 2008-05-19 04:07:45 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2008-05-19 04:07:45 +0000 |
| commit | 93810e2d18325d6f3b56cb3738d4400af69e6908 (patch) | |
| tree | df153b58bb9ab3a9bf6cd208d388240a3e3dbc45 /conf | |
| parent | a374e45e9ecbe5451e83dbb81f8873d2d909b2ac (diff) | |
backport voip_cdr's upstream_simple, and the columnization features
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_html | 16 | ||||
| -rw-r--r-- | conf/invoice_latex | 13 |
2 files changed, 18 insertions, 11 deletions
diff --git a/conf/invoice_html b/conf/invoice_html index b13b08f46..ddede78ce 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -86,13 +86,15 @@ '<td align="right">'. $line->{'amount'}. '</td>'. '</tr>' ; - foreach my $ext_desc ( @{$line->{'ext_description'} } ) { - $OUT .= - '<tr class="invoice_extdesc">'. - '<td></td>'. - '<td align="left">- '. $ext_desc. '</td>'. - '<td></td>'. - '</tr>' + if ( @{$line->{'ext_description'} } ) { + $OUT .= '<tr class="invoice_extdesc"><td></td><td><table>'; + foreach my $ext_desc ( @{$line->{'ext_description'} } ) { + $OUT .= + '<tr class="invoice_extdesc">'. + '<td align="left">- '. $ext_desc. '</td>'. + '</tr>' + } + $OUT .= '</table></td><td></td></tr>'; } } diff --git a/conf/invoice_latex b/conf/invoice_latex index c63514568..ba66d6437 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -229,10 +229,15 @@ Terms: [@-- $terms --@]\\ $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
'{' . $line->{'amount'} . "}${rowbreak}\n";
- foreach my $ext_desc (@$ext_description) {
- $ext_desc = substr($ext_desc, 0, 80) . '...'
- if (length($ext_desc) > 80);
- $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
+ if (@$ext_description) {
+ $OUT .= '\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &';
+ $OUT .= '\multicolumn{2}{l}{\small{\begin{tabular}{llllll}';#cheating at 6
+ foreach my $ext_desc (@$ext_description) {
+ $ext_desc = substr($ext_desc, 0, 80) . '...'
+ if (length($ext_desc) > 80);
+ $OUT .= "$ext_desc \\\\${rowbreak}\n";
+ }
+ $OUT .="\\end{tabular}}}\\\\${rowbreak}\n";
}
}
|