\r
\r
% Commands for freeside description...\r
-\newcommand{\FSdesc}[3]{\r
+\newcommand{\FSdesc}[5]{\r
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
- \multicolumn{6}{l}{\textbf{#2}} &\r
- \multicolumn{1}{r}{\textbf{\dollar #3}}\\\r
+ \multicolumn{4}{l}{\textbf{#2}} &\r
+ \multicolumn{1}{l}{\textbf{#3}} &\r
+ \multicolumn{1}{r}{\textbf{#4}} &\r
+ \multicolumn{1}{r}{\textbf{\dollar #5}}\\\r
}\r
% ...extended description...\r
\newcommand{\FSextdesc}[1]{\r
\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
%% \multicolumn{2}{l}{\small{~-~#1}}\\\r
- ~-~#1\\\r
+ ~~~#1\\\r
}\r
% ...and total line items.\r
\newcommand{\FStotaldesc}[2]{\r
$OUT .= '\hline';\r
$OUT .= '\rule{0pt}{2.5ex}';\r
$OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';\r
- $OUT .= '\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & ';\r
- $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';\r
+ $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';\r
+ $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';\r
+ $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';\r
$OUT .= '\hline';\r
$OUT .= '\endfirsthead';\r
$OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';\r
$OUT .= '\hline';\r
$OUT .= '\rule{0pt}{2.5ex}';\r
$OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';\r
- $OUT .= '\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & ';\r
- $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';\r
+ $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{}& ';\r
+ $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';\r
+ $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';\r
+ $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';\r
$OUT .= '\hline';\r
$OUT .= '\endhead';\r
$OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';\r
\r
$OUT .= "\\hline\n";\r
$OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .\r
+ '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.\r
+ '{' . ( $unitprices ? $line->{'quantity'} : '' ) . '}' .\r
'{' . $line->{'amount'} . "}${rowbreak}\n";\r
\r
foreach my $ext_desc (@$ext_description) {\r