From 9d084caee1a5abdb240abe601152f592a45b148c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo-premium.de>
Date: Mon, 25 Aug 2014 12:15:33 +0200
Subject: [PATCH] =?utf8?q?abweichende=20Lieferadresse=20f=C3=BCr=20Liefers?=
 =?utf8?q?chein=20bei=20RB-Druckvorlagen=20analog=20zu=20dem=20Commit=20vo?=
 =?utf8?q?n=20gerade.=20Hier=20auch=20die=20abweichende=20Lieferadresse=20?=
 =?utf8?q?beachten.=20erledigt=20#2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 templates/print/RB/sales_delivery_order.tex | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index 2f18eef27..ca67a69da 100644
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_order.tex
@@ -22,15 +22,13 @@
 \begin{minipage}[t]{8cm}
   \vspace*{1.0cm}
 
-  <%name%>
+  <%shiptoname%>
 
-  <%street%>
+  <%shiptostreet%>
 
-  ~
+  <%shiptozipcode%> <%shiptocity%>
 
-  <%zipcode%> <%city%>
-
-  <%country%>
+  <%shiptocountry%>
 \end{minipage}
 \hfill
 \begin{minipage}[t]{6cm}
-- 
2.20.1