From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 15:57:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~17^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/10150f2fb96a248c46b65cea5859d7f1dd11340e?hp=624c53dc0cb5056d2c259aec6f815e69b8313ae0

Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
---

diff --git a/templates/Default-request_quotation.tex b/templates/Default-request_quotation.tex
index 22864d347..0f50ba17f 100644
--- a/templates/Default-request_quotation.tex
+++ b/templates/Default-request_quotation.tex
@@ -28,7 +28,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -38,13 +38,13 @@
 
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
-    
+
 
 <%pagebreak 90 27 48%>
 \end{tabular*}
 
   \rule{\textwidth}{2pt}
-  
+
   \hfill
   \begin{tabularx}{7cm}{Xr@{}}
   \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
@@ -69,7 +69,7 @@
 \parbox[t]{.45\textwidth}{
 \textbf{To}
 \vspace{0.7cm}
-  
+
 <%name%>
 
 <%street%>
@@ -137,7 +137,7 @@ Fax: <%shiptofax%>
 
 \vspace{1cm}
 
-\begin{tabularx}{\textwidth}{*{5}{|X}|} \hline
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{RFQ \#} & \textbf{Date} & \textbf{Required by} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
   \hline
   <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
diff --git a/templates/German-request_quotation.tex b/templates/German-request_quotation.tex
index f6517503d..f17eb629f 100644
--- a/templates/German-request_quotation.tex
+++ b/templates/German-request_quotation.tex
@@ -30,7 +30,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -40,13 +40,13 @@
 
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
-    
+
 
 <%pagebreak 90 27 48%>
 \end{tabular*}
 
   \rule{\textwidth}{2pt}
-  
+
   \hfill
   \begin{tabularx}{7cm}{Xr@{}}
   \textbf{Zwischenzumme} & \textbf{<%sumcarriedforward%>} \\