X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Fquotation_latex;h=6aac160754aa3e2dfa34cc168e12ee4c6030dfd2;hp=d56a7fbdc5960ac27511381be1a4d621ebb8064f;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=3ded761f92af1bab8d3d8a8e9deccd97082aaf15 diff --git a/conf/quotation_latex b/conf/quotation_latex index d56a7fbdc..6aac16075 100644 --- a/conf/quotation_latex +++ b/conf/quotation_latex @@ -171,7 +171,7 @@ \newcommand{\FShead}{ \hline \rule{0pt}{2.5ex} - \makebox[1.4cm]{\textbf{Ref}} & + \makebox[1.4cm]{} & \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}& \FSunitcolumns \makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\ @@ -281,18 +281,16 @@ } } - #if ($section == $sections[$#sections]) { - foreach my $line (grep {$_->{section}->{description} eq $section->{description}} @total_items) { - if ($section->{total_line_generator}) { - $OUT .= &{$section->{total_line_generator}}($line); - } else { - $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' . - '{' . $line->{'total_amount'} . '}' . "\n"; - } + foreach my $line (grep {$_->{section}->{description} eq $section->{description}} @total_items) { + if ($section->{total_line_generator}) { + $OUT .= &{$section->{total_line_generator}}($line); + } else { + $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' . + '{' . $line->{'total_amount'} . '}' . "\n"; + $OUT .= '\hline' . "\n" if $line->{'break_after'}; } - #} + } - $OUT .= '\hline'; $OUT .= '\endlastfoot'; my $lastref = 0; @@ -313,7 +311,7 @@ $OUT .= &{$section->{description_generator}}($line); } else { $OUT .= '\FSdesc'. - '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'. + '{}'. #'{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'. '{' . $line->{'description'} . '}' . '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'. '{' . ( $unitprices ? $line->{'quantity'} : '' ) . '}' .