great new invoice template from kristian!

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8ca2c1b..be28297 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -561,6 +561,13 @@ httemplate/docs/config.html
   },
 
   {
+    'key'         => 'invoice_latexreturnaddress',
+    'section'     => 'billing',
+    'description' => 'Return address for LaTeX typeset PostScript invoices.',
+    'type'        => 'textarea',
+  },
+
+  {
     'key'         => 'invoice_latexsmallfooter',
     'section'     => 'billing',
     'description' => 'Optional small footer for multi-page LaTeX typeset PostScript invoices.',

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index db4cbf0..8aadb73 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1137,9 +1137,11 @@ sub print_latex {
     'country'      => _latex_escape($cust_main->country),
     'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
     'smallfooter'  => join("\n", $conf->config('invoice_latexsmallfooter') ),
+    'returnaddress' => join("\n", $conf->config('invoice_latexreturnaddress') ),
     'quantity'     => 1,
     'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
     #'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
+    'conf_dir'     => "$FS::UID::conf_dir/conf.$FS::UID::datasrc",
   );
 
   my $countrydefault = $conf->config('countrydefault') || 'US';

diff --git a/conf/invoice_latex b/conf/invoice_latex
index e7f6d08..5938a98 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -5,7 +5,7 @@
 %% Asplen Management Ltd\r
 %% www.asplen.co.uk\r
 %%\r
-%% Modified for Freeside by Ivan Kohler and Kristian Hoffman\r
+%% Modified for Freeside by Kristian Hoffman\r
 %%\r
 %% Changes\r
 %%     0.1     4/12/00 Created\r
@@ -14,7 +14,7 @@
 %%     1.2     16/10/02        Invoice number added\r
 %%     1.3     2/12/02 Logo graphic added\r
 %%     1.4     7/2/03  Multipage headers/footers added\r
-%%      n/a     10/12/03 forked for Freeside; checked into CVS\r
+%%      n/a     forked for Freeside; checked into CVS\r
 %%\r
 \r
 \documentclass[letterpaper]{article}\r
@@ -22,30 +22,107 @@
 \usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}\r
 \usepackage{graphicx}                  % required for logo graphic\r
 \r
-\addtolength{\voffset}{-0.0in} % top margin to top of header\r
-\addtolength{\hoffset}{-0.60in}        %left margin on page\r
-\addtolength{\topmargin}{-0.6in}       % top margin to top of header\r
-\setlength{\headheight}{1in}           % height of header\r
-\setlength{\headsep}{0.5in}            % between header and text\r
-\addtolength{\textheight}{-0.4in}      % height of main text\r
+\addtolength{\voffset}{-0.0cm}         % top margin to top of header\r
+\addtolength{\hoffset}{-0.6cm}         % left margin on page\r
+\addtolength{\topmargin}{-1.25cm}      % top margin to top of header\r
+\setlength{\headheight}{2.0cm}                 % height of header\r
+\setlength{\headsep}{1.0cm}            % between header and text\r
+\setlength{\footskip}{1.0cm}           % bottom of footer from bottom of text\r
 \r
-\addtolength{\textheight}{-0.5in}      % height of main text\r
-\setlength{\footskip}{0.5in}           % bottom of footer from bottom of text\r
-\r
-\addtolength{\textwidth}{2.1in}        % width of text\r
-\setlength{\oddsidemargin}{0in}        % odd page left margin\r
-\setlength{\evensidemargin}{0in}       % even page left margin\r
+%\addtolength{\textwidth}{2.1in}       % width of text\r
+\setlength{\textwidth}{19.5cm}\r
+\setlength{\textheight}{19.5cm}\r
+\setlength{\oddsidemargin}{-0.9cm}     % odd page left margin\r
+\setlength{\evensidemargin}{-0.9cm}    % even page left margin\r
 \r
 \renewcommand{\headrulewidth}{0pt}\r
 \renewcommand{\footrulewidth}{1pt}\r
 \r
