ActionBar: Angebote/Aufträge: Lieferadresse via Popup bearbeiten

[kivitendo-erp.git] / templates / print / RB / purchase_delivery_order.tex

diff --git a/templates/print/RB/purchase_delivery_order.tex b/templates/print/RB/purchase_delivery_order.tex
index a6e4e06..4269636 100644 (file)
--- a/templates/print/RB/purchase_delivery_order.tex
+++ b/templates/print/RB/purchase_delivery_order.tex
@@ -5,7 +5,7 @@
 \newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxtitlebar} {<%titlebar%>}
+\newcommand{\kivicompany} {<%employee_company%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -18,12 +18,26 @@
 \begin{document}
 
 \ourfont
+\begin{minipage}[t]{8cm}
+  \scriptsize
+
+  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+  \normalsize
+
+  \vspace*{0.3cm}
 
-\begin{minipage}{8cm}
   <%name%>
 
+  <%if department_1%><%department_1%><%end if%>
+
+  <%if department_2%><%department_2%><%end if%>
+
+  <%cp_givenname%> <%cp_name%>
+
   <%street%>
 
+  ~
+
   <%zipcode%> <%city%>
 
   <%country%>
@@ -45,6 +59,21 @@
   <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
 \end{minipage}
 
+<%if shiptoname%>
+  \vspace{0.8cm}
+  \scriptsize \underline{\abweichendeLieferadresse:}\\
+  \normalsize    <%shiptoname%>
+
+                 <%if shiptocontact%> <%shiptocontact%><%end if%>
+
+                 <%shiptodepartment_1%>
+
+                  <%shiptodepartment_2%>
+
+                  <%shiptostreet%>
+
+                  <%shiptozipcode%> <%shiptocity%>
+<%end if%>
 \vspace*{1.5cm}
 
 
@@ -111,4 +140,3 @@
 <%end delivery_term%>
 
 \end{document}
-