X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sales_quotation.tex;h=64fd84f540aa1e4c4fba90f79de55dc91ad5bfec;hb=ebfcd634a9b7a1a24e6e75659e904a46a3c174a9;hp=b4632436f520f02c0bafa4a11680f12f0d35f1c7;hpb=20a30dd1c7c4d568f4a7f27df6d8619c09690079;p=kivitendo-erp.git

diff --git a/sales_quotation.tex b/sales_quotation.tex
index b4632436f..64fd84f54 100644
--- a/sales_quotation.tex
+++ b/sales_quotation.tex
@@ -18,83 +18,92 @@
 \begin{document}
 
 \setkomavar{signature}{
-<%employee_company%>\ifhmode\\\fi<%salesman_name%>
+<%employee_company%>%
+\ifhmode\\\fi
+<%salesman_name%>%
 }
 
-\begin{minipage}[t]{8cm}
-  \scriptsize
-
-  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
-  \normalsize
-
-  \vspace*{0.3cm}
-
-  <%name%>
-
-  <%if department_1%><%department_1%><%end if%>
-
-  <%if department_2%><%department_2%><%end if%>
-
-  <%cp_givenname%> <%cp_name%>
-
-  <%street%>
-
-  ~
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}[t]{6cm}
-  \hfill{\LARGE\textbf{\angebot}}
-
-  \vspace*{0.2cm}
-
-  \hfill{\large\textbf{\nr ~<%quonumber%>}}
-
-  \vspace*{0.2cm}
-
-  \datum:\hfill <%transdate%>
-
-  \kundennummer:\hfill <%customernumber%>
-
-  \ansprechpartner:\hfill <%employee_name%>
-
-  \textTelefon \hfill <%employee_tel%>
-
-  \textEmail \hfill <%employee_email%>
-
-\end{minipage}
-
-<%if shiptoname%>
-  \vspace{0.8cm}
-  \scriptsize \underline{\abweichendeLieferadresse:}\\
-  \normalsize    <%shiptoname%>
-
-                 <%if shiptocontact%> <%shiptocontact%><%end if%>
-
-                 <%shiptodepartment_1%>
-
-                  <%shiptodepartment_2%>
-
-                  <%shiptostreet%>
-
-                  <%shiptozipcode%> <%shiptocity%>
-<%end if%>
-\vspace*{1.5cm}
-
-\hfill
+\setkomavar{offer}{<%quonumber%>}
+\setkomavar{date}{<%transdate%>}
+\setkomavar{customer}{<%customernumber%>}
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+
+%\begin{minipage}[t]{8cm}
+%  \scriptsize
+%
+%  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+%  \normalsize
+%
+%  \vspace*{0.3cm}
+%
+%  <%name%>
+%
+%  <%if department_1%><%department_1%><%end if%>
+%
+%  <%if department_2%><%department_2%><%end if%>
+%
+%  <%cp_givenname%> <%cp_name%>
+%
+%  <%street%>
+%
+%  ~
+%
+%  <%zipcode%> <%city%>
+%
+%  <%country%>
+%\end{minipage}
+%\hfill
+%\begin{minipage}[t]{6cm}
+%  \hfill{\LARGE\textbf{\angebot}}
+%
+%  \vspace*{0.2cm}
+%
+%  \hfill{\large\textbf{\nr ~<%quonumber%>}}
+%
+%  \vspace*{0.2cm}
+%
+%  \datum:\hfill <%transdate%>
+%
+%  \kundennummer:\hfill <%customernumber%>
+%
+%  \ansprechpartner:\hfill <%employee_name%>
+%
+%  \textTelefon \hfill <%employee_tel%>
+%
+%  \textEmail \hfill <%employee_email%>
+%
+%\end{minipage}
+%
+%<%if shiptoname%>
+%  \vspace{0.8cm}
+%  \scriptsize \underline{\abweichendeLieferadresse:}\\
+%  \normalsize    <%shiptoname%>
+%
+%                 <%if shiptocontact%> <%shiptocontact%><%end if%>
+%
+%                 <%shiptodepartment_1%>
+%
+%                  <%shiptodepartment_2%>
+%
+%                  <%shiptostreet%>
+%
+%                  <%shiptozipcode%> <%shiptocity%>
+%<%end if%>
+%\vspace*{1.5cm}
+%
+%\hfill
 
 
 \begin{letter}{
-  <%name%>\\
-  <%if department_1%><%department_1%><%end if%>\\
-  <%if department_2%><%department_2%><%end if%>\\
-  <%cp_givenname%> <%cp_name%>\\
-  <%street%>\\
-  <%zipcode%> <%city%>\\
-  <%country%>
+  <%name%>\strut\\
+  <%if department_1%><%department_1%>\\<%end if%>
+  <%if department_2%><%department_2%>\\<%end if%>
+  <%cp_givenname%> <%cp_name%>\strut\\
+  <%street%>\strut\\
+  <%zipcode%> <%city%>\strut\\
+  <%country%> \strut
 }
 
 % Anrede nach Geschlecht unterscheiden