X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Fsales_delivery_order.tex;h=b4af5a6f6bd5fbcd9b50f42b555197bd720dfcdf;hb=bbf5c662c1c707852b30d0fb6985efdf6148f14f;hp=2db1b3d03e8f7606a9ccc9168c0097a8704ef82d;hpb=fc1ff1a03f56176d1e84bc0345443f561426a4a7;p=kivitendo-erp.git

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index 2db1b3d03..b4af5a6f6 100644
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_order.tex
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -21,17 +21,33 @@
 
 \begin{minipage}[t]{8cm}
   \vspace*{1.0cm}
+  \ifthenelse{\equal{<%shiptoname%>}{}}{ % KEINE ABWEICHENDE LIEFERADRESSE
 
-  <%name%>
+    <%name%>
 
-  <%street%>
+    <%street%>
 
-  ~
+    ~
 
-  <%zipcode%> <%city%>
+    <%zipcode%> <%city%>
 
-  <%country%>
+    <%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}}
@@ -102,7 +118,7 @@
           <%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%>
+          <%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 +134,9 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 \end{document}