X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Fsales_delivery_order.tex;h=fcda41a7e49278c7eb4cb4abd1f1cc15c661c330;hb=d3e41ec0c2075cd6c06a67f95a194d94b0e3ad2b;hp=690fd137f1e46e7fcc22c31b3b76f69a40c8cb84;hpb=a98ee737e75a0c60b2aa3734d498da743598bad5;p=kivitendo-erp.git

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index 690fd137f..fcda41a7e 100644
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_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}
@@ -20,18 +20,38 @@
 \ourfont
 
 \begin{minipage}[t]{8cm}
-  \vspace*{1.0cm}
+  \scriptsize
+  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+  \normalsize
 
-  <%name%>
+  \vspace*{0.3cm}
+  \ifthenelse{\equal{<%shiptoname%>}{}}{ % KEINE ABWEICHENDE LIEFERADRESSE
 
-  <%street%>
+    <%name%>
 
-  ~
+    <%street%>
 
-  <%zipcode%> <%city%>
+    ~
 
-  <%country%>
+    <%zipcode%> <%city%>
+
+    <%country%>
+
+  }{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
+
+    <%shiptoname%>
+
+    <%shiptostreet%>
+
+    ~
+
+    <%shiptozipcode%> <%shiptocity%>
+
+    <%shiptocountry%>
+  } % ende ifthenelse LIEFERADRESSE
 \end{minipage}
+
+
 \hfill
 \begin{minipage}[t]{6cm}
   \hfill{\LARGE\textbf{\lieferschein}}
@@ -52,6 +72,10 @@
 
   \ansprechpartner:\hfill <%employee_name%>
 
+  \textTelefon \hfill <%employee_tel%>
+
+  \textEmail \hfill <%employee_email%>
+
   <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
 \end{minipage}
 
@@ -102,7 +126,12 @@
           <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
           <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
           <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
-          <%foreach si_number%><%if si_number%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
+          <%if customer_make%>
+            <%foreach customer_make%>
+              \ifthenelse{\equal{<%customer_make%>}{<%name%>}}{&& \kundenartnr: <%customer_model%>\\}{}
+            <%end foreach%>
+          <%end if%>
+          <%foreach si_number%><%if si_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
 
           \\[-0.8em]
 <%end number%>
@@ -118,5 +147,8 @@
         \vspace{5mm}
 <%end if%>
 
-\end{document}
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
 
+\end{document}