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 bd820eed677a66f3f9dc139c40aa8fc3704392f8..2025896b95a0745a1ab4796c302da19211223f14 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}
 
 \begin{minipage}{8cm}
   \vspace*{1.0cm}
 

-  <%name%>
+  <%shiptoname%>

 
 

-  <%street%>
+  <%shiptostreet%>

 
 

-  <%zipcode%> <%city%>
+  <%shiptozipcode%> <%shiptocity%>

 
 

-  <%country%>
+  <%shiptocountry%>

 \end{minipage}
 \hfill
 \begin{minipage}{6cm}
 \end{minipage}
 \hfill
 \begin{minipage}{6cm}

diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex
index b86f1594d6cf938337a020b74bfce8aa30623e3c..77dd677938dd12e30015e6f40f1285ed303bc85d 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}
 
 \begin{minipage}[t]{8cm}
   \vspace*{1.0cm}
 

-  <%name%>
+  <%shiptoname%>

 
 

-  <%street%>
+  <%shiptostreet%>

 
 

-  ~
+  <%shiptozipcode%> <%shiptocity%>

 
 

-  <%zipcode%> <%city%>
-
-  <%country%>
+  <%shiptocountry%>

 \end{minipage}
 \hfill
 \begin{minipage}[t]{6cm}
 \end{minipage}
 \hfill
 \begin{minipage}[t]{6cm}