projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this is what it was for
[freeside.git]
/
conf
/
invoice_latex
diff --git
a/conf/invoice_latex
b/conf/invoice_latex
index
2acd710
..
6bfc41d
100644
(file)
--- a/
conf/invoice_latex
+++ b/
conf/invoice_latex
@@
-168,7
+168,7
@@
\newcommand{\FSextdesc}[1]{
\r
\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
\r
%% \multicolumn{2}{l}{\small{~-~#1}}\\
\r
\newcommand{\FSextdesc}[1]{
\r
\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
\r
%% \multicolumn{2}{l}{\small{~-~#1}}\\
\r
-
~~~
#1\\
\r
+#1\\
\r
}
\r
% ...and total line items.
\r
\newcommand{\FStotaldesc}[2]{
\r
}
\r
% ...and total line items.
\r
\newcommand{\FStotaldesc}[2]{
\r
@@
-204,7
+204,6
@@
\hfill
\r
\makebox{
\r
\begin{minipage}[t]{6.4cm}
\r
\hfill
\r
\makebox{
\r
\begin{minipage}[t]{6.4cm}
\r
-\begin{flushright}
\r
[@--
\r
if ($ship_enable) {
\r
$OUT .= '\textbf{Service Address}\\\\';
\r
[@--
\r
if ($ship_enable) {
\r
$OUT .= '\textbf{Service Address}\\\\';
\r
@@
-214,10
+213,14
@@
$OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";
\r
$OUT .= "\\addressline{$ship_country}";
\r
$OUT .= '~\\\\';
\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
}else{
\r
$OUT .= '';
\r
}
\r
--@]
\r
+\begin{flushright}
\r
Terms: [@-- $terms --@]\\
\r
[@-- $po_line --@]\\
\r
\end{flushright}
\r
Terms: [@-- $terms --@]\\
\r
[@-- $po_line --@]\\
\r
\end{flushright}
\r
@@
-244,8
+247,8
@@
Terms: [@-- $terms --@]\\
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
- $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
\r
- $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
\r
+ $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}
}
&';
\r
+ $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}
}
&';
\r
$OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
\r
$OUT .= '\hline';
\r
$OUT .= '\endfirsthead';
\r
$OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
\r
$OUT .= '\hline';
\r
$OUT .= '\endfirsthead';
\r
@@
-257,8
+260,8
@@
Terms: [@-- $terms --@]\\
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
$OUT .= '\makebox[2.0cm][l]{}& ';
\r
- $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
\r
- $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
\r
+ $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}
}
&';
\r
+ $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}
}
&';
\r
$OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
\r
$OUT .= '\hline';
\r
$OUT .= '\endhead';
\r
$OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
\r
$OUT .= '\hline';
\r
$OUT .= '\endhead';
\r
@@
-303,7
+306,9
@@
Terms: [@-- $terms --@]\\
if ( $ext_desc !~ /[^\\]&/ ) {
\r
$ext_desc = substr($ext_desc, 0, 80) . '...'
\r
if (length($ext_desc) > 80);
\r
if ( $ext_desc !~ /[^\\]&/ ) {
\r
$ext_desc = substr($ext_desc, 0, 80) . '...'
\r
if (length($ext_desc) > 80);
\r
- $ext_desc = '\small{'. $ext_desc. '}';
\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
$OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
\r
}
\r