diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_html | 131 | ||||
| -rw-r--r-- | conf/invoice_latex | 237 | ||||
| -rw-r--r-- | conf/invoice_latex.diff | 138 | ||||
| -rw-r--r-- | conf/invoice_latexfooter | 6 | ||||
| -rw-r--r-- | conf/invoice_latexreturnaddress | 3 | ||||
| -rw-r--r-- | conf/logo.eps | 9 | ||||
| -rw-r--r-- | conf/logo.png | bin | 4887 -> 0 bytes |
7 files changed, 80 insertions, 444 deletions
diff --git a/conf/invoice_html b/conf/invoice_html deleted file mode 100644 index 32e5362f9..000000000 --- a/conf/invoice_html +++ /dev/null @@ -1,131 +0,0 @@ -<STYLE TYPE="text/css"> -.invoice { font-family: sans-serif; font-size: 10pt } -.invoice_header { font-size: 10pt } -.invoice_headerright TH { border-top: 2px solid #000000; border-bottom: 2px solid #000000 } -.invoice_headerright TD { font-size: 10pt; empty-cells: show } -.invoice_longtable table { cellspacing: none } -.invoice_longtable TH { border-top: 2px solid #000000; border-bottom: 1px solid #000000; padding-left: none; padding-right: none; font-size: 10pt } -.invoice_desc TD { border-top: 2px solid #000000; font-weight: bold; font-size: 10pt } -.invoice_extdesc TD { font-size: 8pt } -.invoice_totaldesc TD { font-size: 10pt; empty-cells: show } -</STYLE> - -<table class="invoice" bgcolor="#ffffff" WIDTH=768 CELLSPACING=8><tr><td> - - <table class="invoice_header" width="100%"> - <tr> - <td><img src="<%= $cid ? "cid:$cid" : "cust_bill-logo.cgi?$template" %>"></td> - <td align="left"><%= $returnaddress %></td> - <td align="right"> - <table CLASS="invoice_headerright" cellspacing=0> - <tr> - <td align="right"> - Invoice date<BR> - <B><%= $date %></B> - </td> - <td> - </td> - <td align="left"> - Invoice number<BR> - <B><%= $invnum %></B> - </td> - </tr> - <tr> - <th> </th> - <th colspan=1 align="center"> - <FONT SIZE="+3">I</FONT><FONT SIZE="+2">NVOICE</FONT> - </th> - <th> </th> - </tr> - </table> - </td> - </tr> - - <tr> - <td> - </td> - <td align="left"> - <b><%= $payname %></b><BR> - <%= join('<BR>', grep length($_), $company, - $address1, - $address2, - "$city, $state $zip", - $country, - ) - %> - </td> - <td align="right"> - Terms: <%= $terms %><BR> - <%= $po_line %> - </td> - </tr> - - </table> - - <p><b><font size="+1">C</font><font size="+0">HARGES</font></b> - <p> - <table class="invoice_longtable" CELLSPACING=0 WIDTH="100%"> - <tr> - <th align="center">Ref</th> - <th align="left">Description</th> - <th align="right">Amount</th> - </tr> - <%= - - foreach my $line ( @detail_items ) { - $OUT .= - '<tr class="invoice_desc">'. - '<td align="center">'. $line->{'ref'}. '</td>'. - '<td align="left">'. $line->{'description'}. '</td>'. - '<td align="right">'. $line->{'amount'}. '</td>'. - '</tr>' - ; - foreach my $ext_desc ( @{$line->{'ext_description'} } ) { - $OUT .= - '<tr class="invoice_extdesc">'. - '<td></td>'. - '<td align="left">- '. $ext_desc. '</td>'. - '<td></td>'. - '</tr>' - } - } - - my $style = 'border-top: 3px solid #000000;'; - my $linenum = 0; - - foreach my $line ( @total_items ) { - - $style .= 'border-bottom: 3px solid #000000;' - if ++$linenum == scalar(@total_items); - - $OUT .= - '<tr class="invoice_totaldesc">'. - qq(<td style="$style"> </td>). - qq(<td align="left" style="$style">). - $line->{'total_item'}. '</td>'. - qq(<td align="right" style="$style">). - $line->{'total_amount'}. '</td>'. - '</tr>' - ; - - $style=''; - - } - - %> - </table> - <br><br> - -<!-- <p><b><font size="+1">N</font><font size="+0">OTES</font></b> - - <ol> - <li>Please make your check payable to <b>Ivan Kohler</b> - <li>If you have any questions please email or telephone. - </ol> ---> -<%= $notes %> - - <hr NOSHADE SIZE=2 COLOR="#000000"> - <p align="center"><%= $footer %> - -</td></tr></table> diff --git a/conf/invoice_latex b/conf/invoice_latex index d1b471a4b..195f8fbb2 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -5,7 +5,7 @@ %% Asplen Management Ltd
%% www.asplen.co.uk
%%
-%% Modified for Freeside by Kristian Hoffman
+%% Modified for Freeside by Ivan Kohler
%%
%% Changes
%% 0.1 4/12/00 Created
@@ -14,7 +14,7 @@ %% 1.2 16/10/02 Invoice number added
%% 1.3 2/12/02 Logo graphic added
%% 1.4 7/2/03 Multipage headers/footers added
-%% n/a forked for Freeside; checked into CVS
+%% n/a 10/12/03 forked for Freeside; checked into CVS
%%
\documentclass[letterpaper]{article}
@@ -22,107 +22,30 @@ \usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}
\usepackage{graphicx} % required for logo graphic
-\addtolength{\voffset}{-0.0cm} % top margin to top of header
-\addtolength{\hoffset}{-0.6cm} % left margin on page
-\addtolength{\topmargin}{-1.25cm} % top margin to top of header
-\setlength{\headheight}{2.0cm} % height of header
-\setlength{\headsep}{1.0cm} % between header and text
-\setlength{\footskip}{1.0cm} % bottom of footer from bottom of text
+\addtolength{\voffset}{-0.0in} % top margin to top of header
+\addtolength{\hoffset}{-0.60in} %left margin on page
+\addtolength{\topmargin}{-0.6in} % top margin to top of header
+\setlength{\headheight}{1in} % height of header
+\setlength{\headsep}{0.5in} % between header and text
+\addtolength{\textheight}{-0.4in} % height of main text
-%\addtolength{\textwidth}{2.1in} % width of text
-\setlength{\textwidth}{19.5cm}
-\setlength{\textheight}{19.5cm}
-\setlength{\oddsidemargin}{-0.9cm} % odd page left margin
-\setlength{\evensidemargin}{-0.9cm} % even page left margin
+\addtolength{\textheight}{-0.5in} % height of main text
+\setlength{\footskip}{0.5in} % bottom of footer from bottom of text
+
+\addtolength{\textwidth}{2.1in} % width of text
+\setlength{\oddsidemargin}{0in} % odd page left margin
+\setlength{\evensidemargin}{0in} % even page left margin
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{1pt}
-% Adjust the inset of the mailing address
-\newcommand{\addressinset}[1][]{\hspace{1.0cm}}
-
-% Adjust the inset of the return address and logo
-\newcommand{\returninset}[1][]{\hspace{-0.25cm}}
+ % New command for address lines i.e. skip them if blank
-% New command for address lines i.e. skip them if blank
\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\newline}}
-
-% Inserts dollar symbol
-\newcommand{\dollar}[1][]{\symbol{36}}
-
-% Remove plain style header/footer
-\fancypagestyle{plain}{
- \fancyhead{}
-}
-\fancyhf{}
-
-% Define fancy header/footer for first and subsequent pages
-\fancyfoot[C]{
- \ifthenelse{\equal{\thepage}{1}}
- { % First page
- \small{
-[@-- $footer --@]
- }
- }
- { % ... pages
- \small{
-[@-- $smallfooter --@]
- }
- }
-}
-
-\fancyfoot[R]{
- \ifthenelse{\equal{\thepage}{1}}
- { % First page
- }
- { % ... pages
- \small{\thepage\ of \pageref{LastPage}}
- }
-}
-
-\fancyhead[L]{
- \ifthenelse{\equal{\thepage}{1}}
- { % First page
- \returninset
- \makebox{
- \begin{tabular}{ll}
- \includegraphics{[@-- $conf_dir --@]/logo.eps} &
- \begin{minipage}[b]{5.5cm}
-[@-- $returnaddress --@]
- \end{minipage}
- \end{tabular}
- }
- }
- { % ... pages
- %\includegraphics{[@-- $conf_dir --@]/logo.eps} % Uncomment if you want the logo on all pages.
- }
-}
-
-\fancyhead[R]{
- \ifthenelse{\equal{\thepage}{1}}
- { % First page
- \begin{tabular}{rcl}
- Invoice date & & Invoice number \\
- \vspace{0.2cm}
- \textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline
- \rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}} & \\
- \vspace{-0.2cm}
- & & \\\hline
- \end{tabular}
- }
- { % ... pages
- \small{
- \begin{tabular}{ll}
- Invoice date & Invoice number\\
- \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\
- \end{tabular}
- }
- }
-}
+\newcommand{\dollar}[1][]{\symbol{36}} % Inserts dollar symbol
\pagestyle{fancy}
-
%% Font options are:
%% bch Bitsream Charter
%% put Utopia
@@ -131,114 +54,102 @@ %% ptm Times
%% pcr Courier
-\renewcommand{\familydefault}{phv}
-
-
-% Commands for freeside description...
-\newcommand{\FSdesc}[3]{
- \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
- \textbf{#2} &
- \multicolumn{1}{r}{\textbf{\dollar #3}}\\
-}
-% ...extended description...
-\newcommand{\FSextdesc}[1]{
- \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
- \multicolumn{2}{l}{\small{~-~#1}}\\
-}
-% ...and total line items.
-\newcommand{\FStotaldesc}[2]{
- & \multicolumn{1}{l}{#1} & #2\\
-}
-
+\renewcommand{\familydefault}{phv}
\begin{document}
%
%% Headers and footers defined for the first page
+\fancyfoot[CO,CE]{\small{
+\begin{tabular}{c}
+$footer
+\end{tabular}}}
%
%% The LH Heading comprising logo
%% UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo
+\fancyhead[LO,LE]{
+\begin{tabular}{l}
+\includegraphics{/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside/logo.eps}
+\end{tabular}}
%
%% The Heading comprising isue date, customer ref & INVOICE name
+\fancyhead[RO,RE]{
+\begin{tabular}{rcl}
+Invoice date & & Invoice number \\
+\vspace{0.2cm}
+\textbf{$date} & & \textbf{$invnum} \\\hline
+\rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\
+\vspace{-0.2cm}
+ & & \\\hline
+\end{tabular}}
%
%% Header & footer changes for subsequent pages
%
+\afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }
+\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }
+\afterpage{ \fancyhead[LO,LE]{\small{}} }
+\afterpage{ \fancyhead[RO,RE]{\small{
+\begin{tabular}{ll}
+Invoice date & Invoice number\\
+\textbf{$date} & \textbf{$invnum}\\
+\end{tabular}}} }
%
%
-\begin{tabular}{ll}
-\addressinset \rule{0cm}{0cm} &
\makebox{
-\begin{minipage}[t]{5.0cm}
-\vspace{0.25cm}
-\textbf{[@-- $payname --@]}\\
-\addressline{[@-- $company --@]}
-\addressline{[@-- $address1 --@]}
-\addressline{[@-- $address2 --@]}
-\addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}
-\addressline{[@-- $country --@]}
+\begin{minipage}[t]{2.9in}
+\vspace{0.20in}
+\textbf{$payname}\\
+\addressline{$company}
+\addressline{$address1}
+\addressline{$address2}
+\addressline{$city, $state $zip}
+\addressline{$country}
\end{minipage}}
-\end{tabular}
\hfill
\makebox{
-\begin{minipage}[t]{6.4cm}
+\begin{minipage}[t]{2.5in}
\begin{flushright}
-Terms: [@-- $terms --@]\\
-[@-- $po_line --@]\\
+Terms: $terms\\
+$po_line\\
\end{flushright}
\end{minipage}}
-\vspace{1.5cm}
+\vspace{0.5cm}
%
\section*{\textsc{Charges}}
-\begin{longtable}{clr}
+\begin{longtable}{|c|l|c|r|r|}
\hline
\rule{0pt}{2.5ex}
\makebox[1.4cm]{\textbf{Ref}} &
-\makebox[12.8cm][l]{\textbf{Description}} &
+\makebox[7.9cm][l]{\textbf{Description}} &
+\makebox[1.3cm][c]{\textbf{Quantity}} &
+\makebox[2.5cm][r]{\textbf{Unit Price}} &
\makebox[2.5cm][r]{\textbf{Amount}} \\
\hline
\endfirsthead
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
+\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
\hline
\rule{0pt}{2.5ex}
\makebox[1.4cm]{\textbf{Ref}} &
-\makebox[12.8cm][l]{\textbf{Description}} &
+\makebox[7.9cm][l]{\textbf{Description}} &
+\makebox[1.3cm][c]{\textbf{Quantity}} &
+\makebox[2.5cm][r]{\textbf{Unit Price}} &
\makebox[2.5cm][r]{\textbf{Amount}} \\
\hline
\endhead
-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
+\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\
\endfoot
-\hline
-[@--
-
- foreach my $line (@total_items) {
- $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .
- '{' . $line->{'total_amount'} . '}' . "\n";
- }
-
---@]
+%%TotalDetails
+ & \multicolumn{3}{l}{$total_item} & $total_amount\\
+%%EndTotalDetails
\hline
\endlastfoot
-[@--
-
- foreach my $line (@detail_items) {
- my $ext_description = $line->{'ext_description'};
-
- # Don't break-up small packages.
- my $rowbreak = @$ext_description < 5 ? '*' : '';
-
- $OUT .= "\\hline\n";
- $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
- '{' . $line->{'amount'} . "}${rowbreak}\n";
-
- foreach my $ext_desc (@$ext_description) {
- $ext_desc = substr($ext_desc, 0, 80) . '...'
- if (length($ext_desc) > 80);
- $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
- }
-
- }
-
---@]
+%%Detail
+\rule{0pt}{2.5ex}$ref &
+\begin{tabular}{l}
+$description\tabularnewline
+\end{tabular}
+& $quantity & \dollar $amount & \dollar $amount\\\hline
+%%EndDetail
\end{longtable}
\vfill
-[@-- $notes --@]
+$notes
\end{document}
diff --git a/conf/invoice_latex.diff b/conf/invoice_latex.diff deleted file mode 100644 index b66a522f0..000000000 --- a/conf/invoice_latex.diff +++ /dev/null @@ -1,138 +0,0 @@ ---- 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
- %% www.asplen.co.uk
- %%
--%% Modified for Freeside by Ivan Kohler
-+%% Modified for Freeside by Ivan Kohler and Kristian Hoffman
- %%
- %% Changes
- %% 0.1 4/12/00 Created
-@@ -61,7 +61,7 @@ - %% Headers and footers defined for the first page
- \fancyfoot[CO,CE]{\small{
- \begin{tabular}{c}
--$footer
-+[@-- $footer --@]
- \end{tabular}}}
- %
- %% The LH Heading comprising logo
-@@ -76,7 +76,7 @@ - \begin{tabular}{rcl}
- Invoice date & & Invoice number \\
- \vspace{0.2cm}
--\textbf{$date} & & \textbf{$invnum} \\\hline
-+\textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline
- \rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\
- \vspace{-0.2cm}
- & & \\\hline
-@@ -85,71 +85,76 @@ - %% Header & footer changes for subsequent pages
- %
- \afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }
--\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }
-+\afterpage{ \fancyfoot[CO,CE]{\small{[@-- $smallfooter --@]}} }
- \afterpage{ \fancyhead[LO,LE]{\small{}} }
- \afterpage{ \fancyhead[RO,RE]{\small{
- \begin{tabular}{ll}
- Invoice date & Invoice number\\
--\textbf{$date} & \textbf{$invnum}\\
-+\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\
- \end{tabular}}} }
- %
- %
- \makebox{
- \begin{minipage}[t]{2.9in}
- \vspace{0.20in}
--\textbf{$payname}\\
--\addressline{$company}
--\addressline{$address1}
--\addressline{$address2}
--\addressline{$city, $state $zip}
--\addressline{$country}
-+\textbf{[@-- $payname --@]}\\
-+\addressline{[@-- $company --@]}
-+\addressline{[@-- $address1 --@]}
-+\addressline{[@-- $address2 --@]}
-+\addressline{[@-- $city --@], [@-- $state --@] [@-- $zip --@]}
-+\addressline{[@-- $country --@]}
- \end{minipage}}
- \hfill
- \makebox{
- \begin{minipage}[t]{2.5in}
- \begin{flushright}
--Terms: $terms\\
--$po_line\\
-+Terms: [@-- $terms --@]\\
-+[@-- $po_line --@]\\
- \end{flushright}
- \end{minipage}}
- \vspace{0.5cm}
- %
- \section*{\textsc{Charges}}
--\begin{longtable}{|c|l|c|r|r|}
-+\begin{longtable}{|c|l|r|}
- \hline
- \rule{0pt}{2.5ex}
- \makebox[1.4cm]{\textbf{Ref}} &
--\makebox[7.9cm][l]{\textbf{Description}} &
--\makebox[1.3cm][c]{\textbf{Quantity}} &
--\makebox[2.5cm][r]{\textbf{Unit Price}} &
--\makebox[2.5cm][r]{\textbf{Amount}} \\
-+\makebox[13cm][l]{\textbf{Description}} &
-+\makebox[2cm][r]{\textbf{Amount}} \\
- \hline
- \endfirsthead
--\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
-+\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
- \hline
- \rule{0pt}{2.5ex}
- \makebox[1.4cm]{\textbf{Ref}} &
--\makebox[7.9cm][l]{\textbf{Description}} &
--\makebox[1.3cm][c]{\textbf{Quantity}} &
--\makebox[2.5cm][r]{\textbf{Unit Price}} &
--\makebox[2.5cm][r]{\textbf{Amount}} \\
-+\makebox[13cm][l]{\textbf{Description}} &
-+\makebox[2cm][r]{\textbf{Amount}} \\
- \hline
- \endhead
--\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\
-+\multicolumn{3}{r}{\rule{0pt}{2.5ex}/cont...}\\
- \endfoot
--%%TotalDetails
-- & \multicolumn{3}{l}{$total_item} & $total_amount\\
--%%EndTotalDetails
-+[@--
-+
-+ foreach my $line (@total_items) {
-+ $OUT .= ' & \multicolumn{1}{l}{' . $line->{'total_item'} . '} & ' .
-+ $line->{'total_amount'} . '\\\\' . "\n";
-+ }
-+
-+--@]
- \hline
- \endlastfoot
--%%Detail
--\rule{0pt}{2.5ex}$ref &
--\begin{tabular}{l}
--$description\tabularnewline
--\end{tabular}
--& $quantity & \dollar $amount & \dollar $amount\\\hline
--%%EndDetail
-+[@--
-+
-+ foreach my $line (@detail_items) {
-+ $OUT .= '\rule{0pt}{2.5ex}' . $line->{'ref'} . ' &' . "\n".
-+ '\begin{tabular}{l}' . "\n".
-+ $line->{'description'} . '\tabularnewline' . "\n".
-+ '\end{tabular}' . "\n".
-+ '& \dollar ' . $line->{'amount'} . '\\\\\\hline' . "\n";
-+ }
-+
-+--@]
- \end{longtable}
- \vfill
--$notes
-+[@-- $notes --@]
- \end{document}
diff --git a/conf/invoice_latexfooter b/conf/invoice_latexfooter index 527c356f5..ee5d7e931 100644 --- a/conf/invoice_latexfooter +++ b/conf/invoice_latexfooter @@ -1 +1,5 @@ -Ivan Kohler~~~Freeside - open-source billing +Ivan Kohler\\ +12345 Test Lane\\ +Truckee, CA~~96161\\ +ivan@sisd.com~~~~+1 415 462 1624\\ +Freeside - open-source billing - http://www.sisd.com/freeside\\ diff --git a/conf/invoice_latexreturnaddress b/conf/invoice_latexreturnaddress deleted file mode 100644 index 95067e230..000000000 --- a/conf/invoice_latexreturnaddress +++ /dev/null @@ -1,3 +0,0 @@ -Ivan Kohler\\* -12345 Test Lane\\* -Truckee, CA~~96161 diff --git a/conf/logo.eps b/conf/logo.eps index ff25dd4ce..8091b03fd 100644 --- a/conf/logo.eps +++ b/conf/logo.eps @@ -1,16 +1,10 @@ %!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 @@ -13507,4 +13501,3 @@ countdictstack exch sub { end } repeat restore %%EOF -grestore diff --git a/conf/logo.png b/conf/logo.png Binary files differdeleted file mode 100644 index 1e415e6d8..000000000 --- a/conf/logo.png +++ /dev/null |