-                                               % New command for address lines i.e. skip them if blank\r
+% Adjust the inset of the mailing address\r
+\newcommand{\addressinset}[1][]{\hspace{1.0cm}}\r
+\r
+% Adjust the inset of the return address and logo\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{\dollar}[1][]{\symbol{36}} % Inserts dollar symbol\r
+\r
+% Inserts dollar symbol\r
+\newcommand{\dollar}[1][]{\symbol{36}}\r
+\r
+% Remove plain style header/footer\r
+\fancypagestyle{plain}{\r
+  \fancyhead{}\r
+}\r
+\fancyhf{}\r
+\r
+% Define fancy header/footer for first and subsequent pages\r
+\fancyfoot[C]{\r
+  \ifthenelse{\equal{\thepage}{1}}\r
+  { % First page\r
+    \small{\r
+[@-- $footer --@]\r
+    }\r
+  }\r
+  { % ... pages\r
+    \small{\r
+[@-- $smallfooter --@]\r
+    }\r
+  }\r
+}\r
+\r
+\fancyfoot[R]{\r
+  \ifthenelse{\equal{\thepage}{1}}\r
+  { % First page\r
+  }\r
+  { % ... pages\r
+    \small{\thepage\ of \pageref{LastPage}}\r
+  }\r
+}\r
+\r
+\fancyhead[L]{\r
+  \ifthenelse{\equal{\thepage}{1}}\r
+  { % First page\r
+    \returninset\r
+    \makebox{\r
+      \begin{tabular}{ll}\r
+        \includegraphics{[@-- $conf_dir --@]/logo.eps} &\r
+        \begin{minipage}[b]{3.5cm}\r
+[@-- $returnaddress --@]\r
+        \end{minipage}\r
+      \end{tabular}\r
+    }\r
+  }\r
+  { % ... pages\r
+    %\includegraphics{[@-- $conf_dir --@]/logo.eps}    % Uncomment if you want the logo on all pages.\r
+  }\r
+}\r
+\r
+\fancyhead[R]{\r
+  \ifthenelse{\equal{\thepage}{1}}\r
+  { % First page\r
+    \begin{tabular}{rcl}\r
+    Invoice date & & Invoice number \\\r
+    \vspace{0.2cm}\r
+    \textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline\r
+    \rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}} & \\\r
+    \vspace{-0.2cm}\r
+     & & \\\hline\r
+    \end{tabular}\r
+  }\r
+  { % ... pages\r
+    \small{\r
+      \begin{tabular}{ll}\r
+      Invoice date & Invoice number\\\r
+      \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\\r
+      \end{tabular}\r
+    }\r
+  }\r
+}\r
 \r
 \pagestyle{fancy}\r
 \r
+\r
 %% Font options are:\r
 %%     bch     Bitsream Charter\r
 %%     put     Utopia\r
@@ -54,90 +131,87 @@
 %%     ptm     Times\r
 %%     pcr     Courier\r
 \r
-\renewcommand{\familydefault}{phv}             \r
+\renewcommand{\familydefault}{phv}\r
+\r
+\r
+% Commands for freeside description...\r
+\newcommand{\FSdesc}[3]{\r
+  \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
+  \textbf{#2} &\r
+  \multicolumn{1}{r}{\textbf{\dollar #3}}\\\r
+}\r
+% ...extended description...\r
+\newcommand{\FSextdesc}[1]{\r
+  \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
+  \multicolumn{2}{l}{\small{~-~#1}}\\\r
+}\r
+% ...and total line items.\r
+\newcommand{\FStotaldesc}[2]{\r
+  & \multicolumn{1}{l}{#1} & #2\\\r
+}\r
+\r
 \r
 \begin{document}\r
 %\r
 %%     Headers and footers defined for the first page\r
-\fancyfoot[CO,CE]{\small{\r
-\begin{tabular}{c}\r
-[@-- $footer --@]\r
-\end{tabular}}}\r
 %\r
 %%     The LH Heading comprising logo\r
 %%     UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo\r
-\fancyhead[LO,LE]{\r
-\begin{tabular}{l}\r
-\includegraphics{/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside/logo.eps}\r
-\end{tabular}}\r
 %\r
 %%     The Heading comprising isue date, customer ref & INVOICE name\r
-\fancyhead[RO,RE]{\r
-\begin{tabular}{rcl}\r
-Invoice date & & Invoice number \\\r
-\vspace{0.2cm}\r
-\textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline\r
-\rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\\r
-\vspace{-0.2cm}\r
- & & \\\hline\r
-\end{tabular}}\r
 %\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{ \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
-\end{tabular}}} }\r
 %\r
 %\r
+\begin{tabular}{ll}\r
+\addressinset \rule{0cm}{0cm} &\r
 \makebox{\r
-\begin{minipage}[t]{2.9in}\r
-\vspace{0.20in}\r
+\begin{minipage}[t]{5.0cm}\r
+\vspace{0.25cm}\r
 \textbf{[@-- $payname --@]}\\\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]{2.5in}\r
+\begin{minipage}[t]{6.4cm}\r
 \begin{flushright}\r
 Terms: [@-- $terms --@]\\\r
 [@-- $po_line --@]\\\r
 \end{flushright}\r
 \end{minipage}}\r
-\vspace{0.5cm}\r
+\vspace{1.5cm}\r
 %\r
 \section*{\textsc{Charges}}\r
-\begin{longtable}{|c|l|r|}\r
+\begin{longtable}{clr}\r
 \hline\r
 \rule{0pt}{2.5ex}\r
 \makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[13cm][l]{\textbf{Description}} & \r
-\makebox[2cm][r]{\textbf{Amount}} \\\r
+\makebox[12.8cm][l]{\textbf{Description}} & \r
+\makebox[2.5cm][r]{\textbf{Amount}} \\\r
 \hline\r
 \endfirsthead\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[13cm][l]{\textbf{Description}} & \r
-\makebox[2cm][r]{\textbf{Amount}} \\\r
+\makebox[12.8cm][l]{\textbf{Description}} & \r
+\makebox[2.5cm][r]{\textbf{Amount}} \\\r
 \hline\r
 \endhead\r
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}/cont...}\\\r
+\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
 \endfoot\r
+\hline\r
 [@--\r
 \r
   foreach my $line (@total_items) {\r
-    $OUT .= ' & \multicolumn{1}{l}{' . $line->{'total_item'} . '} & ' .\r
-            $line->{'total_amount'} . '\\\\' . "\n";\r
+    $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .\r
+            '{' . $line->{'total_amount'} . '}' . "\n";\r
   }\r
 \r
 --@]\r
@@ -146,11 +220,21 @@ Terms: [@-- $terms --@]\\
 [@--\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
+    my $ext_description = $line->{'ext_description'};\r
+\r
+    # Don't break-up small packages.\r
+    my $rowbreak = @$ext_description < 5 ? '*' : '';\r
+\r
+    $OUT .= "\\hline\n";\r
+    $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .\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
+      $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";\r
+    }\r
+\r
   }\r
 \r
 --@]\r

