X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Fsales_order.tex;h=1949fe54df9170ef766375119cc00f7899ef96be;hb=faf31da3a0c5112557d491f6bae9c32d3843781f;hp=77dd677938dd12e30015e6f40f1285ed303bc85d;hpb=f167d00fa21c107f8f5c3b636d7031a739ea3ca5;p=kivitendo-erp.git

diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex
index 77dd67793..1949fe54d 100644
--- a/templates/print/RB/sales_order.tex
+++ b/templates/print/RB/sales_order.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,17 +18,29 @@
 \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%>
 
-  <%shiptoname%>
+  <%street%>
 
-  <%shiptostreet%>
+  ~
 
-  <%shiptozipcode%> <%shiptocity%>
+  <%zipcode%> <%city%>
 
-  <%shiptocountry%>
+  <%country%>
 \end{minipage}
 \hfill
 \begin{minipage}[t]{6cm}
@@ -50,9 +62,26 @@
 
   \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