[freeside-commits] branch master updated. 1bbbe4252ec1e41075d015f33171f84380e67457

[Ivan]

The branch, master has been updated
       via  1bbbe4252ec1e41075d015f33171f84380e67457 (commit)
      from  f2ca904433495eff9e00802aa37da902b6518546 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1bbbe4252ec1e41075d015f33171f84380e67457
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 15 15:10:54 2017 -0700

    PDF quotation fixes, RT#75991

diff --git a/conf/quotation_latex b/conf/quotation_latex
index 6aac160..25228dc 100644
--- a/conf/quotation_latex
+++ b/conf/quotation_latex
@@ -127,9 +127,9 @@
   \ifthenelse{\equal{\thepage}{1}}
   { % First page
     \begin{tabular}{ccc}
-    [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\
+    [@-- join(' & ', emt('Quotation date'), emt('Quotation #'), $custnum ? emt('Customer #') : emt('Prospect #') ) --@]\\
     \vspace{0.2cm}
-    \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline
+    \textbf{[@-- $date --@]} & \textbf{[@-- $quotationnum --@]} & \textbf{[@-- $custnum || $prospectnum --@]} \\\hline
     \rule{0pt}{5ex} &~~ \huge{\textsc{[@-- emt($notice_name) --@]}} & \\
     \vspace{-0.2cm}
      & & \\\hline
@@ -138,8 +138,8 @@
   { % ... pages
     \small{
       \begin{tabular}{lll}
-      [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\
-      \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]}\\
+      [@-- join(' & ', emt('Quotation date'), emt('Quotation #'), $custnum ? emt('Customer #') : emt('Prospect #') ) --@]\\
+      \textbf{[@-- $date --@]} & \textbf{[@-- $quotationnum --@]} & \textbf{[@-- $custnum || $prospectnum --@]}\\
       \end{tabular}
     }
   }

-----------------------------------------------------------------------

Summary of changes:
 conf/quotation_latex |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)