diff --git a/conf/invoice_latexfooter b/conf/invoice_latexfooter
index ee5d7e9..527c356 100644 (file)
--- a/conf/invoice_latexfooter
+++ b/conf/invoice_latexfooter
@@ -1,5 +1 @@
-Ivan Kohler\\
-12345 Test Lane\\
-Truckee, CA~~96161\\
-ivan@sisd.com~~~~+1 415 462 1624\\
-Freeside - open-source billing - http://www.sisd.com/freeside\\
+Ivan Kohler~~~Freeside - open-source billing

diff --git a/conf/invoice_latexreturnaddress b/conf/invoice_latexreturnaddress
new file mode 100644 (file)
index 0000000..95067e2
--- /dev/null
+++ b/conf/invoice_latexreturnaddress
@@ -0,0 +1,3 @@
+Ivan Kohler\\*
+12345 Test Lane\\*
+Truckee, CA~~96161

diff --git a/conf/logo.eps b/conf/logo.eps
index 8091b03..ff25dd4 100644 (file)
--- a/conf/logo.eps
+++ b/conf/logo.eps
@@ -1,10 +1,16 @@
 %!PS-Adobe-2.0 EPSF-2.0
-%%BoundingBox: 261 345 419 447
 %%HiResBoundingBox: 261.500000 345.500000 418.500000 446.500000
 %%Creator: xpdf/pdftops 3.00
 %%LanguageLevel: 2
 %%DocumentMedia: plain 612 792 0 () ()
+%%BoundingBox: 19 0 70 33
 %%EndComments
+%%BeginProcSet: epsffit 1 0
+gsave
+-65.000 -111.618 translate
+0.324 0.324 scale
+%%EndProcSet
+
 % EPSF created by ps2eps 1.54
 %%BeginProlog
 save
@@ -13501,3 +13507,4 @@ countdictstack
 exch sub { end } repeat
 restore
 %%EOF
+grestore

diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index a9d7508..7097fda 100644 (file)
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -13,7 +13,7 @@
     <li>Typeset (LaTeX) invoice templates
       <ul>
         <li>Install teTeX and Ghostscript (included with most distributions).
-        <li>Place your logo in EPS (Encapsulated PostScript) format at <code>/usr/local/etc/freeside/conf.<i>your_datasrc</i>/logo.eps</code>.
+        <li>Place your logo in EPS (Encapsulated PostScript) format with size 90pt X 36pt (<code>epsffit -c 0 0 90 33 yourlogo.eps &gt;logo.eps</code>) at <code>/usr/local/etc/freeside/conf.<i>your_datasrc</i>/logo.eps</code>.
         <li>Edit the <b>invoice_latexfooter</b>, <b>invoice_latexnotes</b>, and <b>invoice_latexsmallfooter</b> configuration files.  If you are adventurous, edit <b>invoice_latex</b> as well.
       </ul>
     <li>Plaintext invoice templates