use vars qw( @ISA $conf $money_char );
use vars qw( $invoice_lines @buf ); #yuck
use Date::Format;
-use Text::Template;
+use Text::Template 1.20;
use File::Temp 0.14;
use String::ShellQuote;
use FS::UID qw( datasrc );
my @print_text = $self->print_text('', $template);
my @invoicing_list = $self->cust_main->invoicing_list;
- if ( grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list ) { #email
+ if ( grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list ) {
+ #email
#better to notify this person than silence
@invoicing_list = ($invoice_from) unless @invoicing_list;
my $error = send_email(
$self->generate_email(
- 'from' => $invoice_from,
- 'to' => [ grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ],
- 'print_text' => [ @print_text ],
+ 'from' => $invoice_from,
+ 'to' => [ grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ],
+ 'print_text' => [ @print_text ],
)
);
die "can't email invoice: $error\n" if $error;
}
if ( grep { $_ eq 'FAX' } @invoicing_list ) { #fax
- unless ($conf->exists('invoice_latex')) {
- die 'FAX invoice destination not supported with plain text invoices.'
- }
+ die 'FAX invoice destination not supported with plain text invoices.'
+ unless $conf->exists('invoice_latex');
my $dialstring = $self->cust_main->getfield('fax');
#Check $dialstring?
my $error = send_fax(docdata => $lpr_data, dialstring => $dialstring);
my $templatefile = 'invoice_latex';
my $suffix = length($template) ? "_$template" : '';
$templatefile .= $suffix;
- my @invoice_template = $conf->config($templatefile)
+ my @invoice_template = map "$_\n", $conf->config($templatefile)
or die "cannot load config file $templatefile";
+ my($format, $text_template);
+ if ( grep { /^%%Detail/ } @invoice_template ) {
+ #change this to a die when the old code is removed
+ warn "old-style invoice template $templatefile; ".
+ "patch with conf/invoice_latex.diff\n";
+ $format = 'old';
+ } else {
+ $format = 'Text::Template';
+ $text_template = new Text::Template(
+ TYPE => 'ARRAY',
+ SOURCE => \@invoice_template,
+ DELIMITERS => [ '[@--', '--@]' ],
+ );
+
+ $text_template->compile()
+ or die 'While compiling ' . $templatefile . ': ' . $Text::Template::ERROR;
+ }
+
my %invoice_data = (
'invnum' => $self->invnum,
'date' => time2str('%b %o, %Y', $self->_date),
? _latex_escape("Purchase Order #". $cust_main->payinfo)
: '~';
- my @line_item = ();
- my @total_item = ();
my @filled_in = ();
- while ( @invoice_template ) {
- my $line = shift @invoice_template;
-
- if ( $line =~ /^%%Detail\s*$/ ) {
-
- while ( ( my $line_item_line = shift @invoice_template )
- !~ /^%%EndDetail\s*$/ ) {
- push @line_item, $line_item_line;
- }
- foreach my $line_item ( $self->_items ) {
- #foreach my $line_item ( $self->_items_pkg ) {
- $invoice_data{'ref'} = $line_item->{'pkgnum'};
- $invoice_data{'description'} = _latex_escape($line_item->{'description'});
- if ( exists $line_item->{'ext_description'} ) {
- $invoice_data{'description'} .=
- "\\tabularnewline\n~~".
- join("\\tabularnewline\n~~", map { _latex_escape($_) } @{$line_item->{'ext_description'}} );
+ if ( $format eq 'old' ) {
+
+ my @line_item = ();
+ my @total_item = ();
+ while ( @invoice_template ) {
+ my $line = shift @invoice_template;
+
+ if ( $line =~ /^%%Detail\s*$/ ) {
+
+ while ( ( my $line_item_line = shift @invoice_template )
+ !~ /^%%EndDetail\s*$/ ) {
+ push @line_item, $line_item_line;
}
- $invoice_data{'amount'} = $line_item->{'amount'};
- $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
- push @filled_in,
- map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
- }
-
- } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
-
- while ( ( my $total_item_line = shift @invoice_template )
- !~ /^%%EndTotalDetails\s*$/ ) {
- push @total_item, $total_item_line;
- }
-
- my @total_fill = ();
-
- my $taxtotal = 0;
- foreach my $tax ( $self->_items_tax ) {
- $invoice_data{'total_item'} = _latex_escape($tax->{'description'});
- $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
+ foreach my $line_item ( $self->_items ) {
+ #foreach my $line_item ( $self->_items_pkg ) {
+ $invoice_data{'ref'} = $line_item->{'pkgnum'};
+ $invoice_data{'description'} =
+ _latex_escape($line_item->{'description'});
+ if ( exists $line_item->{'ext_description'} ) {
+ $invoice_data{'description'} .=
+ "\\tabularnewline\n~~".
+ join( "\\tabularnewline\n~~",
+ map _latex_escape($_), @{$line_item->{'ext_description'}}
+ );
+ }
+ $invoice_data{'amount'} = $line_item->{'amount'};
+ $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
+ push @filled_in,
+ map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
+ }
+
+ } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
+
+ while ( ( my $total_item_line = shift @invoice_template )
+ !~ /^%%EndTotalDetails\s*$/ ) {
+ push @total_item, $total_item_line;
+ }
+
+ my @total_fill = ();
+
+ my $taxtotal = 0;
+ foreach my $tax ( $self->_items_tax ) {
+ $invoice_data{'total_item'} = _latex_escape($tax->{'description'});
+ $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
+ push @total_fill,
+ map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+ @total_item;
+ }
+
+ if ( $taxtotal ) {
+ $invoice_data{'total_item'} = 'Sub-total';
+ $invoice_data{'total_amount'} =
+ '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
+ unshift @total_fill,
+ map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+ @total_item;
+ }
+
+ $invoice_data{'total_item'} = '\textbf{Total}';
+ $invoice_data{'total_amount'} =
+ '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
push @total_fill,
map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
@total_item;
- }
-
- if ( $taxtotal ) {
- $invoice_data{'total_item'} = 'Sub-total';
+
+ #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
+
+ # credits
+ foreach my $credit ( $self->_items_credits ) {
+ $invoice_data{'total_item'} = _latex_escape($credit->{'description'});
+ #$credittotal
+ $invoice_data{'total_amount'} = '-\dollar '. $credit->{'amount'};
+ push @total_fill,
+ map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+ @total_item;
+ }
+
+ # payments
+ foreach my $payment ( $self->_items_payments ) {
+ $invoice_data{'total_item'} = _latex_escape($payment->{'description'});
+ #$paymenttotal
+ $invoice_data{'total_amount'} = '-\dollar '. $payment->{'amount'};
+ push @total_fill,
+ map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+ @total_item;
+ }
+
+ $invoice_data{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
$invoice_data{'total_amount'} =
- '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
- unshift @total_fill,
+ '\textbf{\dollar '. sprintf('%.2f', $self->owed + $pr_total ). '}';
+ push @total_fill,
map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
@total_item;
+
+ push @filled_in, @total_fill;
+
+ } else {
+ #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
+ $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
+ push @filled_in, $line;
}
+
+ }
- $invoice_data{'total_item'} = '\textbf{Total}';
- $invoice_data{'total_amount'} =
- '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
- push @total_fill,
- map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
- @total_item;
-
- #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
-
- # credits
- foreach my $credit ( $self->_items_credits ) {
- $invoice_data{'total_item'} = _latex_escape($credit->{'description'});
- #$credittotal
- $invoice_data{'total_amount'} = '-\dollar '. $credit->{'amount'};
- push @total_fill,
- map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
- @total_item;
- }
+ sub nounder {
+ my $var = $1;
+ $var =~ s/_/\-/g;
+ $var;
+ }
- # payments
- foreach my $payment ( $self->_items_payments ) {
- $invoice_data{'total_item'} = _latex_escape($payment->{'description'});
- #$paymenttotal
- $invoice_data{'total_amount'} = '-\dollar '. $payment->{'amount'};
- push @total_fill,
- map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
- @total_item;
+ } elsif ( $format eq 'Text::Template' ) {
+
+ my @detail_items = ();
+ my @total_items = ();
+
+ $invoice_data{'detail_items'} = \@detail_items;
+ $invoice_data{'total_items'} = \@total_items;
+
+ foreach my $line_item ( $self->_items ) {
+ my $detail = {
+ ext_description => [],
+ };
+ $detail->{'ref'} = $line_item->{'pkgnum'};
+ $detail->{'quantity'} = 1;
+ $detail->{'description'} = _latex_escape($line_item->{'description'});
+ if ( exists $line_item->{'ext_description'} ) {
+ @{$detail->{'ext_description'}} = map {
+ _latex_escape($_);
+ } @{$line_item->{'ext_description'}};
}
-
- $invoice_data{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
- $invoice_data{'total_amount'} =
+ $detail->{'amount'} = $line_item->{'amount'};
+ $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
+
+ push @detail_items, $detail;
+ }
+
+
+ my $taxtotal = 0;
+ foreach my $tax ( $self->_items_tax ) {
+ my $total = {};
+ $total->{'total_item'} = _latex_escape($tax->{'description'});
+ $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
+ push @total_items, $total;
+ }
+
+ if ( $taxtotal ) {
+ my $total = {};
+ $total->{'total_item'} = 'Sub-total';
+ $total->{'total_amount'} =
+ '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
+ unshift @total_items, $total;
+ }
+
+ {
+ my $total = {};
+ $total->{'total_item'} = '\textbf{Total}';
+ $total->{'total_amount'} =
+ '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
+ push @total_items, $total;
+ }
+
+ #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
+
+ # credits
+ foreach my $credit ( $self->_items_credits ) {
+ my $total;
+ $total->{'total_item'} = _latex_escape($credit->{'description'});
+ #$credittotal
+ $total->{'total_amount'} = '-\dollar '. $credit->{'amount'};
+ push @total_items, $total;
+ }
+
+ # payments
+ foreach my $payment ( $self->_items_payments ) {
+ my $total = {};
+ $total->{'total_item'} = _latex_escape($payment->{'description'});
+ #$paymenttotal
+ $total->{'total_amount'} = '-\dollar '. $payment->{'amount'};
+ push @total_items, $total;
+ }
+
+ {
+ my $total;
+ $total->{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
+ $total->{'total_amount'} =
'\textbf{\dollar '. sprintf('%.2f', $self->owed + $pr_total ). '}';
- push @total_fill,
- map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
- @total_item;
-
- push @filled_in, @total_fill;
-
- } else {
- #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
- $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
- push @filled_in, $line;
+ push @total_items, $total;
}
- }
-
- sub nounder {
- my $var = $1;
- $var =~ s/_/\-/g;
- $var;
+ } else {
+ die "guru meditation #54";
}
my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
SUFFIX => '.tex',
UNLINK => 0,
) or die "can't open temp file: $!\n";
- print $fh join("\n", @filled_in ), "\n";
+ if ( $format eq 'old' ) {
+ print $fh join('', @filled_in );
+ } elsif ( $format eq 'Text::Template' ) {
+ $text_template->fill_in(OUTPUT => $fh, HASH => \%invoice_data);
+ } else {
+ die "guru meditation #32";
+ }
close $fh;
$fh->filename =~ /^(.*).tex$/ or die "unparsable filename: ". $fh->filename;
%% Asplen Management Ltd\r
%% www.asplen.co.uk\r
%%\r
-%% Modified for Freeside by Ivan Kohler\r
+%% Modified for Freeside by Ivan Kohler and Kristian Hoffman\r
%%\r
%% Changes\r
%% 0.1 4/12/00 Created\r
%% Headers and footers defined for the first page\r
\fancyfoot[CO,CE]{\small{\r
\begin{tabular}{c}\r
-$footer\r
+[@-- $footer --@]\r
\end{tabular}}}\r
%\r
%% The LH Heading comprising logo\r
\begin{tabular}{rcl}\r
Invoice date & & Invoice number \\\r
\vspace{0.2cm}\r
-\textbf{$date} & & \textbf{$invnum} \\\hline\r
+\textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline\r
\rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\\r
\vspace{-0.2cm}\r
& & \\\hline\r
%% Header & footer changes for subsequent pages\r
%\r
\afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }\r
-\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }\r
+\afterpage{ \fancyfoot[CO,CE]{\small{[@-- $smallfooter --@]}} }\r
\afterpage{ \fancyhead[LO,LE]{\small{}} }\r
\afterpage{ \fancyhead[RO,RE]{\small{\r
\begin{tabular}{ll}\r
Invoice date & Invoice number\\\r
-\textbf{$date} & \textbf{$invnum}\\\r
+\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\\r
\end{tabular}}} }\r
%\r
%\r
\makebox{\r
\begin{minipage}[t]{2.9in}\r
\vspace{0.20in}\r
-\textbf{$payname}\\\r
-\addressline{$company}\r
-\addressline{$address1}\r
-\addressline{$address2}\r
-\addressline{$city, $state $zip}\r
-\addressline{$country}\r
+\textbf{[@-- $payname --@]}\\\r
+\addressline{[@-- $company --@]}\r
+\addressline{[@-- $address1 --@]}\r
+\addressline{[@-- $address2 --@]}\r
+\addressline{[@-- $city --@], [@-- $state --@] [@-- $zip --@]}\r
+\addressline{[@-- $country --@]}\r
\end{minipage}}\r
\hfill\r
\makebox{\r
\begin{minipage}[t]{2.5in}\r
\begin{flushright}\r
-Terms: $terms\\\r
-$po_line\\\r
+Terms: [@-- $terms --@]\\\r
+[@-- $po_line --@]\\\r
\end{flushright}\r
\end{minipage}}\r
\vspace{0.5cm}\r
%\r
\section*{\textsc{Charges}}\r
-\begin{longtable}{|c|l|c|r|r|}\r
+\begin{longtable}{|c|l|r|}\r
\hline\r
\rule{0pt}{2.5ex}\r
\makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[7.9cm][l]{\textbf{Description}} & \r
-\makebox[1.3cm][c]{\textbf{Quantity}} & \r
-\makebox[2.5cm][r]{\textbf{Unit Price}} & \r
-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
+\makebox[13cm][l]{\textbf{Description}} & \r
+\makebox[2cm][r]{\textbf{Amount}} \\\r
\hline\r
\endfirsthead\r
-\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
+\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
\hline\r
\rule{0pt}{2.5ex}\r
\makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[7.9cm][l]{\textbf{Description}} & \r
-\makebox[1.3cm][c]{\textbf{Quantity}} & \r
-\makebox[2.5cm][r]{\textbf{Unit Price}} & \r
-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
+\makebox[13cm][l]{\textbf{Description}} & \r
+\makebox[2cm][r]{\textbf{Amount}} \\\r
\hline\r
\endhead\r
-\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\\r
+\multicolumn{3}{r}{\rule{0pt}{2.5ex}/cont...}\\\r
\endfoot\r
-%%TotalDetails\r
- & \multicolumn{3}{l}{$total_item} & $total_amount\\\r
-%%EndTotalDetails\r
+[@--\r
+\r
+ foreach my $line (@total_items) {\r
+ $OUT .= ' & \multicolumn{1}{l}{' . $line->{'total_item'} . '} & ' .\r
+ $line->{'total_amount'} . '\\\\' . "\n";\r
+ }\r
+\r
+--@]\r
\hline\r
\endlastfoot\r
-%%Detail\r
-\rule{0pt}{2.5ex}$ref & \r
-\begin{tabular}{l}\r
-$description\tabularnewline\r
-\end{tabular}\r
-& $quantity & \dollar $amount & \dollar $amount\\\hline\r
-%%EndDetail\r
+[@--\r
+\r
+ foreach my $line (@detail_items) {\r
+ $OUT .= '\rule{0pt}{2.5ex}' . $line->{'ref'} . ' &' . "\n".\r
+ '\begin{tabular}{l}' . "\n".\r
+ $line->{'description'} . '\tabularnewline' . "\n".\r
+ '\end{tabular}' . "\n".\r
+ '& \dollar ' . $line->{'amount'} . '\\\\\\hline' . "\n";\r
+ }\r
+\r
+--@]\r
\end{longtable}\r
\vfill\r
-$notes\r
+[@-- $notes --@]\r
\end{document}\r
--- /dev/null
+--- invoice_latex.old 2005-04-14 01:52:02.000000000 -0700
++++ invoice_latex 2005-04-14 02:33:26.000000000 -0700
+@@ -5,7 +5,7 @@
+ %% Asplen Management Ltd\r
+ %% www.asplen.co.uk\r
+ %%\r
+-%% Modified for Freeside by Ivan Kohler\r
++%% Modified for Freeside by Ivan Kohler and Kristian Hoffman\r
+ %%\r
+ %% Changes\r
+ %% 0.1 4/12/00 Created\r
+@@ -61,7 +61,7 @@
+ %% Headers and footers defined for the first page\r
+ \fancyfoot[CO,CE]{\small{\r
+ \begin{tabular}{c}\r
+-$footer\r
++[@-- $footer --@]\r
+ \end{tabular}}}\r
+ %\r
+ %% The LH Heading comprising logo\r
+@@ -76,7 +76,7 @@
+ \begin{tabular}{rcl}\r
+ Invoice date & & Invoice number \\\r
+ \vspace{0.2cm}\r
+-\textbf{$date} & & \textbf{$invnum} \\\hline\r
++\textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline\r
+ \rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\\r
+ \vspace{-0.2cm}\r
+ & & \\\hline\r
+@@ -85,71 +85,76 @@
+ %% Header & footer changes for subsequent pages\r
+ %\r
+ \afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }\r
+-\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }\r
++\afterpage{ \fancyfoot[CO,CE]{\small{[@-- $smallfooter --@]}} }\r
+ \afterpage{ \fancyhead[LO,LE]{\small{}} }\r
+ \afterpage{ \fancyhead[RO,RE]{\small{\r
+ \begin{tabular}{ll}\r
+ Invoice date & Invoice number\\\r
+-\textbf{$date} & \textbf{$invnum}\\\r
++\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\\r
+ \end{tabular}}} }\r
+ %\r
+ %\r
+ \makebox{\r
+ \begin{minipage}[t]{2.9in}\r
+ \vspace{0.20in}\r
+-\textbf{$payname}\\\r
+-\addressline{$company}\r
+-\addressline{$address1}\r
+-\addressline{$address2}\r
+-\addressline{$city, $state $zip}\r
+-\addressline{$country}\r
++\textbf{[@-- $payname --@]}\\\r
++\addressline{[@-- $company --@]}\r
++\addressline{[@-- $address1 --@]}\r
++\addressline{[@-- $address2 --@]}\r
++\addressline{[@-- $city --@], [@-- $state --@] [@-- $zip --@]}\r
++\addressline{[@-- $country --@]}\r
+ \end{minipage}}\r
+ \hfill\r
+ \makebox{\r
+ \begin{minipage}[t]{2.5in}\r
+ \begin{flushright}\r
+-Terms: $terms\\\r
+-$po_line\\\r
++Terms: [@-- $terms --@]\\\r
++[@-- $po_line --@]\\\r
+ \end{flushright}\r
+ \end{minipage}}\r
+ \vspace{0.5cm}\r
+ %\r
+ \section*{\textsc{Charges}}\r
+-\begin{longtable}{|c|l|c|r|r|}\r
++\begin{longtable}{|c|l|r|}\r
+ \hline\r
+ \rule{0pt}{2.5ex}\r
+ \makebox[1.4cm]{\textbf{Ref}} & \r
+-\makebox[7.9cm][l]{\textbf{Description}} & \r
+-\makebox[1.3cm][c]{\textbf{Quantity}} & \r
+-\makebox[2.5cm][r]{\textbf{Unit Price}} & \r
+-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
++\makebox[13cm][l]{\textbf{Description}} & \r
++\makebox[2cm][r]{\textbf{Amount}} \\\r
+ \hline\r
+ \endfirsthead\r
+-\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
++\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
+ \hline\r
+ \rule{0pt}{2.5ex}\r
+ \makebox[1.4cm]{\textbf{Ref}} & \r
+-\makebox[7.9cm][l]{\textbf{Description}} & \r
+-\makebox[1.3cm][c]{\textbf{Quantity}} & \r
+-\makebox[2.5cm][r]{\textbf{Unit Price}} & \r
+-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
++\makebox[13cm][l]{\textbf{Description}} & \r
++\makebox[2cm][r]{\textbf{Amount}} \\\r
+ \hline\r
+ \endhead\r
+-\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\\r
++\multicolumn{3}{r}{\rule{0pt}{2.5ex}/cont...}\\\r
+ \endfoot\r
+-%%TotalDetails\r
+- & \multicolumn{3}{l}{$total_item} & $total_amount\\\r
+-%%EndTotalDetails\r
++[@--\r
++\r
++ foreach my $line (@total_items) {\r
++ $OUT .= ' & \multicolumn{1}{l}{' . $line->{'total_item'} . '} & ' .\r
++ $line->{'total_amount'} . '\\\\' . "\n";\r
++ }\r
++\r
++--@]\r
+ \hline\r
+ \endlastfoot\r
+-%%Detail\r
+-\rule{0pt}{2.5ex}$ref & \r
+-\begin{tabular}{l}\r
+-$description\tabularnewline\r
+-\end{tabular}\r
+-& $quantity & \dollar $amount & \dollar $amount\\\hline\r
+-%%EndDetail\r
++[@--\r
++\r
++ foreach my $line (@detail_items) {\r
++ $OUT .= '\rule{0pt}{2.5ex}' . $line->{'ref'} . ' &' . "\n".\r
++ '\begin{tabular}{l}' . "\n".\r
++ $line->{'description'} . '\tabularnewline' . "\n".\r
++ '\end{tabular}' . "\n".\r
++ '& \dollar ' . $line->{'amount'} . '\\\\\\hline' . "\n";\r
++ }\r
++\r
++--@]\r
+ \end{longtable}\r
+ \vfill\r
+-$notes\r
++[@-- $notes --@]\r
+ \end{document}\r
projects / freeside.git / commitdiff