X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=templates%2Fprint%2FRB%2Fsales_quotation.tex;fp=templates%2Fprint%2FRB%2Fsales_quotation.tex;h=e8661cf2e1628ac5659c3b720239ccafd6a83fb7;hp=8ef6b5ba7b984fa068b3e7d13cee72fc50aeb5f8;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44

diff --git a/templates/print/RB/sales_quotation.tex b/templates/print/RB/sales_quotation.tex
index 8ef6b5ba7..e8661cf2e 100644
--- a/templates/print/RB/sales_quotation.tex
+++ b/templates/print/RB/sales_quotation.tex
@@ -5,7 +5,7 @@
 \newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxtitlebar} {<%titlebar%>}
+\newcommand{\kivicompany} {<%employee_company%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -18,12 +18,22 @@
 \begin{document}
 
 \ourfont
-
 \begin{minipage}[t]{8cm}
-  \vspace*{1.0cm}
+  \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%>
 
   ~
@@ -48,17 +58,37 @@
 
   \ansprechpartner:\hfill <%employee_name%>
 
-  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
+  \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
 
-% Anrede nach Geschlecht unterscheiden
-\ifthenelse{\equal{<%cp_name%>}{}}{\anrede}{
-  \ifthenelse{\equal{<%cp_gender%>}{f}}
-    {\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+\ifthenelse{\equal{<%cp_name%>}{}}{
+    <%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}{
+    \ifthenelse{\equal{<%cp_gender%>}{f}}
+      {\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
 
 \angebotsformel\\
 
@@ -117,19 +147,21 @@
           <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
           <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
           <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
-
+          <%if optional%> && \scriptsize \optional \\<%end%>
+          <%if customer_make%>
+            <%foreach customer_make%>
+              \ifthenelse{\equal{<%customer_make%>}{<%name%>}}{&& \kundenartnr: <%customer_model%>\\}{}
+            <%end foreach%>
+          <%end if%>
           \\[-0.8em]
 <%end number%>
 
 \end{longtable}
 
-
-\vspace{0.2cm}
-
 <%if notes%>
-        \vspace{5mm}
-        <%notes%>
-        \vspace{5mm}
+ \vspace{5mm}
+  <%notes%>
+  \vspace{5mm}
 <%end if%>
 
 <%if delivery_term%>
@@ -147,7 +179,15 @@
 \angebotagb \\ \\
 
 \gruesse \\ \\ \\
-  <%employee_name%>
+<%employee_company%>
 
-\end{document}
+<%salesman_name%>\\\\
+
+\parbox[t]{175mm}{
 
+  \auftragerteilt\\\\
+  \nurort:\uline{\hspace*{8cm}}\ ,\den\ \uline{\hspace*{5cm}}\\\\\\\\\\
+
+  \unterschrift / \stempel:\uline{\hspace*{6cm}}
+}
+\end{document}