diff options
| -rw-r--r-- | FS/FS/cust_bill_pkg.pm | 3 | ||||
| -rw-r--r-- | conf/invoice_latex | 27 |
2 files changed, 15 insertions, 15 deletions
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm index a0a211bb0..091d3447b 100644 --- a/FS/FS/cust_bill_pkg.pm +++ b/FS/FS/cust_bill_pkg.pm @@ -245,7 +245,8 @@ sub details { $format_sub = sub { my $detail = shift; $csv->parse($detail) or return "can't parse $detail"; - join(' & ', map { &$escape_function($_) } $csv->fields ); + join(' & ', map { '\small{'. &$escape_function($_). '}' } + $csv->fields ); } if $format eq 'latex'; diff --git a/conf/invoice_latex b/conf/invoice_latex index ba66d6437..e3feeef33 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -137,17 +137,18 @@ % Commands for freeside description...
\newcommand{\FSdesc}[3]{
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
- \textbf{#2} &
+ \multicolumn{6}{l}{\textbf{#2}} &
\multicolumn{1}{r}{\textbf{\dollar #3}}\\
}
% ...extended description...
\newcommand{\FSextdesc}[1]{
\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
- \multicolumn{2}{l}{\small{~-~#1}}\\
+%% \multicolumn{2}{l}{\small{~-~#1}}\\
+ ~-~#1\\
}
% ...and total line items.
\newcommand{\FStotaldesc}[2]{
- & \multicolumn{1}{l}{#1} & #2\\
+ & \multicolumn{6}{l}{#1} & #2\\
}
@@ -188,23 +189,23 @@ Terms: [@-- $terms --@]\\ \vspace{1.5cm}
%
\section*{\textsc{Charges}}
-\begin{longtable}{clr}
+\begin{longtable}{cllllllr}
\hline
\rule{0pt}{2.5ex}
\makebox[1.4cm]{\textbf{Ref}} &
-\makebox[12.8cm][l]{\textbf{Description}} &
+\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} &
\makebox[2.5cm][r]{\textbf{Amount}} \\
\hline
\endfirsthead
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
\hline
\rule{0pt}{2.5ex}
\makebox[1.4cm]{\textbf{Ref}} &
-\makebox[12.8cm][l]{\textbf{Description}} &
+\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} &
\makebox[2.5cm][r]{\textbf{Amount}} \\
\hline
\endhead
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
\endfoot
\hline
[@--
@@ -229,15 +230,13 @@ Terms: [@-- $terms --@]\\ $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
'{' . $line->{'amount'} . "}${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) {
+ foreach my $ext_desc (@$ext_description) {
+ if ( $ext_desc !~ /[^\\]&/ ) {
$ext_desc = substr($ext_desc, 0, 80) . '...'
if (length($ext_desc) > 80);
- $OUT .= "$ext_desc \\\\${rowbreak}\n";
+ $ext_desc = '\small{'. $ext_desc. '}';
}
- $OUT .="\\end{tabular}}}\\\\${rowbreak}\n";
+ $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
}
}
|