\r
\documentclass[letterpaper]{article}\r
\r
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}\r
+\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,multirow,bigstrut}\r
\usepackage{graphicx} % required for logo graphic\r
\r
\addtolength{\voffset}{-0.0cm} % top margin to top of header\r
\renewcommand{\headrulewidth}{0pt}\r
\renewcommand{\footrulewidth}{1pt}\r
\r
+\renewcommand{\footrule}{\r
+[@--\r
+ $coupon ? '\ifthenelse{\equal{\thepage}{1}}' : '';\r
+--@]\r
+ {\r
+ }\r
+ {\r
+ \vbox to 0pt{\rule{\headwidth}{\footrulewidth}\vss}\r
+ }\r
+}\r
+\r
+\newcommand{\extracouponspace}{4.8cm}\r
+\r
% Adjust the inset of the mailing address\r
\newcommand{\addressinset}[1][]{\hspace{1.0cm}}\r
\r
\newcommand{\returninset}[1][]{\hspace{-0.25cm}}\r
\r
% New command for address lines i.e. skip them if blank\r
-\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\newline}}\r
+\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\\}}\r
\r
% Inserts dollar symbol\r
\newcommand{\dollar}[1][]{\symbol{36}}\r
\fancyfoot[C]{\r
\ifthenelse{\equal{\thepage}{1}}\r
{ % First page\r
- \small{\r
+[@--\r
+ if ($coupon) {\r
+ $OUT .= '\vspace{-\extracouponspace}';\r
+ $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';\r
+ $OUT .= $coupon;\r
+ }\r
+ '';\r
+--@] \small{\r
[@-- $footer --@]\r
- }\r
+ }[@-- $coupon ? '\vspace{\extracouponspace}' : '' --@]\r
}\r
{ % ... pages\r
\small{\r
\makebox{\r
\begin{tabular}{ll}\r
\includegraphics{[@-- $conf_dir --@]/logo.eps} &\r
- \begin{minipage}[b]{3.5cm}\r
+ \begin{minipage}[b]{5.5cm}\r
[@-- $returnaddress --@]\r
\end{minipage}\r
\end{tabular}\r
\fancyhead[R]{\r
\ifthenelse{\equal{\thepage}{1}}\r
{ % First page\r
- \begin{tabular}{rcl}\r
- Invoice date & & Invoice number \\\r
+ \begin{tabular}{ccc}\r
+ Invoice date & Invoice \#& Customer\#\\\r
\vspace{0.2cm}\r
- \textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline\r
+ \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline\r
\rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}} & \\\r
\vspace{-0.2cm}\r
& & \\\hline\r
}\r
{ % ... pages\r
\small{\r
- \begin{tabular}{ll}\r
- Invoice date & Invoice number\\\r
- \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\\r
+ \begin{tabular}{lll}\r
+ Invoice date & Invoice \#& Customer\#\\\r
+ \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]}\\\r
\end{tabular}\r
}\r
}\r
\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
- \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
+%% \multicolumn{2}{l}{\small{~-~#1}}\\\r
+#1\\\r
}\r
% ...and total line items.\r
\newcommand{\FStotaldesc}[2]{\r
- & \multicolumn{1}{l}{#1} & #2\\\r
+ & \multicolumn{6}{l}{#1} & #2\\\r
}\r
\r
\r
%\r
%\r
%\r
-\begin{tabular}{ll}\r
-\addressinset \rule{0cm}{0cm} &\r
+[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]\r
+\addressinset \rule{0.5cm}{0cm} \r
\makebox{\r
\begin{minipage}[t]{5.0cm}\r
\vspace{0.25cm}\r
\addressline{[@-- $company --@]}\r
\addressline{[@-- $address1 --@]}\r
\addressline{[@-- $address2 --@]}\r
-\addressline{[@-- $city --@], [@-- $state --@], [@-- $zip --@]}\r
+\addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}\r
\addressline{[@-- $country --@]}\r
\end{minipage}}\r
-\end{tabular}\r
\hfill\r
\makebox{\r
\begin{minipage}[t]{6.4cm}\r
\begin{flushright}\r
+[@--\r
+ if ($ship_enable) {\r
+ $OUT .= '\textbf{Service Address}\\\\';\r
+ $OUT .= "\\addressline{$ship_company}";\r
+ $OUT .= "\\addressline{$ship_address1}";\r
+ $OUT .= "\\addressline{$ship_address2}";\r
+ $OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";\r
+ $OUT .= "\\addressline{$ship_country}";\r
+ $OUT .= '~\\\\';\r
+ $OUT .= "\\textbf{ID:}~~$agent_custid\\\\" if $agent_custid;\r
+ $OUT .= "\\textbf{Fax:}~~$ship_fax\\\\" if $ship_fax;\r
+ $OUT .= '~\\\\' if ($ship_fax or $agent_custid);\r
+ }else{\r
+ $OUT .= '';\r
+ }\r
+--@]\r
Terms: [@-- $terms --@]\\\r
[@-- $po_line --@]\\\r
\end{flushright}\r
\vspace{1.5cm}\r
%\r
\section*{\textsc{Charges}}\r
-\begin{longtable}{clr}\r
+\begin{longtable}{cllllllr}\r
\hline\r
\rule{0pt}{2.5ex}\r
\makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[12.8cm][l]{\textbf{Description}} & \r
-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
+\makebox[2.0cm][l]{\textbf{Description}}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
+\makebox[2.0cm][r]{\textbf{Amount}} \\\r
+%\r
\hline\r
\endfirsthead\r
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
\hline\r
\rule{0pt}{2.5ex}\r
\makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[12.8cm][l]{\textbf{Description}} & \r
-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
+\makebox[2.0cm][l]{\textbf{Description}}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
+\makebox[2.0cm][r]{\textbf{Amount}} \\\r
\hline\r
\endhead\r
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
+\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
\endfoot\r
\hline\r
[@--\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
- $ext_desc = substr($ext_desc, 0, 70) . '...'\r
- if (length($ext_desc) > 70);\r
+ if ( $ext_desc !~ /[^\\]&/ ) { \r
+ $ext_desc = substr($ext_desc, 0, 80) . '...'\r
+ if (length($ext_desc) > 80);\r
+ $ext_desc = '\multicolumn{6}{l}{\small{~~~'. $ext_desc. '}}';\r
+ }else{\r
+ $ext_desc = "~~~$ext_desc";\r
+ }\r
$OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";\r
}\r
\r