RB-Druckvorlagen auf neues shipto* Druckvorlagen Lieferschein Verhalten umgestellt

[kivitendo-erp.git] / templates / print / RB / sales_delivery_order.tex

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index ca67a69..681e6ac 100644 (file)
--- 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}}