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 bd820ee..2025896 100644 (file)
--- 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 b86f159..77dd677 100644 (file)
--- 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}