limit column width of line item descriptions and details, #38130

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index fd0f952..c1d04d6 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -20,6 +20,7 @@
 \documentclass[letterpaper]{article}\r
 \r
 \usepackage{fancyhdr,lastpage,ifthen,array,longtable,afterpage,caption,multirow,bigstrut}\r
+\usepackage[breakwords]{truncate} % to avoid overflowing boxes\r
 \usepackage{graphicx}                  % required for logo graphic\r
 \usepackage[utf8]{inputenc}             % multilanguage support\r
 \usepackage[T1]{fontenc}\r
@@ -192,7 +193,9 @@
   \hline\r
   \rule{0pt}{2.5ex}\r
   \makebox[1.4cm]{} &\r
-  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}&\r
+  \multicolumn{\FSdescriptioncolumncount}{l}{\r
+    \truncate{\FSdescriptionlength}{\textbf{[@-- emt('Description') --@]}}\r
+  } &\r
   \FSunitcolumns\r
   \makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\\r
   \hline\r
@@ -203,7 +206,7 @@
   \rule{0pt}{2.5ex}\r
   \makebox[1.4cm]{} &\r
   \multicolumn{4}{l}{\r
-    \makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}\r
+    \truncate{\FSdescriptionlength}{\textbf{[@-- emt('Description') --@]}}\r
   } &\r
   \textbf{~~[@-- emt('Calls') --@]} &\r
   \textbf{~~[@-- emt('Duration') --@]} &\r
@@ -214,7 +217,9 @@
 % ...description...\r
 \newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
-  \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &\r
+  \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\r
+    \truncate{\FSdescriptionlength}{\textbf{#2}}\r
+  } &\r
 [@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{#3}} &'."\n".\r
                    '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"\r
                  : ''\r
@@ -224,12 +229,23 @@
 % ...extended description...\r
 \newcommand{\FSextdesc}[1]{\r
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
-%%  \multicolumn{2}{l}{\small{~-~#1}}\\\r
-#1\\\r
+  \multicolumn{6}{l}{\r
+    \truncate{12.8cm}{\small{~~~#1}}\r
+  } \\\r
 }\r
-% ...and total line items.\r
+% ...call detail (multiple columns already)...\r
+\newcommand{\FScalldetail}[1]{\r
+  \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
+  ~~~#1\r
+  \\\r
+}\r
+}\r
+% ...and total line items (which use the full 12.8cm length, ignoring\r
+% unitprice/quantity\r
 \newcommand{\FStotaldesc}[2]{\r
-  & \multicolumn{6}{l}{#1} & #2\\\r
+  & \multicolumn{6}{l}{\r
+    \truncate{12.8cm}{#1}\r
+  } & #2\\\r
 }\r
 \r
 % ...usage class summary\r
@@ -399,15 +415,10 @@
         foreach my $ext_desc (@$ext_description) {\r
           if ($section->{extended_description_generator}) {\r
             $OUT .= &{$section->{extended_description_generator}}($ext_desc);\r
-          } else {\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
+          } elsif ( $ext_desc !~ /[^\\]&/ ) {\r
+            $OUT .= '\FSextdesc{' . $ext_desc . "}$rowbreak\n";\r
+          } else { # call detail\r
+            $OUT .= '\FScalldetail{' . $ext_desc . "}$rowbreak\n";\r
           }\r
         }\r
 \r