[freeside-commits] freeside/conf invoice_html, 1.9, 1.10 invoice_latex, 1.14, 1.15
Jeff Finucane,420,,
jeff at wavetail.420.am
Fri May 16 12:26:43 PDT 2008
Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv32587/conf
Modified Files:
invoice_html invoice_latex
Log Message:
typeset CDRs into 5 columns on invoices
Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- invoice_latex 29 Feb 2008 17:57:38 -0000 1.14
+++ invoice_latex 16 May 2008 19:26:40 -0000 1.15
@@ -242,10 +242,15 @@
$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}{\begin{tabular}{lllll}'; %%cheating at 5
+ foreach my $ext_desc (@$ext_description) {
+ $ext_desc = substr($ext_desc, 0, 80) . '...'
+ if (length($ext_desc) > 80);
+ $OUT .= '\small{' . $ext_desc . '}' . "\\\\${rowbreak}\n";
+ }
+ $OUT .="\\end{tabular}}\\\\${rowbreak}\n";
}
}
Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- invoice_html 29 Feb 2008 17:57:37 -0000 1.9
+++ invoice_html 16 May 2008 19:26:39 -0000 1.10
@@ -106,13 +106,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>';
}
}
More information about the freeside-commits
mailing list