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

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index 690fd137f..681e6ac30 100644
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_order.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}}
@@ -118,5 +134,9 @@
         \vspace{5mm}
 <%end if%>
 
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
 \end{document}