From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 25 Aug 2014 10:08:13 +0000 (+0200)
Subject: RB-Druckvorlagensatz: abweichende Lieferadresse für Kunden- Lieferantenauftrag
X-Git-Tag: release-3.2.0beta~346
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f167d00fa21c107f8f5c3b636d7031a739ea3ca5;p=kivitendo-erp.git

RB-Druckvorlagensatz: abweichende Lieferadresse für Kunden- Lieferantenauftrag
entsprechend shipto ergänzt
---

diff --git a/templates/print/RB/purchase_order.tex b/templates/print/RB/purchase_order.tex
index bd820eed6..2025896b9 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}
 
-  <%name%>
+  <%shiptoname%>
 
-  <%street%>
+  <%shiptostreet%>
 
-  <%zipcode%> <%city%>
+  <%shiptozipcode%> <%shiptocity%>
 
-  <%country%>
+  <%shiptocountry%>
 \end{minipage}
 \hfill
 \begin{minipage}{6cm}
diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex
index b86f1594d..77dd67793 100644
--- a/templates/print/RB/sales_order.tex
+++ b/templates/print/RB/sales_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}