X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fprint%2FRB%2Fsales_delivery_order.tex;h=681e6ac303ae0efd6318b1aa7e7d903aa0a52eb7;hb=8f3f4aa62c7d3d0c80558d66da86fea15a9efe64;hp=ca67a69daab445d3b7eeb910ce26d6535e3a9413;hpb=9d084caee1a5abdb240abe601152f592a45b148c;p=kivitendo-erp.git

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index ca67a69da..681e6ac30 100644
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_order.tex
@@ -21,15 +21,33 @@
 
 \begin{minipage}[t]{8cm}
   \vspace*{1.0cm}
+  \ifthenelse{\equal{<%shiptoname%>}{}}{ % KEINE ABWEICHENDE LIEFERADRESSE
 
-  <%shiptoname%>
+    <%name%>
 
-  <%shiptostreet%>
+    <%street%>
 
-  <%shiptozipcode%> <%shiptocity%>
+    ~
 
-  <%shiptocountry%>
+    <%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}}