X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=6bfc41d5a3eecb454f0fe0b65f708ad93aff3ac9;hb=5bc6e3dc0b986d70b7b5b1a63916dbe7e8c33faa;hp=2acd7102d4b95d366d92a9e0426ef144983e540f;hpb=988ec48fea05902eb7ea22e43a44e86a36eee06a;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 2acd7102d..6bfc41d5a 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -168,7 +168,7 @@
 \newcommand{\FSextdesc}[1]{
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
 %%  \multicolumn{2}{l}{\small{~-~#1}}\\
-  ~~~#1\\
+#1\\
 }
 % ...and total line items.
 \newcommand{\FStotaldesc}[2]{
@@ -204,7 +204,6 @@
 \hfill
 \makebox{
 \begin{minipage}[t]{6.4cm}
-\begin{flushright}
 [@--
   if ($ship_enable) {
     $OUT .= '\textbf{Service Address}\\\\';
@@ -214,10 +213,14 @@
     $OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";
     $OUT .= "\\addressline{$ship_country}";
     $OUT .= '~\\\\';
+    $OUT .= "\\textbf{ID:}~~$agent_custid\\\\" if $agent_custid;
+    $OUT .= "\\textbf{Fax:}~~$ship_fax\\\\" if $ship_fax;
+    $OUT .= '~\\\\' if ($ship_fax or $agent_custid);
   }else{
     $OUT .= '';
   }
 --@]
+\begin{flushright}
 Terms: [@-- $terms --@]\\
 [@-- $po_line --@]\\
 \end{flushright}
@@ -244,8 +247,8 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\makebox[2.0cm][l]{}& ';
     $OUT .= '\makebox[2.0cm][l]{}& ';
     $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
+    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';
+    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';
     $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
     $OUT .= '\hline';
     $OUT .= '\endfirsthead';
@@ -257,8 +260,8 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\makebox[2.0cm][l]{}& ';
     $OUT .= '\makebox[2.0cm][l]{}& ';
     $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
+    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';
+    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';
     $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
     $OUT .= '\hline';
     $OUT .= '\endhead';
@@ -303,7 +306,9 @@ Terms: [@-- $terms --@]\\
         if ( $ext_desc !~ /[^\\]&/ ) {
           $ext_desc = substr($ext_desc, 0, 80) . '...'
             if (length($ext_desc) > 80);
-          $ext_desc = '\small{'. $ext_desc. '}';
+          $ext_desc = '\multicolumn{6}{l}{\small{~~~'. $ext_desc. '}}';
+        }else{
+          $ext_desc = "~~~$ext_desc";
         }
         $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
       }