From 144a1f5ea79fda28cd9d29811c381bc76407b24c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Mon, 29 Jun 2015 11:28:12 +0200
Subject: [PATCH] =?utf8?q?Revert=20"RB-Druckvorlagensatz:=20abweichende=20?=
 =?utf8?q?Lieferadresse=20f=C3=BCr=20Kunden-=20Lieferantenauftrag"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This reverts commit f167d00fa21c107f8f5c3b636d7031a739ea3ca5.

Aufträge sollten nicht an die Lieferadresse, sondern an die Stammdaten-Adresse
gehen. Zudem sind seit commit b6213d3539ccd179cd1f21b9afc54b8de8970774
"Einkauf/Verkauf: Lieferadressenfelder nie aus Stammdaten vorbelegen" die sipto-
Felder leer, wenn keine Lieferadresse angegeben ist.
---
 templates/print/RB/purchase_order.tex |  8 ++++----
 templates/print/RB/sales_order.tex    | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

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